|
@@ -19,11 +19,11 @@ is divided into following sections:
|
19
|
19
|
- cleanup
|
20
|
20
|
|
21
|
21
|
-->
|
22
|
|
-<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="DMDirc-impl">
|
|
22
|
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" 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="DMDirc-impl">
|
23
|
23
|
<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
|
24
|
|
- <!--
|
|
24
|
+ <!--
|
25
|
25
|
======================
|
26
|
|
- INITIALIZATION SECTION
|
|
26
|
+ INITIALIZATION SECTION
|
27
|
27
|
======================
|
28
|
28
|
-->
|
29
|
29
|
<target name="-pre-init">
|
|
@@ -102,16 +102,10 @@ is divided into following sections:
|
102
|
102
|
<property name="javadoc.encoding.used" value="${source.encoding}"/>
|
103
|
103
|
<property name="includes" value="**"/>
|
104
|
104
|
<property name="excludes" value=""/>
|
105
|
|
- <property name="do.depend" value="false"/>
|
|
105
|
+ <property name="do.depend" value="true"/>
|
106
|
106
|
<condition property="do.depend.true">
|
107
|
107
|
<istrue value="${do.depend}"/>
|
108
|
108
|
</condition>
|
109
|
|
- <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
|
110
|
|
- <and>
|
111
|
|
- <isset property="jaxws.endorsed.dir"/>
|
112
|
|
- <available file="nbproject/jaxws-build.xml"/>
|
113
|
|
- </and>
|
114
|
|
- </condition>
|
115
|
109
|
</target>
|
116
|
110
|
<target name="-post-init">
|
117
|
111
|
<!-- Empty placeholder for easier customization. -->
|
|
@@ -146,6 +140,7 @@ is divided into following sections:
|
146
|
140
|
<attribute default="${includes}" name="includes"/>
|
147
|
141
|
<attribute default="${excludes}" name="excludes"/>
|
148
|
142
|
<attribute default="${javac.debug}" name="debug"/>
|
|
143
|
+ <attribute default="" name="javac.compilerargs.jaxws"/>
|
149
|
144
|
<attribute default="" name="sourcepath"/>
|
150
|
145
|
<element name="customize" optional="true"/>
|
151
|
146
|
<sequential>
|
|
@@ -153,7 +148,7 @@ is divided into following sections:
|
153
|
148
|
<classpath>
|
154
|
149
|
<path path="@{classpath}"/>
|
155
|
150
|
</classpath>
|
156
|
|
- <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
|
|
151
|
+ <compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/>
|
157
|
152
|
<customize/>
|
158
|
153
|
</javac>
|
159
|
154
|
</sequential>
|
|
@@ -193,6 +188,9 @@ is divided into following sections:
|
193
|
188
|
<attribute default="**" name="testincludes"/>
|
194
|
189
|
<sequential>
|
195
|
190
|
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
|
|
191
|
+ <classpath>
|
|
192
|
+ <pathelement path="${clover.jar}"/>
|
|
193
|
+ </classpath>
|
196
|
194
|
<batchtest todir="${build.test.results.dir}">
|
197
|
195
|
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
|
198
|
196
|
<filename name="@{testincludes}"/>
|
|
@@ -212,13 +210,13 @@ is divided into following sections:
|
212
|
210
|
</sequential>
|
213
|
211
|
</macrodef>
|
214
|
212
|
</target>
|
215
|
|
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
|
|
213
|
+ <target name="-init-macrodef-nbjpda">
|
216
|
214
|
<macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
|
217
|
215
|
<attribute default="${main.class}" name="name"/>
|
218
|
216
|
<attribute default="${debug.classpath}" name="classpath"/>
|
219
|
217
|
<attribute default="" name="stopclassname"/>
|
220
|
218
|
<sequential>
|
221
|
|
- <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
|
|
219
|
+ <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
|
222
|
220
|
<classpath>
|
223
|
221
|
<path path="@{classpath}"/>
|
224
|
222
|
</classpath>
|
|
@@ -229,9 +227,7 @@ is divided into following sections:
|
229
|
227
|
<attribute default="${build.classes.dir}" name="dir"/>
|
230
|
228
|
<sequential>
|
231
|
229
|
<nbjpdareload>
|
232
|
|
- <fileset dir="@{dir}" includes="${fix.classes}">
|
233
|
|
- <include name="${fix.includes}*.class"/>
|
234
|
|
- </fileset>
|
|
230
|
+ <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
|
235
|
231
|
</nbjpdareload>
|
236
|
232
|
</sequential>
|
237
|
233
|
</macrodef>
|
|
@@ -249,12 +245,6 @@ is divided into following sections:
|
249
|
245
|
<condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
|
250
|
246
|
<istrue value="${have-jdk-older-than-1.4}"/>
|
251
|
247
|
</condition>
|
252
|
|
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
|
253
|
|
- <os family="windows"/>
|
254
|
|
- </condition>
|
255
|
|
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
|
256
|
|
- <isset property="debug.transport"/>
|
257
|
|
- </condition>
|
258
|
248
|
</target>
|
259
|
249
|
<target depends="-init-debug-args" name="-init-macrodef-debug">
|
260
|
250
|
<macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
|
|
@@ -264,7 +254,7 @@ is divided into following sections:
|
264
|
254
|
<sequential>
|
265
|
255
|
<java classname="@{classname}" dir="${work.dir}" fork="true">
|
266
|
256
|
<jvmarg line="${debug-args-line}"/>
|
267
|
|
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
|
|
257
|
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
|
268
|
258
|
<jvmarg line="${run.jvmargs}"/>
|
269
|
259
|
<classpath>
|
270
|
260
|
<path path="@{classpath}"/>
|
|
@@ -300,7 +290,7 @@ is divided into following sections:
|
300
|
290
|
<target name="-init-presetdef-jar">
|
301
|
291
|
<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
|
302
|
292
|
<jar compress="${jar.compress}" jarfile="${dist.jar}">
|
303
|
|
- <j2seproject1:fileset dir="${build.classes.dir}"/>
|
|
293
|
+ <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.jar.excludes}"/>
|
304
|
294
|
</jar>
|
305
|
295
|
</presetdef>
|
306
|
296
|
</target>
|
|
@@ -311,13 +301,6 @@ is divided into following sections:
|
311
|
301
|
===================
|
312
|
302
|
-->
|
313
|
303
|
<target depends="init" name="deps-jar" unless="no.deps"/>
|
314
|
|
- <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
|
315
|
|
- <target depends="init" name="-check-automatic-build">
|
316
|
|
- <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
|
317
|
|
- </target>
|
318
|
|
- <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
|
319
|
|
- <antcall target="clean"/>
|
320
|
|
- </target>
|
321
|
304
|
<target depends="init,deps-jar" name="-pre-pre-compile">
|
322
|
305
|
<mkdir dir="${build.classes.dir}"/>
|
323
|
306
|
</target>
|
|
@@ -338,7 +321,7 @@ is divided into following sections:
|
338
|
321
|
<!-- Empty placeholder for easier customization. -->
|
339
|
322
|
<!-- You can override this target in the ../build.xml file. -->
|
340
|
323
|
</target>
|
341
|
|
- <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
|
|
324
|
+ <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
|
342
|
325
|
<target name="-pre-compile-single">
|
343
|
326
|
<!-- Empty placeholder for easier customization. -->
|
344
|
327
|
<!-- You can override this target in the ../build.xml file. -->
|
|
@@ -352,7 +335,7 @@ is divided into following sections:
|
352
|
335
|
<!-- Empty placeholder for easier customization. -->
|
353
|
336
|
<!-- You can override this target in the ../build.xml file. -->
|
354
|
337
|
</target>
|
355
|
|
- <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
|
|
338
|
+ <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
|
356
|
339
|
<!--
|
357
|
340
|
====================
|
358
|
341
|
JAR BUILDING SECTION
|
|
@@ -402,7 +385,7 @@ is divided into following sections:
|
402
|
385
|
</pathconvert>
|
403
|
386
|
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
|
404
|
387
|
<copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
|
405
|
|
- <fileset dir="${build.classes.dir}"/>
|
|
388
|
+ <fileset dir="${build.classes.dir}" excludes="${dist.jar.excludes}" />
|
406
|
389
|
<manifest>
|
407
|
390
|
<attribute name="Main-Class" value="${main.class}"/>
|
408
|
391
|
<attribute name="Class-Path" value="${jar.classpath}"/>
|
|
@@ -476,7 +459,7 @@ is divided into following sections:
|
476
|
459
|
-->
|
477
|
460
|
<target depends="init" name="-javadoc-build">
|
478
|
461
|
<mkdir dir="${dist.javadoc.dir}"/>
|
479
|
|
- <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}">
|
|
462
|
+ <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}">
|
480
|
463
|
<classpath>
|
481
|
464
|
<path path="${javac.classpath}"/>
|
482
|
465
|
</classpath>
|
|
@@ -485,10 +468,41 @@ is divided into following sections:
|
485
|
468
|
</fileset>
|
486
|
469
|
</javadoc>
|
487
|
470
|
</target>
|
|
471
|
+
|
|
472
|
+ <target name="move-javadoc-check">
|
|
473
|
+ <condition property="move.javadoc">
|
|
474
|
+ <isset property="javadoc.moveto"/>
|
|
475
|
+ </condition>
|
|
476
|
+ </target>
|
|
477
|
+ <target name="move-javadoc" depends="move-javadoc-check" if="move.javadoc">
|
|
478
|
+ <delete dir="${javadoc.moveto}"/>
|
|
479
|
+ <move file="${dist.javadoc.dir}" tofile="${javadoc.moveto}"/>
|
|
480
|
+ </target>
|
|
481
|
+
|
|
482
|
+ <target depends="init,-doccheck-check" name="-doccheck-build" if="doccheck.run">
|
|
483
|
+ <mkdir dir="${doccheck.dir}"/>
|
|
484
|
+ <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="${src.dir}" useexternalfile="true" version="${javadoc.version}">
|
|
485
|
+ <classpath>
|
|
486
|
+ <path path="${javac.classpath}"/>
|
|
487
|
+ </classpath>
|
|
488
|
+ </javadoc>
|
|
489
|
+ </target>
|
|
490
|
+
|
|
491
|
+ <target name="-doccheck-check">
|
|
492
|
+ <condition property="doccheck.run">
|
|
493
|
+ <and>
|
|
494
|
+ <isset property="doccheck.path"/>
|
|
495
|
+ <isset property="doccheck.dir"/>
|
|
496
|
+ <available file="${doccheck.path}"/>
|
|
497
|
+ </and>
|
|
498
|
+ </condition>
|
|
499
|
+ </target>
|
|
500
|
+
|
488
|
501
|
<target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
|
489
|
502
|
<nbbrowse file="${dist.javadoc.dir}/index.html"/>
|
490
|
503
|
</target>
|
491
|
|
- <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
|
|
504
|
+ <target depends="init,-javadoc-build,-javadoc-browse,move-javadoc,-doccheck-build" description="Build Javadoc." name="javadoc"/>
|
|
505
|
+ <target depends="-doccheck-build" description="Build Javadoc error report (doccheck)." name="doccheck"/>
|
492
|
506
|
<!--
|
493
|
507
|
=========================
|
494
|
508
|
JUNIT COMPILATION SECTION
|
|
@@ -633,4 +647,4 @@ is divided into following sections:
|
633
|
647
|
<!-- You can override this target in the ../build.xml file. -->
|
634
|
648
|
</target>
|
635
|
649
|
<target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
|
636
|
|
-</project>
|
|
650
|
+</project>
|