OSDN Git Service

新コンフィグフォーマット対応.
authoryuki <yuki@bdf3b611-c98c-6041-8292-703d9c9adbe7>
Sat, 23 May 2009 22:06:25 +0000 (22:06 +0000)
committeryuki <yuki@bdf3b611-c98c-6041-8292-703d9c9adbe7>
Sat, 23 May 2009 22:06:25 +0000 (22:06 +0000)
NB6.7へのアップデートに伴う更新.

git-svn-id: http://192.168.11.7/svn/repository/NicoBrowserBranches/release_20090323/NicoBrowser@128 bdf3b611-c98c-6041-8292-703d9c9adbe7

nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/groovy-build.xml
nbproject/project.properties

index e03bd4f..9b241b6 100644 (file)
@@ -22,6 +22,13 @@ is divided into following sections:
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="NicoBrowser-impl">\r
     <import file="groovy-build.xml"/>\r
     <import file="jnlp-impl.xml"/>\r
+    <fail message="Please build using Ant 1.7.1 or higher.">\r
+        <condition>\r
+            <not>\r
+                <antversion atleast="1.7.1"/>\r
+            </not>\r
+        </condition>\r
+    </fail>\r
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>\r
     <!-- \r
                 ======================\r
@@ -154,10 +161,18 @@ is divided into following sections:
             <attribute default="${includes}" name="includes"/>\r
             <attribute default="${excludes}" name="excludes"/>\r
             <attribute default="${javac.debug}" name="debug"/>\r
-            <attribute default="/does/not/exist" name="sourcepath"/>\r
+            <attribute default="${empty.dir}" name="sourcepath"/>\r
+            <attribute default="${empty.dir}" name="gensrcdir"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
+                <property location="${build.dir}/empty" name="empty.dir"/>\r
+                <mkdir dir="${empty.dir}"/>\r
                 <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">\r
+                    <src>\r
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
+                            <include name="*"/>\r
+                        </dirset>\r
+                    </src>\r
                     <classpath>\r
                         <path path="@{classpath}"/>\r
                     </classpath>\r
@@ -273,6 +288,8 @@ is divided into following sections:
                 <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${debug-args-line}"/>\r
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
+                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>\r
+                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>\r
                     <jvmarg line="${run.jvmargs}"/>\r
                     <classpath>\r
                         <path path="@{classpath}"/>\r
@@ -289,12 +306,15 @@ is divided into following sections:
     <target name="-init-macrodef-java">\r
         <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">\r
             <attribute default="${main.class}" name="classname"/>\r
+            <attribute default="${run.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
                 <java classname="@{classname}" dir="${work.dir}" fork="true">\r
+                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>\r
+                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>\r
                     <jvmarg line="${run.jvmargs}"/>\r
                     <classpath>\r
-                        <path path="${run.classpath}"/>\r
+                        <path path="@{classpath}"/>\r
                     </classpath>\r
                     <syspropertyset>\r
                         <propertyref prefix="run-sys-prop."/>\r
@@ -334,10 +354,15 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->\r
     </target>\r
     <target if="do.depend.true" name="-compile-depend">\r
-        <j2seproject3:depend/>\r
+        <pathconvert property="build.generated.subdirs">\r
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
+                <include name="*"/>\r
+            </dirset>\r
+        </pathconvert>\r
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>\r
     </target>\r
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">\r
-        <j2seproject3:javac/>\r
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>\r
         <copy todir="${build.classes.dir}">\r
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
         </copy>\r
@@ -354,7 +379,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">\r
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>\r
         <j2seproject3:force-recompile/>\r
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>\r
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>\r
     </target>\r
     <target name="-post-compile-single">\r
         <!-- Empty placeholder for easier customization. -->\r
@@ -420,11 +445,29 @@ is divided into following sections:
         <property location="${dist.jar}" name="dist.jar.resolved"/>\r
         <echo>java -jar "${dist.jar.resolved}"</echo>\r
     </target>\r
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="libs.CopyLibs.classpath" name="-do-jar-with-libraries-without-manifest" unless="manifest.available+main.class">\r
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
+        <pathconvert property="run.classpath.without.build.classes.dir">\r
+            <path path="${run.classpath}"/>\r
+            <map from="${build.classes.dir.resolved}" to=""/>\r
+        </pathconvert>\r
+        <pathconvert pathsep=" " property="jar.classpath">\r
+            <path path="${run.classpath.without.build.classes.dir}"/>\r
+            <chainedmapper>\r
+                <flattenmapper/>\r
+                <globmapper from="*" to="lib/*"/>\r
+            </chainedmapper>\r
+        </pathconvert>\r
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>\r
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">\r
+            <fileset dir="${build.classes.dir}"/>\r
+        </copylibs>\r
+    </target>\r
     <target name="-post-jar">\r
         <!-- Empty placeholder for easier customization. -->\r
         <!-- You can override this target in the ../build.xml file. -->\r
     </target>\r
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,jnlp" description="Build JAR." name="jar"/>\r
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-manifest,-post-jar,jnlp" description="Build JAR." name="jar"/>\r
     <!--\r
                 =================\r
                 EXECUTION SECTION\r
@@ -444,6 +487,10 @@ is divided into following sections:
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
         <j2seproject1:java classname="${run.class}"/>\r
     </target>\r
+    <target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">\r
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>\r
+    </target>\r
     <!--\r
                 =================\r
                 DEBUGGING SECTION\r
@@ -452,6 +499,9 @@ is divided into following sections:
     <target depends="init" if="netbeans.home" name="-debug-start-debugger">\r
         <j2seproject1:nbjpdastart name="${debug.class}"/>\r
     </target>\r
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">\r
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>\r
+    </target>\r
     <target depends="init,compile" name="-debug-start-debuggee">\r
         <j2seproject3:debug>\r
             <customize>\r
@@ -469,6 +519,11 @@ is divided into following sections:
         <j2seproject3:debug classname="${debug.class}"/>\r
     </target>\r
     <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>\r
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">\r
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>\r
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>\r
+    </target>\r
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>\r
     <target depends="init" name="-pre-debug-fix">\r
         <fail unless="fix.includes">Must set fix.includes</fail>\r
         <property name="javac.includes" value="${fix.includes}.java"/>\r
@@ -491,6 +546,9 @@ is divided into following sections:
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">\r
                 <filename name="**/*.java"/>\r
             </fileset>\r
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
+                <include name="**/*.java"/>\r
+            </fileset>\r
         </javadoc>\r
     </target>\r
     <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">\r
@@ -552,7 +610,7 @@ is divided into following sections:
         <j2seproject3:junit testincludes="**/*Test.java"/>\r
     </target>\r
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">\r
-        <fail if="tests.failed">Some tests failed; see details above.</fail>\r
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
     </target>\r
     <target depends="init" if="have.tests" name="test-report"/>\r
     <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>\r
@@ -565,7 +623,7 @@ is divided into following sections:
         <j2seproject3:junit excludes="" includes="${test.includes}"/>\r
     </target>\r
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">\r
-        <fail if="tests.failed">Some tests failed; see details above.</fail>\r
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
     </target>\r
     <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>\r
     <!--\r
index 4048ca9..bc1ae26 100644 (file)
@@ -1,8 +1,11 @@
 build.xml.data.CRC32=d1b53a37\r
 build.xml.script.CRC32=02aac843\r
-build.xml.stylesheet.CRC32=958a1d3e\r
+build.xml.stylesheet.CRC32=958a1d3e@1.26.0.45\r
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
 nbproject/build-impl.xml.data.CRC32=d1b53a37\r
-nbproject/build-impl.xml.script.CRC32=099f93c3\r
-nbproject/build-impl.xml.stylesheet.CRC32=65b8de21\r
+nbproject/build-impl.xml.script.CRC32=64e0e087\r
+nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.0.45\r
+nbproject/groovy-build.xml.data.CRC32=d1b53a37\r
+nbproject/groovy-build.xml.script.CRC32=6721cc58\r
+nbproject/groovy-build.xml.stylesheet.CRC32=ad2b7201@1.7\r
index fdd5454..de0aef9 100644 (file)
@@ -1,55 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
-    <target name="-groovy-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <taskdef name="groovyc" classpath="${javac.classpath}" classname="org.codehaus.groovy.ant.Groovyc"/>
-                <groovyc destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                        <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                        <customize/>
-                    </javac>
-                </groovyc>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+*** GENERATED FROM project.xml - DO NOT EDIT  ***\r
+***         EDIT ../build.xml INSTEAD         ***\r
+\r
+        -->\r
+<project xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc">\r
+    <target name="-groovy-init-macrodef-javac">\r
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute name="srcdir" default="${src.dir}"/>\r
+            <attribute name="destdir" default="${build.classes.dir}"/>\r
+            <attribute name="classpath" default="${javac.classpath}"/>\r
+            <attribute name="includes" default="${includes}"/>\r
+            <attribute name="excludes" default="${excludes}"/>\r
+            <attribute name="debug" default="${javac.debug}"/>\r
+            <attribute name="sourcepath" default="${empty.dir}"/>\r
+            <attribute name="gensrcdir" default="${empty.dir}"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <taskdef name="groovyc" classpath="${javac.classpath}" classname="org.codehaus.groovy.ant.Groovyc"/>\r
+                <property name="empty.dir" location="${build.dir}/empty"/>\r
+                <mkdir dir="${empty.dir}"/>\r
+                <groovyc srcdir="@{srcdir}" sourcepath="@{sourcepath}" destdir="@{destdir}" encoding="${source.encoding}" includes="@{includes}" excludes="@{excludes}">\r
+                    <src>\r
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
+                            <include name="*"/>\r
+                        </dirset>\r
+                    </src>\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                    <javac srcdir="@{srcdir}" sourcepath="@{sourcepath}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" encoding="${source.encoding}" source="${javac.source}" target="${javac.target}" includes="@{includes}" excludes="@{excludes}" includeantruntime="false">\r
+                        <src>\r
+                            <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
+                                <include name="*"/>\r
+                            </dirset>\r
+                        </src>\r
+                        <classpath>\r
+                            <path path="@{classpath}"/>\r
+                        </classpath>\r
+                        <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>\r
+                        <customize/>\r
+                    </javac>\r
+                </groovyc>\r
+            </sequential>\r
+        </macrodef>\r
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute name="srcdir" default="${src.dir}"/>\r
+            <attribute name="destdir" default="${build.classes.dir}"/>\r
+            <attribute name="classpath" default="${javac.classpath}"/>\r
+            <sequential>\r
+                <depend srcdir="@{srcdir}" destdir="@{destdir}" cache="${build.dir}/depcache" includes="${includes}" excludes="${excludes}">\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                </depend>\r
+            </sequential>\r
+        </macrodef>\r
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute name="destdir" default="${build.classes.dir}"/>\r
+            <sequential>\r
+                <fail unless="javac.includes">Must set javac.includes</fail>\r
+                <pathconvert property="javac.includes.binary" pathsep=",">\r
+                    <path>\r
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>\r
+                    </path>\r
+                    <globmapper from="*.java" to="*.class"/>\r
+                </pathconvert>\r
+                <delete>\r
+                    <files includes="${javac.includes.binary}"/>\r
+                </delete>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+</project>\r
index 515ce6a..8e1f1d2 100644 (file)
@@ -6,6 +6,7 @@ build.classes.excludes=
 # This directory is removed when the project is cleaned:\r
 build.dir=build\r
 build.generated.dir=${build.dir}/generated\r
+build.generated.sources.dir=${build.dir}/generated-sources\r
 # Only compile against the classpath explicitly listed here:\r
 build.sysclasspath=ignore\r
 build.test.classes.dir=${build.dir}/test/classes\r
@@ -19,6 +20,7 @@ dist.dir=dist
 dist.jar=${dist.dir}/NicoBrowser.jar\r
 dist.javadoc.dir=${dist.dir}/javadoc\r
 excludes=\r
+file.reference.commons-io-1.4.jar=F:\\data\\java\\commons\\commons-io-1.4\\commons-io-1.4.jar\r
 includes=**\r
 jar.compress=false\r
 javac.classpath=\\r
@@ -28,8 +30,9 @@ javac.classpath=\
     ${libs.toplink.classpath}:\\r
     ${libs.HttpClient4.classpath}:\\r
     ${libs.Log4J.classpath}:\\r
-    ${libs.groovy-all.classpath}:\\r
-    ${libs.NekoHtml.classpath}\r
+    ${libs.NekoHtml.classpath}:\\r
+    ${file.reference.commons-io-1.4.jar}:\\r
+    ${libs.groovy-all.classpath}\r
 # Space-separated list of extra javac options\r
 javac.compilerargs=\r
 javac.deprecation=false\r
@@ -47,13 +50,15 @@ javadoc.noindex=false
 javadoc.nonavbar=false\r
 javadoc.notree=false\r
 javadoc.private=false\r
+javadoc.reference.commons-io-1.4.jar=F:\\data\\java\\commons\\commons-io-1.4\\docs\r
 javadoc.splitindex=true\r
 javadoc.use=true\r
 javadoc.version=false\r
 javadoc.windowtitle=\r
 jnlp.codebase.type=user\r
 jnlp.codebase.user=http://feather.cocolog-nifty.com/weblog/program/NicoBrowser\r
-jnlp.enabled=true\r
+jnlp.descriptor=application\r
+jnlp.enabled=false\r
 jnlp.offline-allowed=true\r
 jnlp.signed=true\r
 # Property libs.Codec.classpath is set here just to make sharing of project simpler.\r
@@ -86,6 +91,7 @@ run.test.classpath=\
     ${javac.test.classpath}:\\r
     ${build.test.classes.dir}\r
 source.encoding=UTF-8\r
+source.reference.commons-io-1.4.jar=F:\\data\\java\\commons\\commons-io-1.4\\commons-io-1.4-sources.jar\r
 src.dir=src\r
 test.src.dir=test\r
 compile.on.save.unsupported.groovy=true\r