39 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
40 |
|
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
41 |
|
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
42 |
+ |
<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/> |
43 |
|
|
44 |
|
<!-- Source locations --> |
45 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
57 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
58 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
59 |
|
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
60 |
+ |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
61 |
|
|
62 |
|
|
63 |
< |
|
64 |
< |
<!-- Files excluded from emulation and dist-docs --> |
63 |
< |
<patternset id="emulation.excludes"> |
63 |
> |
<!-- Files excluded from dist-docs and emulation jar --> |
64 |
> |
<patternset id="unsafe.exclusion"> |
65 |
|
<exclude name="java/util/Random.*"/> |
66 |
|
<exclude name="sun/misc/Unsafe.*"/> |
67 |
|
</patternset> |
68 |
|
|
69 |
+ |
<!-- Files excludes from emulation jar --> |
70 |
+ |
<patternset id="atomic.exclusion"> |
71 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/> |
72 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
73 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
74 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
75 |
+ |
</patternset> |
76 |
+ |
|
77 |
|
|
78 |
|
|
79 |
|
<!-- Main targets --> |
133 |
|
|
134 |
|
|
135 |
|
<target name="doccheck" |
136 |
< |
depends="filter-src" |
137 |
< |
description="Reports on javadoc style errors (not working yet)"> |
136 |
> |
depends="filter-doccheck" |
137 |
> |
description="Reports on javadoc style errors"> |
138 |
|
|
139 |
|
<delete dir="${build.doccheck.dir}"/> |
140 |
|
<mkdir dir="${build.doccheck.dir}"/> |
142 |
|
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
143 |
|
docletpath="${lib.dir}/doccheck.jar" |
144 |
|
destdir="${build.doccheck.dir}"> |
145 |
< |
<packageset dir="${build.filter.src.dir}"/> |
145 |
> |
<packageset dir="${build.filter.doccheck.dir}"/> |
146 |
|
</javadoc> |
147 |
|
|
148 |
+ |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
149 |
+ |
|
150 |
|
</target> |
151 |
|
|
152 |
|
|
174 |
|
</target> |
175 |
|
|
176 |
|
|
177 |
+ |
<target name="sinjdocs" |
178 |
+ |
depends="configure-tests" |
179 |
+ |
description="Builds javadocs with custom tags to build folder"> |
180 |
+ |
|
181 |
+ |
<delete dir="${build.javadocs.dir}"/> |
182 |
+ |
<mkdir dir="${build.javadocs.dir}"/> |
183 |
+ |
|
184 |
+ |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
185 |
+ |
|
186 |
+ |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
187 |
+ |
|
188 |
+ |
<classpath> |
189 |
+ |
<pathelement location="${sinjdoc.jar}"/> |
190 |
+ |
<path refid="test.classpath"/> |
191 |
+ |
</classpath> |
192 |
+ |
|
193 |
+ |
<!-- <arg value="-link"/> <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> --> |
194 |
+ |
|
195 |
+ |
<arg value="-d"/> <arg value="${build.javadocs.dir}"/> |
196 |
+ |
<arg value="-sourcepath"/> <arg value="${src.dir}"/> |
197 |
+ |
<arg value="-overview"/> <arg value="${src.dir}/intro.html"/> |
198 |
+ |
<arg value="-source"/> <arg value="1.5"/> |
199 |
+ |
<arg value="-verbose"/> |
200 |
+ |
<arg value="java.util"/> |
201 |
+ |
|
202 |
+ |
<!-- |
203 |
+ |
<arg value="-help"/> |
204 |
+ |
--> |
205 |
+ |
|
206 |
+ |
</java> |
207 |
+ |
|
208 |
+ |
</target> |
209 |
+ |
|
210 |
+ |
|
211 |
|
<target name="strip" |
212 |
|
depends="init, configure-compiler" |
213 |
|
description="Strip generics from java source (not working yet)"> |
239 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
240 |
|
description="Puts all distributable products in single hierarchy"/> |
241 |
|
|
242 |
+ |
<target name="release" |
243 |
+ |
depends="dist" |
244 |
+ |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
245 |
+ |
|
246 |
+ |
<!-- |
247 |
+ |
#keep build dir? - dl |
248 |
+ |
<delete dir="${build.dir}"/> |
249 |
+ |
--> |
250 |
+ |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
251 |
+ |
|
252 |
+ |
<jar basedir="${basedir}" destfile="${release.jar}"> |
253 |
+ |
<exclude name="${release.jar}"/> |
254 |
+ |
<exclude name="user.properties"/> |
255 |
+ |
<exclude name="etc/notes/**"/> |
256 |
+ |
<exclude name="lib/gjc/2.1/**"/> |
257 |
+ |
<exclude name="**/SyntaxTest.java"/> |
258 |
+ |
</jar> |
259 |
+ |
|
260 |
+ |
</target> |
261 |
|
|
262 |
|
<target name="clean" |
263 |
|
description="Removes all build products"> |
356 |
|
|
357 |
|
<jar destfile="${product.jar}" duplicate="add"> |
358 |
|
<fileset dir="${build.classes.dir}"> |
359 |
< |
<patternset refid="emulation.excludes"/> |
359 |
> |
<patternset refid="atomic.exclusion"/> |
360 |
> |
<patternset refid="unsafe.exclusion"/> |
361 |
|
</fileset> |
362 |
|
<fileset dir="${build.emulation.dir}"/> |
363 |
|
</jar> |
397 |
|
</fileset> |
398 |
|
</copy> |
399 |
|
|
335 |
– |
<!-- Not needed now, used for doccheck filtering: |
336 |
– |
<property name="generic.declarations" |
337 |
– |
value="public interface E {} public interface T {} public interface K {} public interface V {}" |
338 |
– |
/> |
339 |
– |
--> |
340 |
– |
|
400 |
|
<copy todir="${build.filter.src.dir}"> |
401 |
|
<fileset dir="${src.dir}"> |
402 |
|
<exclude name="**/*.html"/> |
403 |
< |
<patternset refid="emulation.excludes"/> |
403 |
> |
<patternset refid="unsafe.exclusion"/> |
404 |
|
</fileset> |
405 |
|
<filterchain> |
406 |
|
|
436 |
|
<param name="pattern" value="^//@"/> |
437 |
|
<param name="replacement" value=""/> |
438 |
|
</filterreader> |
439 |
+ |
</filterchain> |
440 |
+ |
</copy> |
441 |
+ |
|
442 |
+ |
</target> |
443 |
+ |
|
444 |
+ |
|
445 |
+ |
|
446 |
+ |
|
447 |
+ |
<target name="filter-doccheck" |
448 |
+ |
depends="filter-src"> |
449 |
+ |
|
450 |
+ |
<mkdir dir="${build.filter.doccheck.dir}"/> |
451 |
+ |
|
452 |
+ |
<copy todir="${build.filter.doccheck.dir}"> |
453 |
+ |
<fileset dir="${build.filter.src.dir}"> |
454 |
+ |
<include name="**/*.html"/> |
455 |
+ |
</fileset> |
456 |
+ |
</copy> |
457 |
|
|
458 |
+ |
<property name="generic.declarations" |
459 |
+ |
value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}" |
460 |
+ |
/> |
461 |
|
|
462 |
+ |
<copy todir="${build.filter.doccheck.dir}"> |
463 |
+ |
<fileset dir="${build.filter.src.dir}"> |
464 |
+ |
<exclude name="**/*.html"/> |
465 |
+ |
</fileset> |
466 |
+ |
<filterchain> |
467 |
|
<!-- |
468 |
< |
# The next two filters try to make the source look like |
468 |
> |
# These two filters try to make the source look like |
469 |
|
# something that doccheck can process. The first removes |
470 |
|
# -source 1.4 assertions and the second adds in a bunch |
471 |
|
# of single letter public nested marker interfaces so that |
472 |
|
# the generic type parameters are recognized. |
388 |
– |
# |
389 |
– |
# Currently commented out because doccheck doesn't work. :-( |
473 |
|
--> |
474 |
|
|
392 |
– |
<!-- |
475 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
476 |
|
classpath="${build.ant.dir}"> |
477 |
|
<param name="matching" value="^\s*assert[\s ].*$"/> |
481 |
|
|
482 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
483 |
|
classpath="${build.ant.dir}"> |
484 |
< |
<param name="matching" value="^(.*(class|interface|implements) .*|)\{.*$"/> |
484 |
> |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
485 |
|
<param name="pattern" value="$"/> |
486 |
|
<param name="replacement" value=" ${generic.declarations}"/> |
487 |
|
</filterreader> |
406 |
– |
--> |
488 |
|
|
489 |
|
</filterchain> |
490 |
|
</copy> |
579 |
|
<target name="configure-compiler"> |
580 |
|
|
581 |
|
<property name="gjc.version" |
582 |
< |
value="2.0"/> |
582 |
> |
value="2.2"/> |
583 |
|
|
584 |
|
<condition property="novariance.arg" value="-novariance"> |
585 |
|
<and> |
740 |
|
</target> |
741 |
|
|
742 |
|
|
743 |
+ |
<target name="ng" depends="test"> |
744 |
+ |
<java classname="SuperfluousAbstract" fork="true"> |
745 |
+ |
|
746 |
+ |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
747 |
+ |
|
748 |
+ |
</java> |
749 |
+ |
</target> |
750 |
+ |
|
751 |
+ |
|
752 |
|
</project> |