修訂 | 590407d040cfb1c4e4bfaf3aedb0fbff54bc9a3a (tree) |
---|---|
時間 | 2011-05-02 05:21:28 |
作者 | Takuya Ono <takuya-o@user...> |
Commiter | Takuya Ono |
Upgrade NetBeans 6.8 to 6.9.
@@ -55,6 +55,7 @@ is divided into following sections: | ||
55 | 55 | </target> |
56 | 56 | <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> |
57 | 57 | <available file="${manifest.file}" property="manifest.available"/> |
58 | + <available file="${application.splash}" property="splashscreen.available"/> | |
58 | 59 | <condition property="main.class.available"> |
59 | 60 | <and> |
60 | 61 | <isset property="main.class"/> |
@@ -83,23 +84,40 @@ is divided into following sections: | ||
83 | 84 | <isset property="do.mkdist"/> |
84 | 85 | </and> |
85 | 86 | </condition> |
86 | - <condition property="manifest.available+mkdist.available"> | |
87 | + <condition property="manifest.available+main.class+mkdist.available+splashscreen.available"> | |
87 | 88 | <and> |
88 | - <istrue value="${manifest.available}"/> | |
89 | - <isset property="do.mkdist"/> | |
89 | + <istrue value="${manifest.available+main.class+mkdist.available}"/> | |
90 | + <istrue value="${splashscreen.available}"/> | |
90 | 91 | </and> |
91 | 92 | </condition> |
92 | - <condition property="manifest.available-mkdist.available"> | |
93 | - <or> | |
94 | - <istrue value="${manifest.available}"/> | |
95 | - <isset property="do.mkdist"/> | |
96 | - </or> | |
93 | + <condition property="do.archive"> | |
94 | + <not> | |
95 | + <istrue value="${jar.archive.disabled}"/> | |
96 | + </not> | |
97 | 97 | </condition> |
98 | - <condition property="manifest.available+main.class-mkdist.available"> | |
99 | - <or> | |
98 | + <condition property="do.archive+manifest.available"> | |
99 | + <and> | |
100 | + <isset property="manifest.available"/> | |
101 | + <istrue value="${do.archive}"/> | |
102 | + </and> | |
103 | + </condition> | |
104 | + <condition property="do.archive+manifest.available+main.class"> | |
105 | + <and> | |
100 | 106 | <istrue value="${manifest.available+main.class}"/> |
101 | - <isset property="do.mkdist"/> | |
102 | - </or> | |
107 | + <istrue value="${do.archive}"/> | |
108 | + </and> | |
109 | + </condition> | |
110 | + <condition property="do.archive+manifest.available+main.class+mkdist.available"> | |
111 | + <and> | |
112 | + <istrue value="${manifest.available+main.class+mkdist.available}"/> | |
113 | + <istrue value="${do.archive}"/> | |
114 | + </and> | |
115 | + </condition> | |
116 | + <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available"> | |
117 | + <and> | |
118 | + <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/> | |
119 | + <istrue value="${do.archive}"/> | |
120 | + </and> | |
103 | 121 | </condition> |
104 | 122 | <condition property="have.tests"> |
105 | 123 | <or> |
@@ -156,6 +174,8 @@ is divided into following sections: | ||
156 | 174 | <length length="0" string="${endorsed.classpath}" when="greater"/> |
157 | 175 | </condition> |
158 | 176 | <property name="javac.fork" value="false"/> |
177 | + <property name="jar.index" value="false"/> | |
178 | + <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> | |
159 | 179 | </target> |
160 | 180 | <target name="-post-init"> |
161 | 181 | <!-- Empty placeholder for easier customization. --> |
@@ -182,11 +202,53 @@ is divided into following sections: | ||
182 | 202 | </sequential> |
183 | 203 | </macrodef> |
184 | 204 | </target> |
185 | - <target name="-init-macrodef-javac"> | |
205 | + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> | |
206 | + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> | |
207 | + <attribute default="${src.src.dir}" name="srcdir"/> | |
208 | + <attribute default="${build.classes.dir}" name="destdir"/> | |
209 | + <attribute default="${javac.classpath}" name="classpath"/> | |
210 | + <attribute default="${javac.processorpath}" name="processorpath"/> | |
211 | + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> | |
212 | + <attribute default="${includes}" name="includes"/> | |
213 | + <attribute default="${excludes}" name="excludes"/> | |
214 | + <attribute default="${javac.debug}" name="debug"/> | |
215 | + <attribute default="${empty.dir}" name="sourcepath"/> | |
216 | + <attribute default="${empty.dir}" name="gensrcdir"/> | |
217 | + <element name="customize" optional="true"/> | |
218 | + <sequential> | |
219 | + <property location="${build.dir}/empty" name="empty.dir"/> | |
220 | + <mkdir dir="${empty.dir}"/> | |
221 | + <mkdir dir="@{apgeneratedsrcdir}"/> | |
222 | + <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}"> | |
223 | + <src> | |
224 | + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> | |
225 | + <include name="*"/> | |
226 | + </dirset> | |
227 | + </src> | |
228 | + <classpath> | |
229 | + <path path="@{classpath}"/> | |
230 | + </classpath> | |
231 | + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> | |
232 | + <compilerarg line="${javac.compilerargs}"/> | |
233 | + <compilerarg value="-processorpath"/> | |
234 | + <compilerarg path="@{processorpath}:${empty.dir}"/> | |
235 | + <compilerarg line="${ap.processors.internal}"/> | |
236 | + <compilerarg line="${annotation.processing.processor.options}"/> | |
237 | + <compilerarg value="-s"/> | |
238 | + <compilerarg path="@{apgeneratedsrcdir}"/> | |
239 | + <compilerarg line="${ap.proc.none.internal}"/> | |
240 | + <customize/> | |
241 | + </javac> | |
242 | + </sequential> | |
243 | + </macrodef> | |
244 | + </target> | |
245 | + <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> | |
186 | 246 | <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> |
187 | 247 | <attribute default="${src.src.dir}" name="srcdir"/> |
188 | 248 | <attribute default="${build.classes.dir}" name="destdir"/> |
189 | 249 | <attribute default="${javac.classpath}" name="classpath"/> |
250 | + <attribute default="${javac.processorpath}" name="processorpath"/> | |
251 | + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> | |
190 | 252 | <attribute default="${includes}" name="includes"/> |
191 | 253 | <attribute default="${excludes}" name="excludes"/> |
192 | 254 | <attribute default="${javac.debug}" name="debug"/> |
@@ -211,6 +273,8 @@ is divided into following sections: | ||
211 | 273 | </javac> |
212 | 274 | </sequential> |
213 | 275 | </macrodef> |
276 | + </target> | |
277 | + <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> | |
214 | 278 | <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> |
215 | 279 | <attribute default="${src.src.dir}" name="srcdir"/> |
216 | 280 | <attribute default="${build.classes.dir}" name="destdir"/> |
@@ -358,14 +422,65 @@ is divided into following sections: | ||
358 | 422 | </sequential> |
359 | 423 | </macrodef> |
360 | 424 | </target> |
425 | + <target name="-init-macrodef-copylibs"> | |
426 | + <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> | |
427 | + <element name="customize" optional="true"/> | |
428 | + <sequential> | |
429 | + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> | |
430 | + <pathconvert property="run.classpath.without.build.classes.dir"> | |
431 | + <path path="${run.classpath}"/> | |
432 | + <map from="${build.classes.dir.resolved}" to=""/> | |
433 | + </pathconvert> | |
434 | + <pathconvert pathsep=" " property="jar.classpath"> | |
435 | + <path path="${run.classpath.without.build.classes.dir}"/> | |
436 | + <chainedmapper> | |
437 | + <flattenmapper/> | |
438 | + <globmapper from="*" to="lib/*"/> | |
439 | + </chainedmapper> | |
440 | + </pathconvert> | |
441 | + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> | |
442 | + <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> | |
443 | + <fileset dir="${build.classes.dir}"/> | |
444 | + <manifest> | |
445 | + <attribute name="Class-Path" value="${jar.classpath}"/> | |
446 | + <customize/> | |
447 | + </manifest> | |
448 | + </copylibs> | |
449 | + </sequential> | |
450 | + </macrodef> | |
451 | + </target> | |
361 | 452 | <target name="-init-presetdef-jar"> |
362 | 453 | <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> |
363 | - <jar compress="${jar.compress}" jarfile="${dist.jar}"> | |
454 | + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> | |
364 | 455 | <j2seproject1:fileset dir="${build.classes.dir}"/> |
365 | 456 | </jar> |
366 | 457 | </presetdef> |
367 | 458 | </target> |
368 | - <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"/> | |
459 | + <target name="-init-ap-cmdline-properties"> | |
460 | + <property name="annotation.processing.enabled" value="true"/> | |
461 | + <property name="annotation.processing.processors.list" value=""/> | |
462 | + <property name="annotation.processing.processor.options" value=""/> | |
463 | + <property name="annotation.processing.run.all.processors" value="true"/> | |
464 | + <property name="javac.processorpath" value="${javac.classpath}"/> | |
465 | + <property name="javac.test.processorpath" value="${javac.test.classpath}"/> | |
466 | + <condition property="ap.supported.internal" value="true"> | |
467 | + <not> | |
468 | + <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/> | |
469 | + </not> | |
470 | + </condition> | |
471 | + </target> | |
472 | + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported"> | |
473 | + <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}"> | |
474 | + <isfalse value="${annotation.processing.run.all.processors}"/> | |
475 | + </condition> | |
476 | + <condition else="" property="ap.proc.none.internal" value="-proc:none"> | |
477 | + <isfalse value="${annotation.processing.enabled}"/> | |
478 | + </condition> | |
479 | + </target> | |
480 | + <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> | |
481 | + <property name="ap.cmd.line.internal" value=""/> | |
482 | + </target> | |
483 | + <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"/> | |
369 | 484 | <!-- |
370 | 485 | =================== |
371 | 486 | COMPILATION SECTION |
@@ -409,12 +524,18 @@ is divided into following sections: | ||
409 | 524 | </pathconvert> |
410 | 525 | <j2seproject3:depend srcdir="${src.src.dir}:${build.generated.subdirs}"/> |
411 | 526 | </target> |
412 | - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> | |
527 | + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> | |
413 | 528 | <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> |
414 | 529 | <copy todir="${build.classes.dir}"> |
415 | 530 | <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> |
416 | 531 | </copy> |
417 | 532 | </target> |
533 | + <target if="has.persistence.xml" name="-copy-persistence-xml"> | |
534 | + <mkdir dir="${build.classes.dir}/META-INF"/> | |
535 | + <copy todir="${build.classes.dir}/META-INF"> | |
536 | + <fileset dir="${meta.inf.dir}" includes="persistence.xml"/> | |
537 | + </copy> | |
538 | + </target> | |
418 | 539 | <target name="-post-compile"> |
419 | 540 | <!-- Empty placeholder for easier customization. --> |
420 | 541 | <!-- You can override this target in the ../build.xml file. --> |
@@ -447,13 +568,13 @@ is divided into following sections: | ||
447 | 568 | <!-- Empty placeholder for easier customization. --> |
448 | 569 | <!-- You can override this target in the ../build.xml file. --> |
449 | 570 | </target> |
450 | - <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> | |
571 | + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available"> | |
451 | 572 | <j2seproject1:jar/> |
452 | 573 | </target> |
453 | - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available"> | |
574 | + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> | |
454 | 575 | <j2seproject1:jar manifest="${manifest.file}"/> |
455 | 576 | </target> |
456 | - <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"> | |
577 | + <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"> | |
457 | 578 | <j2seproject1:jar manifest="${manifest.file}"> |
458 | 579 | <j2seproject1:manifest> |
459 | 580 | <j2seproject1:attribute name="Main-Class" value="${main.class}"/> |
@@ -468,78 +589,35 @@ is divided into following sections: | ||
468 | 589 | </pathconvert> |
469 | 590 | <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> |
470 | 591 | </target> |
471 | - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> | |
472 | - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> | |
473 | - <pathconvert property="run.classpath.without.build.classes.dir"> | |
474 | - <path path="${run.classpath}"/> | |
475 | - <map from="${build.classes.dir.resolved}" to=""/> | |
476 | - </pathconvert> | |
477 | - <pathconvert pathsep=" " property="jar.classpath"> | |
478 | - <path path="${run.classpath.without.build.classes.dir}"/> | |
479 | - <chainedmapper> | |
480 | - <flattenmapper/> | |
481 | - <globmapper from="*" to="lib/*"/> | |
482 | - </chainedmapper> | |
483 | - </pathconvert> | |
484 | - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> | |
485 | - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> | |
486 | - <fileset dir="${build.classes.dir}"/> | |
487 | - <manifest> | |
592 | + <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"> | |
593 | + <basename file="${application.splash}" property="splashscreen.basename"/> | |
594 | + <mkdir dir="${build.classes.dir}/META-INF"/> | |
595 | + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> | |
596 | + <j2seproject3:copylibs> | |
597 | + <customize> | |
488 | 598 | <attribute name="Main-Class" value="${main.class}"/> |
489 | - <attribute name="Class-Path" value="${jar.classpath}"/> | |
490 | - </manifest> | |
491 | - </copylibs> | |
599 | + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> | |
600 | + </customize> | |
601 | + </j2seproject3:copylibs> | |
492 | 602 | <echo>To run this application from the command line without Ant, try:</echo> |
493 | 603 | <property location="${dist.jar}" name="dist.jar.resolved"/> |
494 | 604 | <echo>java -jar "${dist.jar.resolved}"</echo> |
495 | 605 | </target> |
496 | - <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"> | |
497 | - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> | |
498 | - <pathconvert property="run.classpath.without.build.classes.dir"> | |
499 | - <path path="${run.classpath}"/> | |
500 | - <map from="${build.classes.dir.resolved}" to=""/> | |
501 | - </pathconvert> | |
502 | - <pathconvert pathsep=" " property="jar.classpath"> | |
503 | - <path path="${run.classpath.without.build.classes.dir}"/> | |
504 | - <chainedmapper> | |
505 | - <flattenmapper/> | |
506 | - <globmapper from="*" to="lib/*"/> | |
507 | - </chainedmapper> | |
508 | - </pathconvert> | |
509 | - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> | |
510 | - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> | |
511 | - <fileset dir="${build.classes.dir}"/> | |
512 | - <manifest> | |
513 | - <attribute name="Class-Path" value="${jar.classpath}"/> | |
514 | - </manifest> | |
515 | - </copylibs> | |
516 | - </target> | |
517 | - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available"> | |
518 | - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> | |
519 | - <pathconvert property="run.classpath.without.build.classes.dir"> | |
520 | - <path path="${run.classpath}"/> | |
521 | - <map from="${build.classes.dir.resolved}" to=""/> | |
522 | - </pathconvert> | |
523 | - <pathconvert pathsep=" " property="jar.classpath"> | |
524 | - <path path="${run.classpath.without.build.classes.dir}"/> | |
525 | - <chainedmapper> | |
526 | - <flattenmapper/> | |
527 | - <globmapper from="*" to="lib/*"/> | |
528 | - </chainedmapper> | |
529 | - </pathconvert> | |
530 | - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> | |
531 | - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> | |
532 | - <fileset dir="${build.classes.dir}"/> | |
533 | - <manifest> | |
534 | - <attribute name="Class-Path" value="${jar.classpath}"/> | |
535 | - </manifest> | |
536 | - </copylibs> | |
606 | + <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"> | |
607 | + <j2seproject3:copylibs> | |
608 | + <customize> | |
609 | + <attribute name="Main-Class" value="${main.class}"/> | |
610 | + </customize> | |
611 | + </j2seproject3:copylibs> | |
612 | + <echo>To run this application from the command line without Ant, try:</echo> | |
613 | + <property location="${dist.jar}" name="dist.jar.resolved"/> | |
614 | + <echo>java -jar "${dist.jar.resolved}"</echo> | |
537 | 615 | </target> |
538 | 616 | <target name="-post-jar"> |
539 | 617 | <!-- Empty placeholder for easier customization. --> |
540 | 618 | <!-- You can override this target in the ../build.xml file. --> |
541 | 619 | </target> |
542 | - <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"/> | |
620 | + <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"/> | |
543 | 621 | <!-- |
544 | 622 | ================= |
545 | 623 | EXECUTION SECTION |
@@ -609,7 +687,7 @@ is divided into following sections: | ||
609 | 687 | JAVADOC SECTION |
610 | 688 | =============== |
611 | 689 | --> |
612 | - <target depends="init" name="-javadoc-build"> | |
690 | + <target depends="init" if="have.sources" name="-javadoc-build"> | |
613 | 691 | <mkdir dir="${dist.javadoc.dir}"/> |
614 | 692 | <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}"> |
615 | 693 | <classpath> |
@@ -643,7 +721,7 @@ is divided into following sections: | ||
643 | 721 | <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.test.dir}"/> |
644 | 722 | </target> |
645 | 723 | <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> |
646 | - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.test.dir}"/> | |
724 | + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.test.dir}"/> | |
647 | 725 | <copy todir="${build.test.classes.dir}"> |
648 | 726 | <fileset dir="${test.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> |
649 | 727 | </copy> |
@@ -660,7 +738,7 @@ is divided into following sections: | ||
660 | 738 | <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> |
661 | 739 | <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> |
662 | 740 | <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> |
663 | - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.test.dir}" srcdir="${test.test.dir}"/> | |
741 | + <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.test.dir}" srcdir="${test.test.dir}"/> | |
664 | 742 | <copy todir="${build.test.classes.dir}"> |
665 | 743 | <fileset dir="${test.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> |
666 | 744 | </copy> |
@@ -4,8 +4,8 @@ build.xml.stylesheet.CRC32=240b97a2 | ||
4 | 4 | # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. |
5 | 5 | # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. |
6 | 6 | nbproject/build-impl.xml.data.CRC32=715a224e |
7 | -nbproject/build-impl.xml.script.CRC32=f7663e1f | |
8 | -nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 | |
7 | +nbproject/build-impl.xml.script.CRC32=a0429a63 | |
8 | +nbproject/build-impl.xml.stylesheet.CRC32=78c6a6ee@1.38.1.45 | |
9 | 9 | nbproject/build-jaws-impl.xml.data.CRC32=715a224e |
10 | 10 | nbproject/build-jaws-impl.xml.script.CRC32=eead23c2 |
11 | 11 | nbproject/build-jaws-impl.xml.stylesheet.CRC32=235a0393 |
@@ -91,7 +91,7 @@ ApplicationUI.jButtonCancel.toolTipText= | ||
91 | 91 | |
92 | 92 | ApplicationUI.jLabelProgramName.text=Mail Distination Confirm Program |
93 | 93 | |
94 | -ApplicationUI.jLabelProgramVersion.text=0.5a TB | |
94 | +ApplicationUI.jLabelProgramVersion.text=0.6 TB | |
95 | 95 | |
96 | 96 | ApplicationUI.jPanelAbout.TabConstraints.tabTitle=About |
97 | 97 |