java/nekurak.net-lib/nbproject/build-impl.xml
changeset 142 44ef544460ca
parent 27 88f3012c60a2
child 151 d7b5099bf65e
     1.1 --- a/java/nekurak.net-lib/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
     1.2 +++ b/java/nekurak.net-lib/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
     1.3 @@ -55,6 +55,7 @@
     1.4      </target>
     1.5      <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
     1.6          <available file="${manifest.file}" property="manifest.available"/>
     1.7 +        <available file="${application.splash}" property="splashscreen.available"/>
     1.8          <condition property="main.class.available">
     1.9              <and>
    1.10                  <isset property="main.class"/>
    1.11 @@ -83,23 +84,40 @@
    1.12                  <isset property="do.mkdist"/>
    1.13              </and>
    1.14          </condition>
    1.15 -        <condition property="manifest.available+mkdist.available">
    1.16 +        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
    1.17              <and>
    1.18 -                <istrue value="${manifest.available}"/>
    1.19 -                <isset property="do.mkdist"/>
    1.20 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
    1.21 +                <istrue value="${splashscreen.available}"/>
    1.22              </and>
    1.23          </condition>
    1.24 -        <condition property="manifest.available-mkdist.available">
    1.25 -            <or>
    1.26 -                <istrue value="${manifest.available}"/>
    1.27 -                <isset property="do.mkdist"/>
    1.28 -            </or>
    1.29 +        <condition property="do.archive">
    1.30 +            <not>
    1.31 +                <istrue value="${jar.archive.disabled}"/>
    1.32 +            </not>
    1.33          </condition>
    1.34 -        <condition property="manifest.available+main.class-mkdist.available">
    1.35 -            <or>
    1.36 +        <condition property="do.archive+manifest.available">
    1.37 +            <and>
    1.38 +                <isset property="manifest.available"/>
    1.39 +                <istrue value="${do.archive}"/>
    1.40 +            </and>
    1.41 +        </condition>
    1.42 +        <condition property="do.archive+manifest.available+main.class">
    1.43 +            <and>
    1.44                  <istrue value="${manifest.available+main.class}"/>
    1.45 -                <isset property="do.mkdist"/>
    1.46 -            </or>
    1.47 +                <istrue value="${do.archive}"/>
    1.48 +            </and>
    1.49 +        </condition>
    1.50 +        <condition property="do.archive+manifest.available+main.class+mkdist.available">
    1.51 +            <and>
    1.52 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
    1.53 +                <istrue value="${do.archive}"/>
    1.54 +            </and>
    1.55 +        </condition>
    1.56 +        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
    1.57 +            <and>
    1.58 +                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
    1.59 +                <istrue value="${do.archive}"/>
    1.60 +            </and>
    1.61          </condition>
    1.62          <condition property="have.tests">
    1.63              <or>
    1.64 @@ -156,6 +174,8 @@
    1.65              <length length="0" string="${endorsed.classpath}" when="greater"/>
    1.66          </condition>
    1.67          <property name="javac.fork" value="false"/>
    1.68 +        <property name="jar.index" value="false"/>
    1.69 +        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
    1.70      </target>
    1.71      <target name="-post-init">
    1.72          <!-- Empty placeholder for easier customization. -->
    1.73 @@ -182,11 +202,53 @@
    1.74              </sequential>
    1.75          </macrodef>
    1.76      </target>
    1.77 -    <target name="-init-macrodef-javac">
    1.78 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
    1.79          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
    1.80              <attribute default="${src.dir}" name="srcdir"/>
    1.81              <attribute default="${build.classes.dir}" name="destdir"/>
    1.82              <attribute default="${javac.classpath}" name="classpath"/>
    1.83 +            <attribute default="${javac.processorpath}" name="processorpath"/>
    1.84 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
    1.85 +            <attribute default="${includes}" name="includes"/>
    1.86 +            <attribute default="${excludes}" name="excludes"/>
    1.87 +            <attribute default="${javac.debug}" name="debug"/>
    1.88 +            <attribute default="${empty.dir}" name="sourcepath"/>
    1.89 +            <attribute default="${empty.dir}" name="gensrcdir"/>
    1.90 +            <element name="customize" optional="true"/>
    1.91 +            <sequential>
    1.92 +                <property location="${build.dir}/empty" name="empty.dir"/>
    1.93 +                <mkdir dir="${empty.dir}"/>
    1.94 +                <mkdir dir="@{apgeneratedsrcdir}"/>
    1.95 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
    1.96 +                    <src>
    1.97 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
    1.98 +                            <include name="*"/>
    1.99 +                        </dirset>
   1.100 +                    </src>
   1.101 +                    <classpath>
   1.102 +                        <path path="@{classpath}"/>
   1.103 +                    </classpath>
   1.104 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.105 +                    <compilerarg line="${javac.compilerargs}"/>
   1.106 +                    <compilerarg value="-processorpath"/>
   1.107 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
   1.108 +                    <compilerarg line="${ap.processors.internal}"/>
   1.109 +                    <compilerarg line="${annotation.processing.processor.options}"/>
   1.110 +                    <compilerarg value="-s"/>
   1.111 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   1.112 +                    <compilerarg line="${ap.proc.none.internal}"/>
   1.113 +                    <customize/>
   1.114 +                </javac>
   1.115 +            </sequential>
   1.116 +        </macrodef>
   1.117 +    </target>
   1.118 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   1.119 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.120 +            <attribute default="${src.dir}" name="srcdir"/>
   1.121 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.122 +            <attribute default="${javac.classpath}" name="classpath"/>
   1.123 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   1.124 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.125              <attribute default="${includes}" name="includes"/>
   1.126              <attribute default="${excludes}" name="excludes"/>
   1.127              <attribute default="${javac.debug}" name="debug"/>
   1.128 @@ -211,6 +273,8 @@
   1.129                  </javac>
   1.130              </sequential>
   1.131          </macrodef>
   1.132 +    </target>
   1.133 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   1.134          <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.135              <attribute default="${src.dir}" name="srcdir"/>
   1.136              <attribute default="${build.classes.dir}" name="destdir"/>
   1.137 @@ -358,14 +422,65 @@
   1.138              </sequential>
   1.139          </macrodef>
   1.140      </target>
   1.141 +    <target name="-init-macrodef-copylibs">
   1.142 +        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.143 +            <element name="customize" optional="true"/>
   1.144 +            <sequential>
   1.145 +                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.146 +                <pathconvert property="run.classpath.without.build.classes.dir">
   1.147 +                    <path path="${run.classpath}"/>
   1.148 +                    <map from="${build.classes.dir.resolved}" to=""/>
   1.149 +                </pathconvert>
   1.150 +                <pathconvert pathsep=" " property="jar.classpath">
   1.151 +                    <path path="${run.classpath.without.build.classes.dir}"/>
   1.152 +                    <chainedmapper>
   1.153 +                        <flattenmapper/>
   1.154 +                        <globmapper from="*" to="lib/*"/>
   1.155 +                    </chainedmapper>
   1.156 +                </pathconvert>
   1.157 +                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.158 +                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.159 +                    <fileset dir="${build.classes.dir}"/>
   1.160 +                    <manifest>
   1.161 +                        <attribute name="Class-Path" value="${jar.classpath}"/>
   1.162 +                        <customize/>
   1.163 +                    </manifest>
   1.164 +                </copylibs>
   1.165 +            </sequential>
   1.166 +        </macrodef>
   1.167 +    </target>
   1.168      <target name="-init-presetdef-jar">
   1.169          <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.170 -            <jar compress="${jar.compress}" jarfile="${dist.jar}">
   1.171 +            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
   1.172                  <j2seproject1:fileset dir="${build.classes.dir}"/>
   1.173              </jar>
   1.174          </presetdef>
   1.175      </target>
   1.176 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
   1.177 +    <target name="-init-ap-cmdline-properties">
   1.178 +        <property name="annotation.processing.enabled" value="true"/>
   1.179 +        <property name="annotation.processing.processors.list" value=""/>
   1.180 +        <property name="annotation.processing.processor.options" value=""/>
   1.181 +        <property name="annotation.processing.run.all.processors" value="true"/>
   1.182 +        <property name="javac.processorpath" value="${javac.classpath}"/>
   1.183 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
   1.184 +        <condition property="ap.supported.internal" value="true">
   1.185 +            <not>
   1.186 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
   1.187 +            </not>
   1.188 +        </condition>
   1.189 +    </target>
   1.190 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
   1.191 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
   1.192 +            <isfalse value="${annotation.processing.run.all.processors}"/>
   1.193 +        </condition>
   1.194 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
   1.195 +            <isfalse value="${annotation.processing.enabled}"/>
   1.196 +        </condition>
   1.197 +    </target>
   1.198 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
   1.199 +        <property name="ap.cmd.line.internal" value=""/>
   1.200 +    </target>
   1.201 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
   1.202      <!--
   1.203                  ===================
   1.204                  COMPILATION SECTION
   1.205 @@ -409,12 +524,18 @@
   1.206          </pathconvert>
   1.207          <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
   1.208      </target>
   1.209 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
   1.210 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
   1.211          <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
   1.212          <copy todir="${build.classes.dir}">
   1.213              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.214          </copy>
   1.215      </target>
   1.216 +    <target if="has.persistence.xml" name="-copy-persistence-xml">
   1.217 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   1.218 +        <copy todir="${build.classes.dir}/META-INF">
   1.219 +            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
   1.220 +        </copy>
   1.221 +    </target>
   1.222      <target name="-post-compile">
   1.223          <!-- Empty placeholder for easier customization. -->
   1.224          <!-- You can override this target in the ../build.xml file. -->
   1.225 @@ -447,13 +568,13 @@
   1.226          <!-- Empty placeholder for easier customization. -->
   1.227          <!-- You can override this target in the ../build.xml file. -->
   1.228      </target>
   1.229 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
   1.230 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
   1.231          <j2seproject1:jar/>
   1.232      </target>
   1.233 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
   1.234 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
   1.235          <j2seproject1:jar manifest="${manifest.file}"/>
   1.236      </target>
   1.237 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
   1.238 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
   1.239          <j2seproject1:jar manifest="${manifest.file}">
   1.240              <j2seproject1:manifest>
   1.241                  <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
   1.242 @@ -468,78 +589,35 @@
   1.243          </pathconvert>
   1.244          <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
   1.245      </target>
   1.246 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
   1.247 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.248 -        <pathconvert property="run.classpath.without.build.classes.dir">
   1.249 -            <path path="${run.classpath}"/>
   1.250 -            <map from="${build.classes.dir.resolved}" to=""/>
   1.251 -        </pathconvert>
   1.252 -        <pathconvert pathsep=" " property="jar.classpath">
   1.253 -            <path path="${run.classpath.without.build.classes.dir}"/>
   1.254 -            <chainedmapper>
   1.255 -                <flattenmapper/>
   1.256 -                <globmapper from="*" to="lib/*"/>
   1.257 -            </chainedmapper>
   1.258 -        </pathconvert>
   1.259 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.260 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.261 -            <fileset dir="${build.classes.dir}"/>
   1.262 -            <manifest>
   1.263 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
   1.264 +        <basename file="${application.splash}" property="splashscreen.basename"/>
   1.265 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   1.266 +        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
   1.267 +        <j2seproject3:copylibs>
   1.268 +            <customize>
   1.269                  <attribute name="Main-Class" value="${main.class}"/>
   1.270 -                <attribute name="Class-Path" value="${jar.classpath}"/>
   1.271 -            </manifest>
   1.272 -        </copylibs>
   1.273 +                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
   1.274 +            </customize>
   1.275 +        </j2seproject3:copylibs>
   1.276          <echo>To run this application from the command line without Ant, try:</echo>
   1.277          <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.278          <echo>java -jar "${dist.jar.resolved}"</echo>
   1.279      </target>
   1.280 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
   1.281 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.282 -        <pathconvert property="run.classpath.without.build.classes.dir">
   1.283 -            <path path="${run.classpath}"/>
   1.284 -            <map from="${build.classes.dir.resolved}" to=""/>
   1.285 -        </pathconvert>
   1.286 -        <pathconvert pathsep=" " property="jar.classpath">
   1.287 -            <path path="${run.classpath.without.build.classes.dir}"/>
   1.288 -            <chainedmapper>
   1.289 -                <flattenmapper/>
   1.290 -                <globmapper from="*" to="lib/*"/>
   1.291 -            </chainedmapper>
   1.292 -        </pathconvert>
   1.293 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.294 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.295 -            <fileset dir="${build.classes.dir}"/>
   1.296 -            <manifest>
   1.297 -                <attribute name="Class-Path" value="${jar.classpath}"/>
   1.298 -            </manifest>
   1.299 -        </copylibs>
   1.300 -    </target>
   1.301 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
   1.302 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.303 -        <pathconvert property="run.classpath.without.build.classes.dir">
   1.304 -            <path path="${run.classpath}"/>
   1.305 -            <map from="${build.classes.dir.resolved}" to=""/>
   1.306 -        </pathconvert>
   1.307 -        <pathconvert pathsep=" " property="jar.classpath">
   1.308 -            <path path="${run.classpath.without.build.classes.dir}"/>
   1.309 -            <chainedmapper>
   1.310 -                <flattenmapper/>
   1.311 -                <globmapper from="*" to="lib/*"/>
   1.312 -            </chainedmapper>
   1.313 -        </pathconvert>
   1.314 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.315 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.316 -            <fileset dir="${build.classes.dir}"/>
   1.317 -            <manifest>
   1.318 -                <attribute name="Class-Path" value="${jar.classpath}"/>
   1.319 -            </manifest>
   1.320 -        </copylibs>
   1.321 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
   1.322 +        <j2seproject3:copylibs>
   1.323 +            <customize>
   1.324 +                <attribute name="Main-Class" value="${main.class}"/>
   1.325 +            </customize>
   1.326 +        </j2seproject3:copylibs>
   1.327 +        <echo>To run this application from the command line without Ant, try:</echo>
   1.328 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.329 +        <echo>java -jar "${dist.jar.resolved}"</echo>
   1.330      </target>
   1.331      <target name="-post-jar">
   1.332          <!-- Empty placeholder for easier customization. -->
   1.333          <!-- You can override this target in the ../build.xml file. -->
   1.334      </target>
   1.335 -    <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-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
   1.336 +    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
   1.337      <!--
   1.338                  =================
   1.339                  EXECUTION SECTION
   1.340 @@ -609,7 +687,7 @@
   1.341                  JAVADOC SECTION
   1.342                  ===============
   1.343              -->
   1.344 -    <target depends="init" name="-javadoc-build">
   1.345 +    <target depends="init" if="have.sources" name="-javadoc-build">
   1.346          <mkdir dir="${dist.javadoc.dir}"/>
   1.347          <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
   1.348              <classpath>
   1.349 @@ -643,7 +721,7 @@
   1.350          <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.351      </target>
   1.352      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   1.353 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.354 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
   1.355          <copy todir="${build.test.classes.dir}">
   1.356              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.357          </copy>
   1.358 @@ -660,7 +738,7 @@
   1.359      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.360          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.361          <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
   1.362 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   1.363 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   1.364          <copy todir="${build.test.classes.dir}">
   1.365              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.366          </copy>