59 |
|
|
60 |
|
|
61 |
|
|
62 |
< |
<!-- Files excluded from emulation and dist-docs --> |
63 |
< |
<patternset id="emulation.excludes"> |
62 |
> |
<!-- Files excluded from dist-docs and emulation jar --> |
63 |
> |
<patternset id="unsafe.exclusion"> |
64 |
|
<exclude name="java/util/Random.*"/> |
65 |
|
<exclude name="sun/misc/Unsafe.*"/> |
66 |
|
</patternset> |
67 |
|
|
68 |
+ |
<!-- Files excludes from emulation jar --> |
69 |
+ |
<patternset id="atomic.exclusion"> |
70 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/> |
71 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
72 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
73 |
+ |
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
74 |
+ |
</patternset> |
75 |
+ |
|
76 |
|
|
77 |
|
|
78 |
|
<!-- Main targets --> |
79 |
|
|
80 |
|
<target name="compile" |
81 |
< |
depends="init, configure-compiler" |
81 |
> |
depends="init, configure-compiler, prepare-src" |
82 |
|
description="Compiles main sources to build folder"> |
83 |
|
|
84 |
+ |
<property name="prepare.src.dir" value="${src.dir}"/> |
85 |
+ |
|
86 |
|
<mkdir dir="${build.classes.dir}"/> |
87 |
|
|
88 |
< |
<javac srcdir="${src.dir}" |
88 |
> |
<!-- |
89 |
> |
<echo>javac ${gjc.args}</echo> |
90 |
> |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
91 |
> |
--> |
92 |
> |
|
93 |
> |
<javac srcdir="${prepare.src.dir}" |
94 |
|
destdir="${build.classes.dir}" |
95 |
|
debug="${build.debug}" |
96 |
|
debuglevel="${build.debuglevel}" |
98 |
|
source="${build.sourcelevel}" |
99 |
|
fork="true"> |
100 |
|
|
101 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
102 |
< |
<compilerarg line="${build.javac.args}"/> |
101 |
> |
<compilerarg line="${gjc.args}"/> |
102 |
> |
<bootclasspath refid="compile.bootclasspath"/> |
103 |
|
|
104 |
|
</javac> |
105 |
|
|
190 |
|
source="${build.sourcelevel}" |
191 |
|
fork="true"> |
192 |
|
|
193 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
194 |
< |
<compilerarg line="${build.javac.args} -s"/> |
193 |
> |
<compilerarg line="${gjc.args} -s"/> |
194 |
> |
<bootclasspath refid="compile.bootclasspath"/> |
195 |
|
|
196 |
|
</javac> |
197 |
|
|
202 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
203 |
|
description="Puts all distributable products in single hierarchy"/> |
204 |
|
|
205 |
+ |
<target name="release" |
206 |
+ |
depends="dist" |
207 |
+ |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
208 |
+ |
|
209 |
+ |
<delete dir="${build.dir}"/> |
210 |
+ |
|
211 |
+ |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
212 |
+ |
|
213 |
+ |
<jar basedir="${basedir}" destfile="${release.jar}"> |
214 |
+ |
<exclude name="${release.jar}"/> |
215 |
+ |
<exclude name="user.properties"/> |
216 |
+ |
<exclude name="etc/notes/**"/> |
217 |
+ |
<exclude name="lib/gjc/2.1/**"/> |
218 |
+ |
</jar> |
219 |
+ |
|
220 |
+ |
</target> |
221 |
|
|
222 |
|
<target name="clean" |
223 |
|
description="Removes all build products"> |
301 |
|
source="${build.sourcelevel}" |
302 |
|
fork="true"> |
303 |
|
|
304 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
305 |
< |
<compilerarg line="${build.javac.args}"/> |
304 |
> |
<compilerarg line="${gjc.args}"/> |
305 |
> |
<bootclasspath refid="compile.bootclasspath"/> |
306 |
|
|
307 |
|
</javac> |
308 |
|
|
316 |
|
|
317 |
|
<jar destfile="${product.jar}" duplicate="add"> |
318 |
|
<fileset dir="${build.classes.dir}"> |
319 |
< |
<patternset refid="emulation.excludes"/> |
319 |
> |
<patternset refid="atomic.exclusion"/> |
320 |
> |
<patternset refid="unsafe.exclusion"/> |
321 |
|
</fileset> |
322 |
|
<fileset dir="${build.emulation.dir}"/> |
323 |
|
</jar> |
357 |
|
</fileset> |
358 |
|
</copy> |
359 |
|
|
360 |
+ |
<!-- Not needed now, used for doccheck filtering: |
361 |
+ |
<property name="generic.declarations" |
362 |
+ |
value="public interface E {} public interface T {} public interface K {} public interface V {}" |
363 |
+ |
/> |
364 |
+ |
--> |
365 |
+ |
|
366 |
|
<copy todir="${build.filter.src.dir}"> |
367 |
|
<fileset dir="${src.dir}"> |
368 |
|
<exclude name="**/*.html"/> |
369 |
< |
<patternset refid="emulation.excludes"/> |
369 |
> |
<patternset refid="unsafe.exclusion"/> |
370 |
|
</fileset> |
371 |
|
<filterchain> |
372 |
+ |
|
373 |
+ |
<!-- |
374 |
+ |
# This filter gets rid of angle-bracketed type parameters |
375 |
+ |
# so that javadoc can run on the result. The following |
376 |
+ |
# heuristic seems to work: |
377 |
+ |
# |
378 |
+ |
# For all lines not starting with space(s)-asterisk-space(s), |
379 |
+ |
# replace <something> with a space, where there may be more |
380 |
+ |
# than one right angle bracket at the end, and "something" |
381 |
+ |
# must not contain parens or pipes. (This may need some |
382 |
+ |
# tweaking.) |
383 |
+ |
--> |
384 |
+ |
|
385 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
386 |
|
classpath="${build.ant.dir}"> |
336 |
– |
<!-- |
337 |
– |
# These arguments are to get rid of angle-bracketed type |
338 |
– |
# parameters so that javadoc can run on the result. The |
339 |
– |
# following heuristic that seems to work: |
340 |
– |
# |
341 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
342 |
– |
# replace <something> with a space, where there may be more |
343 |
– |
# than one right angle bracket at the end, and "something" |
344 |
– |
# must not contain parens or pipes. (This may need some |
345 |
– |
# tweaking.) |
346 |
– |
--> |
387 |
|
<param name="notmatching" value="^\s+\*\s.*$"/> |
388 |
< |
<param name="pattern" value="<[^|>()]+?>+"/> |
388 |
> |
<param name="pattern" value="<[^|>()]+?>+"/> |
389 |
|
<param name="replacement" value=" "/> |
390 |
|
</filterreader> |
391 |
+ |
|
392 |
+ |
|
393 |
+ |
<!-- |
394 |
+ |
# This filter uncomments lines beginning with "//@" so that |
395 |
+ |
# javadoc can see imports that are needed to resolve links |
396 |
+ |
# but that shouldn't be in the compiled code. |
397 |
+ |
--> |
398 |
+ |
|
399 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
400 |
|
classpath="${build.ant.dir}"> |
401 |
< |
<!-- |
402 |
< |
# These arguments are to uncomment lines beginning with |
355 |
< |
# "//@" so that javadoc can see imports that are needed |
356 |
< |
# to resolve links but that shouldn't be in the compiled |
357 |
< |
# code. |
358 |
< |
--> |
359 |
< |
<param name="matching" value="^//@.*$"/> |
360 |
< |
<param name="pattern" value="^//@"/> |
401 |
> |
<param name="matching" value="^//@.*$"/> |
402 |
> |
<param name="pattern" value="^//@"/> |
403 |
|
<param name="replacement" value=""/> |
404 |
|
</filterreader> |
405 |
+ |
|
406 |
+ |
|
407 |
+ |
<!-- |
408 |
+ |
# The next two filters try to make the source look like |
409 |
+ |
# something that doccheck can process. The first removes |
410 |
+ |
# -source 1.4 assertions and the second adds in a bunch |
411 |
+ |
# of single letter public nested marker interfaces so that |
412 |
+ |
# the generic type parameters are recognized. |
413 |
+ |
# |
414 |
+ |
# Currently commented out because doccheck doesn't work. :-( |
415 |
+ |
--> |
416 |
+ |
|
417 |
+ |
<!-- |
418 |
+ |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
419 |
+ |
classpath="${build.ant.dir}"> |
420 |
+ |
<param name="matching" value="^\s*assert[\s ].*$"/> |
421 |
+ |
<param name="pattern" value="assert"/> |
422 |
+ |
<param name="replacement" value="//assert"/> |
423 |
+ |
</filterreader> |
424 |
+ |
|
425 |
+ |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
426 |
+ |
classpath="${build.ant.dir}"> |
427 |
+ |
<param name="matching" value="^(.*(class|interface|implements) .*|)\{.*$"/> |
428 |
+ |
<param name="pattern" value="$"/> |
429 |
+ |
<param name="replacement" value=" ${generic.declarations}"/> |
430 |
+ |
</filterreader> |
431 |
+ |
--> |
432 |
+ |
|
433 |
|
</filterchain> |
434 |
|
</copy> |
435 |
|
|
441 |
|
|
442 |
|
<mkdir dir="${build.testcases.dir}"/> |
443 |
|
|
444 |
+ |
<!-- |
445 |
+ |
<echo>javac ${gjc.args}</echo> |
446 |
+ |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
447 |
+ |
<echo>classpath="${test.classpath}"</echo> |
448 |
+ |
--> |
449 |
+ |
|
450 |
|
<javac srcdir="${test.src.dir}" |
451 |
|
destdir="${build.testcases.dir}" |
452 |
|
debug="${build.debug}" |
455 |
|
source="${build.sourcelevel}" |
456 |
|
fork="true"> |
457 |
|
|
458 |
< |
<classpath refid="test.classpath"/> |
459 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
460 |
< |
<compilerarg line="${build.javac.args}"/> |
458 |
> |
<compilerarg line="${gjc.args}"/> |
459 |
> |
<bootclasspath refid="test.compile.bootclasspath"/> |
460 |
> |
<classpath refid="test.classpath"/> |
461 |
|
|
462 |
|
</javac> |
463 |
|
|
479 |
|
dir="${build.reports.dir}" |
480 |
|
fork="true"> |
481 |
|
|
482 |
< |
<jvmarg value="${test.bootclasspath.arg}"/> |
482 |
> |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
483 |
|
|
484 |
|
<formatter type="xml"/> |
485 |
|
|
523 |
|
<target name="configure-compiler"> |
524 |
|
|
525 |
|
<property name="gjc.version" |
526 |
< |
value="1.3"/> |
526 |
> |
value="2.0"/> |
527 |
|
|
528 |
< |
<condition property="build.novariance" value="-novariance"> |
528 |
> |
<condition property="novariance.arg" value="-novariance"> |
529 |
|
<and> |
530 |
|
<equals arg1="${gjc.version}" arg2="2.0"/> |
531 |
|
<or> |
535 |
|
</and> |
536 |
|
</condition> |
537 |
|
|
538 |
< |
<property name="build.novariance" |
538 |
> |
<property name="novariance.arg" |
539 |
|
value=""/> |
540 |
|
|
541 |
|
<property name="gjc.dir" |
545 |
|
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
546 |
|
|
547 |
|
<property name="collect.jar" |
548 |
< |
location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/> |
548 |
> |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
549 |
|
|
550 |
|
|
551 |
< |
<condition property="build.warnunchecked" value="-warnunchecked"> |
551 |
> |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
552 |
|
<istrue value="${gjc.warnunchecked}"/> |
553 |
|
</condition> |
554 |
|
|
555 |
< |
<property name="build.warnunchecked" value=""/> |
555 |
> |
<property name="warnunchecked.arg" value=""/> |
556 |
> |
|
557 |
> |
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
558 |
> |
<istrue value="${build.nothreads}"/> |
559 |
> |
</condition> |
560 |
|
|
561 |
|
|
562 |
|
<!-- |
563 |
|
! Bootclasspath munging for source compilation. |
564 |
|
--> |
565 |
|
|
566 |
< |
<path id="javac.bootclasspath.prefix"> |
487 |
< |
<!-- <pathelement location="${src.dir}"/> --> |
566 |
> |
<path id="pre.bootclasspath"> |
567 |
|
<pathelement location="${javac.jar}"/> |
568 |
|
</path> |
569 |
|
|
570 |
< |
<path id="javac.bootclasspath"> |
571 |
< |
<!-- <pathelement location="${src.dir}"/> --> |
570 |
> |
<path id="compile.bootclasspath"> |
571 |
> |
<pathelement location="${build.classes.dir}"/> |
572 |
|
<pathelement location="${collect.jar}"/> |
573 |
|
<pathelement location="${rt.jar}"/> |
574 |
|
</path> |
575 |
|
|
576 |
< |
<!-- Flatten bootclasspath prefix into a platform-appropriate string --> |
577 |
< |
<property name="javac.bootclasspath.prefix" |
578 |
< |
refid="javac.bootclasspath.prefix"/> |
579 |
< |
|
501 |
< |
<!-- Turn the flattened bootclasspath prefix into a javac argument --> |
502 |
< |
<property name="build.bootclasspath.arg" |
503 |
< |
value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/> |
504 |
< |
|
505 |
< |
<!-- Flatten bootclasspath for trace message --> |
506 |
< |
<property name="javac.bootclasspath" |
507 |
< |
refid="javac.bootclasspath"/> |
576 |
> |
<!-- Flatten paths into platform-appropriate strings --> |
577 |
> |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
578 |
> |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
579 |
> |
|
580 |
|
|
581 |
|
<!-- Common options in javac invocations --> |
582 |
< |
<property name="build.javac.args" |
583 |
< |
value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/> |
582 |
> |
<property name="gjc.args" |
583 |
> |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
584 |
> |
/> |
585 |
> |
|
586 |
> |
</target> |
587 |
> |
|
588 |
|
|
589 |
< |
<echo>javac ${build.javac.args} |
590 |
< |
bootclasspath is ${javac.bootclasspath}</echo> |
589 |
> |
<target name="prepare-src" |
590 |
> |
depends="configure-compiler" |
591 |
> |
if="prepare.src.dir"> |
592 |
> |
|
593 |
> |
<mkdir dir="${prepare.src.dir}"/> |
594 |
> |
<copy todir="${prepare.src.dir}"> |
595 |
> |
<fileset dir="${src.dir}"> |
596 |
> |
<exclude name="java/lang/**"/> |
597 |
> |
</fileset> |
598 |
> |
</copy> |
599 |
|
|
600 |
|
</target> |
601 |
|
|
617 |
|
</target> |
618 |
|
|
619 |
|
|
620 |
< |
<target name="configure-tests"> |
620 |
> |
<target name="configure-tests" |
621 |
> |
depends="configure-compiler"> |
622 |
|
|
623 |
|
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
624 |
|
<available property="junit.available" |
639 |
|
<pathelement location="${junit.jar}"/> |
640 |
|
</path> |
641 |
|
|
642 |
< |
<!-- Flatten test classpath into a platform-appropriate string --> |
643 |
< |
<property name="test.classpath" refid="test.classpath"/> |
642 |
> |
<path id="test.compile.bootclasspath"> |
643 |
> |
<pathelement location="${javac.jar}"/> |
644 |
> |
<pathelement location="${collect.jar}"/> |
645 |
> |
<pathelement location="${rt.jar}"/> |
646 |
> |
</path> |
647 |
|
|
648 |
< |
<!-- Turn the flattened test classpath into a javac argument --> |
649 |
< |
<property name="test.bootclasspath.arg" |
650 |
< |
value='-Xbootclasspath/p:${test.classpath}'/> |
648 |
> |
<path id="test.run.bootclasspath"> |
649 |
> |
<pathelement location="${javac.jar}"/> |
650 |
> |
<path refid="test.classpath"/> |
651 |
> |
</path> |
652 |
> |
|
653 |
> |
<!-- Flatten test classpaths into platform-appropriate strings --> |
654 |
> |
<property name="test.classpath" refid="test.classpath"/> |
655 |
> |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
656 |
> |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
657 |
|
|
658 |
|
</target> |
659 |
|
|
684 |
|
</target> |
685 |
|
|
686 |
|
|
687 |
+ |
<target name="ng" depends="test"> |
688 |
+ |
<java classname="SuperfluousAbstract" fork="true"> |
689 |
+ |
|
690 |
+ |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
691 |
+ |
|
692 |
+ |
</java> |
693 |
+ |
</target> |
694 |
+ |
|
695 |
+ |
|
696 |
|
</project> |