|
@@ -27,8 +27,8 @@ is divided into following sections:
|
27
|
27
|
======================
|
28
|
28
|
-->
|
29
|
29
|
<path id="all.libs">
|
30
|
|
- <fileset dir="lib" includes="*.jar"/>
|
31
|
30
|
<fileset dir="modules/plugins/lib" includes="*.jar"/>
|
|
31
|
+ <fileset dir="lib" includes="*.jar"/>
|
32
|
32
|
</path>
|
33
|
33
|
|
34
|
34
|
<property name="test_profile_dir" value="./test_profile"/>
|
|
@@ -154,7 +154,7 @@ is divided into following sections:
|
154
|
154
|
</target>
|
155
|
155
|
<target name="-init-macrodef-javac">
|
156
|
156
|
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
|
157
|
|
- <attribute default="${util.src.dir}:${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
|
|
157
|
+ <attribute default="${util.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
|
158
|
158
|
<attribute default="${build.classes.dir}" name="destdir"/>
|
159
|
159
|
<attribute default="${javac.classpath}" name="classpath"/>
|
160
|
160
|
<attribute default="${includes}" name="includes"/>
|
|
@@ -175,7 +175,7 @@ is divided into following sections:
|
175
|
175
|
</sequential>
|
176
|
176
|
</macrodef>
|
177
|
177
|
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
|
178
|
|
- <attribute default="${util.src.dir}:${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
|
|
178
|
+ <attribute default="${util.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
|
179
|
179
|
<attribute default="${build.classes.dir}" name="destdir"/>
|
180
|
180
|
<attribute default="${javac.classpath}" name="classpath"/>
|
181
|
181
|
<sequential>
|
|
@@ -404,7 +404,6 @@ is divided into following sections:
|
404
|
404
|
<copy todir="${build.classes.dir}">
|
405
|
405
|
<fileset dir="${main.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
406
|
406
|
<fileset dir="${parser.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
407
|
|
- <fileset dir="${plugins.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
408
|
407
|
<fileset dir="${util.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
|
409
|
408
|
</copy>
|
410
|
409
|
</target>
|
|
@@ -452,14 +451,6 @@ is divided into following sections:
|
452
|
451
|
<j2seproject1:attribute name="Main-Class" value="${main.class}"/>
|
453
|
452
|
</j2seproject1:manifest>
|
454
|
453
|
</j2seproject1:jar>
|
455
|
|
- <echo>To run this application from the command line without Ant, try:</echo>
|
456
|
|
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
|
457
|
|
- <property location="${dist.jar}" name="dist.jar.resolved"/>
|
458
|
|
- <pathconvert property="run.classpath.with.dist.jar">
|
459
|
|
- <path path="${run.classpath}"/>
|
460
|
|
- <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
|
461
|
|
- </pathconvert>
|
462
|
|
- <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
|
463
|
454
|
</target>
|
464
|
455
|
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
|
465
|
456
|
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
|
|
@@ -482,9 +473,6 @@ is divided into following sections:
|
482
|
473
|
<attribute name="Class-Path" value="${jar.classpath}"/>
|
483
|
474
|
</manifest>
|
484
|
475
|
</copylibs>
|
485
|
|
- <echo>To run this application from the command line without Ant, try:</echo>
|
486
|
|
- <property location="${dist.jar}" name="dist.jar.resolved"/>
|
487
|
|
- <echo>java -jar "${dist.jar.resolved}"</echo>
|
488
|
476
|
</target>
|
489
|
477
|
<target name="-post-jar">
|
490
|
478
|
<!-- Empty placeholder for easier customization. -->
|