|
@@ -26,6 +26,9 @@ is divided into following sections:
|
26
|
26
|
INITIALIZATION SECTION
|
27
|
27
|
======================
|
28
|
28
|
-->
|
|
29
|
+ <path id="plugins.libs">
|
|
30
|
+ <fileset dir="modules/plugins/lib" includes="*.jar"/>
|
|
31
|
+ </path>
|
29
|
32
|
<target name="-pre-init">
|
30
|
33
|
<!-- Empty placeholder for easier customization. -->
|
31
|
34
|
<!-- You can override this target in the ../build.xml file. -->
|
|
@@ -145,7 +148,7 @@ is divided into following sections:
|
145
|
148
|
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
|
146
|
149
|
<attribute default="${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
|
147
|
150
|
<attribute default="${build.classes.dir}" name="destdir"/>
|
148
|
|
- <attribute default="${javac.classpath}" name="classpath"/>
|
|
151
|
+ <attribute default="${toString:plugins.libs}:${javac.classpath}" name="classpath"/>
|
149
|
152
|
<attribute default="${includes}" name="includes"/>
|
150
|
153
|
<attribute default="${excludes}" name="excludes"/>
|
151
|
154
|
<attribute default="${javac.debug}" name="debug"/>
|
|
@@ -165,7 +168,7 @@ is divided into following sections:
|
165
|
168
|
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
|
166
|
169
|
<attribute default="${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
|
167
|
170
|
<attribute default="${build.classes.dir}" name="destdir"/>
|
168
|
|
- <attribute default="${javac.classpath}" name="classpath"/>
|
|
171
|
+ <attribute default="${toString:plugins.libs}:${javac.classpath}" name="classpath"/>
|
169
|
172
|
<sequential>
|
170
|
173
|
<depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
|
171
|
174
|
<classpath>
|
|
@@ -530,7 +533,7 @@ is divided into following sections:
|
530
|
533
|
<mkdir dir="${dist.javadoc.dir}"/>
|
531
|
534
|
<javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="${javadoc.encoding.used}" destdir="${dist.javadoc.dir}" docencoding="${javadoc.encoding.used}" 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}">
|
532
|
535
|
<classpath>
|
533
|
|
- <path path="${javac.classpath}"/>
|
|
536
|
+ <path path="${toString:plugins.libs}:${javac.classpath}"/>
|
534
|
537
|
</classpath>
|
535
|
538
|
<fileset dir="${main.src.dir}" excludes="${excludes}" includes="${includes}">
|
536
|
539
|
<filename name="**/*.java"/>
|
|
@@ -558,7 +561,7 @@ is divided into following sections:
|
558
|
561
|
<mkdir dir="${doccheck.dir}"/>
|
559
|
562
|
<javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}:${plugins.src.dir}" useexternalfile="true" version="${javadoc.version}">
|
560
|
563
|
<classpath>
|
561
|
|
- <path path="${javac.classpath}"/>
|
|
564
|
+ <path path="${toString:plugins.libs}:${javac.classpath}"/>
|
562
|
565
|
</classpath>
|
563
|
566
|
</javadoc>
|
564
|
567
|
</target>
|
|
@@ -591,10 +594,10 @@ is divided into following sections:
|
591
|
594
|
<!-- You can override this target in the ../build.xml file. -->
|
592
|
595
|
</target>
|
593
|
596
|
<target if="do.depend.true" name="-compile-test-depend">
|
594
|
|
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
|
|
597
|
+ <j2seproject3:depend classpath="${toString:plugins.libs}:${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
|
595
|
598
|
</target>
|
596
|
599
|
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
|
597
|
|
- <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
|
|
600
|
+ <j2seproject3:javac classpath="${toString:plugins.libs}:${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
|
598
|
601
|
<copy todir="${build.test.classes.dir}">
|
599
|
602
|
<fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
600
|
603
|
<fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
|
@@ -613,7 +616,7 @@ is divided into following sections:
|
613
|
616
|
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
|
614
|
617
|
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
|
615
|
618
|
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
|
616
|
|
- <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
|
|
619
|
+ <j2seproject3:javac classpath="${toString:plugins.libs}:${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
|
617
|
620
|
<copy todir="${build.test.classes.dir}">
|
618
|
621
|
<fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
619
|
622
|
<fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|