Changeset 17340

Timestamp:

08/11/08 01:17:14 (5 months ago)

Author:

shogo4405

Message:

hhcタスクの微調整

Location:

lang/java/utiljs/trunk

Files:

• src/org/coderepos/utiljs/Arguments.java (modified) (3 diffs)
• src/org/coderepos/utiljs/taskdefs/Hhc.java (modified) (1 diff)
• src/org/coderepos/utiljs/taskdefs/JSDoc.java (modified) (8 diffs)
• test/testcase.xml (modified) (1 diff)

lang/java/utiljs/trunk/src/org/coderepos/utiljs/Arguments.java

@@ -14 +14 @@
         private static final long serialVersionUID = -8908989881175550220L;
 
+        public void add(String... strs)
+        {
+                for(String str : strs){
+                        this.add(str);
+                };
+        };
+
         /**
          * 第一引数がtrueのときに、第二引数以降の文字列を追加します。
@@ -22 +29 @@
         {
                 if(!b){ return; };
-                for(String str : strs){
-                        this.add(str);
-                };
+                this.add(strs);
         };
 
@@ -36 +41 @@
                 return (String[])this.toArray(args);
         };
+
+        public String join(){
+                return this.toString(",");
+        };
+        
+        public String join(String delimiter){
+                return this.toString(delimiter);
+        };
+
+        public String toString(){
+                return this.toString(",");
+        };
+
+        public String toString(String delimiter)
+        {
+                int length = this.size();
+                StringBuilder buf = new StringBuilder();
+                
+                for(int i=0;i<length;i++)
+                {
+                        if(i!=length-1)
+                        {
+                                buf.append(this.get(i)).append(delimiter);
+                                continue;
+                        };
+                        buf.append(get(i));
+                };
+
+                return buf.toString();
+        };
 };

lang/java/utiljs/trunk/src/org/coderepos/utiljs/taskdefs/Hhc.java

@@ -33 +33 @@
                 arg.setLine(getFile().getAbsolutePath());
 
+                // タスク名を”hhc”に
+                task.setTaskName("hhc");
                 task.execute();
         };

lang/java/utiljs/trunk/src/org/coderepos/utiljs/taskdefs/JSDoc.java

@@ -3 +3 @@
 // import
 import java.io.*;
+import java.util.*;
 
 import org.coderepos.utiljs.*;
 import org.apache.tools.ant.*;
+import org.apache.tools.ant.types.*;
 import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -15 +16 @@
 final public class JSDoc extends Task
 {
-        final public String JARNAME = "jsrun.jar";
-        final public String JSDOCNAME = "app/run.js";
+        final public String MAINJAR = "jsrun.jar";
+        final public String MAINDOC = "app/run.js";
+        final public String MAINTPL = "templates/jsdoc";
 
         /** 全関数の出力オプション **/
@@ -37 +39 @@
         private boolean supress = false;
         /** 必須:出力テンプレート **/
-        private File template = null;
+        private String template = null;
         /** JSDocToolkitのパス **/
         private File path = null;
@@ -43 +45 @@
         private boolean test = false;
         /** 処理している内容の表示 **/
+        private boolean verbose = true;
+
         private String ext = null;
         /** ヘルプ表示オプション **/
         private boolean help = false;
+
+        /** jsrun.jarのパス **/
+        private File jar = null;
+        /** app/run.jsのパス **/
+        private File runjs = null;
+
+        // ファイルセットリスト
+        LinkedList<FileSet> fileSetList = new LinkedList<FileSet>();
 
         /**
@@ -52 +64 @@
         public void execute() throws BuildException
         {
+                // 引数の組立
                 Arguments args = new Arguments();
-
-                args.add(getPath().getAbsolutePath() + JSDOCNAME);
+                // spp/run.jsのパス(必須)
+                args.add(getRunjs().getAbsolutePath());
+                // 必須 :: jarに渡すソースファイルパスの設定
+                Iterator<FileSet> it = fileSetList.iterator();
+                while(it.hasNext())
+                {
+                        FileSet fileSet = it.next();
+                        File baseDir = fileSet.getDir();
+
+                        if(fileSet.hasPatterns())
+                        {
+                                // JavaScriptファイルの指定
+                                FileScanner fileScanner = fileSet.getDirectoryScanner(this.getProject());
+                                String[] srcFiles = fileScanner.getIncludedFiles();
+                                for(int n=0;n<srcFiles.length;n++){
+                                        args.add(baseDir.getAbsolutePath() + System.getProperty("file.separator") + srcFiles[n]);
+                                };
+                        }
+                        else
+                        {
+                                // ディレクトリの指定
+                                args.add(baseDir.getAbsolutePath());
+                        };
+                };
                 args.addIf(0 < recurse, "--recurse=" + new Integer(recurse).toString());
                 args.addIf(help, "--help");
@@ -62 +97 @@
                 args.addIf(supress, "--supress");
                 args.addIf(ext != null, ext);
-
-                Java task = (Java)getProject().createTask("Java");
-
-                Commandline.Argument arg = task.createArg();
-                arg.setValue(args.toString());
-
-                task.setJar(new File(getPath().getAbsolutePath() + JSDOCNAME));
+                args.addIf(verbose, "--verbose");
+                args.addIf(destDir != null, "--directory=" + getDestDir());
+                args.add("--template=" + getTemplate());
+
+                Java task = (Java)getProject().createTask("java");
                 task.setFork(true);
+                task.setJar(getJar().getAbsoluteFile());
+                // jarに渡すオプション引数の組み立て
+                for(int i=0;i<args.size();i++){
+                        task.createArg().setValue(args.get(i));
+                };
+                // タスク名を”jsdoc”に
+                task.setTaskName("jsdoc");
                 task.execute();
+        };
+
+        public FileSet createSrc()
+        {
+                FileSet fileSet = new FileSet();
+                fileSetList.add(fileSet);
+                return fileSet;
         };
 
@@ -99 +146 @@
 
         /** setter for template **/
-        public void setTemplate(File f){ template = f; };
+        public void setTemplate(String f){ template = f; };
         /** getter for template **/
-        public File getTemplate(){ return template; };
+        public String getTemplate()
+        {
+                if(template == null)
+                {
+                        template =
+                                getPath().getAbsolutePath() +
+                                System.getProperty("file.separator") +
+                                MAINTPL;
+                };
+                return template;
+        };
 
         /** setter for log **/
@@ -132 +189 @@
         /** getter for test **/
         public boolean getTest(){ return test; };
+
+        /** setter for verbose **/
+        public void setVerbose(boolean b){ verbose = b; };
+        /** getter for verbose **/
+        public boolean getVerbose(){ return verbose; };
+
+
+        protected File getJar()
+        {
+                if(jar == null)
+                {
+                        String path =
+                                getPath().getAbsolutePath() +
+                                System.getProperty("file.separator") +
+                                MAINJAR;
+
+                        jar = new File(path);
+                };
+                return jar;
+        };
+
+        protected File getRunjs()
+        {
+                if(runjs == null)
+                {
+                        String path =
+                                getPath().getAbsolutePath() +
+                                System.getProperty("file.separator") +
+                                MAINDOC;
+
+                        runjs = new File(path);
+                };
+                return runjs;
+        };
 };

lang/java/utiljs/trunk/test/testcase.xml

@@ -7 +7 @@
 
         <target name="default">
-                <!-- YUICompressor TestCase::01 -->
+                <!-- YUICompressor TestCase#01 -->
                 <yuic srcDir="test/sample" destDir="result/yuic" />
-                <!-- YUICompressor TestCase::02 -->
+
+                <!-- YUICompressor Case#02 -->
                 <yuic srcDir="test/sample" destDir="result/yuic2" />
-                <!-- HTMLHelpCompile TestCase::03 -->
+
+                <!-- Jsdoc Case#03 -->
+                <jsdoc path="c:/jsdoc" verbose="yes">
+                        <src dir="c:/jsdoc/app" includes="test.js" />
+                </jsdoc>
+
+                <!-- HTMLHelpCompile Case#04 -->
                 <hhc file="test/hhc/sample.hhp" />
         </target>