35 |
|
<property name="build.lib.dir" location="${build.dir}/lib"/> |
36 |
|
<property name="build.ant.dir" location="${build.dir}/ant"/> |
37 |
|
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
38 |
+ |
<property name="build.sinjdocs.dir" location="${build.dir}/sinjdocs"/> |
39 |
|
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
40 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
41 |
|
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
58 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
59 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
60 |
|
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
61 |
< |
|
61 |
> |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
62 |
|
|
63 |
|
|
64 |
|
<!-- Files excluded from dist-docs and emulation jar --> |
73 |
|
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
74 |
|
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
75 |
|
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
76 |
+ |
<exclude name="java/util/concurrent/locks/LockSupport*"/> |
77 |
+ |
<exclude name="java/util/concurrent/locks/ReentrantLock*"/> |
78 |
|
</patternset> |
79 |
|
|
80 |
|
|
103 |
|
fork="true"> |
104 |
|
|
105 |
|
<compilerarg line="${gjc.args}"/> |
106 |
+ |
<!-- |
107 |
|
<bootclasspath refid="compile.bootclasspath"/> |
108 |
+ |
--> |
109 |
|
|
110 |
|
</javac> |
111 |
|
|
179 |
|
</target> |
180 |
|
|
181 |
|
|
182 |
+ |
<target name="sinjdocs" |
183 |
+ |
depends="configure-tests" |
184 |
+ |
description="Builds javadocs with custom tags to build folder"> |
185 |
+ |
|
186 |
+ |
<delete dir="${build.sinjdocs.dir}"/> |
187 |
+ |
<mkdir dir="${build.sinjdocs.dir}"/> |
188 |
+ |
|
189 |
+ |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
190 |
+ |
|
191 |
+ |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
192 |
+ |
|
193 |
+ |
<classpath> |
194 |
+ |
<pathelement location="${sinjdoc.jar}"/> |
195 |
+ |
<pathelement location="${lib.dir}/jutil.jar"/> |
196 |
+ |
<pathelement location="${lib.dir}/cup.jar"/> |
197 |
+ |
<path refid="test.classpath"/> |
198 |
+ |
</classpath> |
199 |
+ |
|
200 |
+ |
|
201 |
+ |
<arg value="-d"/> <arg value="${build.sinjdocs.dir}"/> |
202 |
+ |
<arg value="-sourcepath"/> <arg value="${src.dir}"/> |
203 |
+ |
<arg value="-overview"/> <arg value="${src.dir}/intro.html"/> |
204 |
+ |
<arg value="-source"/> <arg value="${build.sourcelevel}"/> |
205 |
+ |
<!-- <arg value="-verbose"/> --> |
206 |
+ |
<!-- <arg value="-link"/> <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> --> |
207 |
+ |
<arg value="java.lang"/> |
208 |
+ |
<arg value="java.util"/> |
209 |
+ |
<arg value="java.util.concurrent"/> |
210 |
+ |
<arg value="java.util.concurrent.atomic"/> |
211 |
+ |
<arg value="java.util.concurrent.locks"/> |
212 |
+ |
|
213 |
+ |
<!-- |
214 |
+ |
<arg value="-help"/> |
215 |
+ |
--> |
216 |
+ |
|
217 |
+ |
</java> |
218 |
+ |
|
219 |
+ |
</target> |
220 |
+ |
|
221 |
+ |
|
222 |
|
<target name="strip" |
223 |
|
depends="init, configure-compiler" |
224 |
|
description="Strip generics from java source (not working yet)"> |
239 |
|
fork="true"> |
240 |
|
|
241 |
|
<compilerarg line="${gjc.args} -s"/> |
242 |
+ |
<!-- |
243 |
|
<bootclasspath refid="compile.bootclasspath"/> |
244 |
+ |
--> |
245 |
|
|
246 |
|
</javac> |
247 |
|
|
318 |
|
<!-- Version is kept in a separate file --> |
319 |
|
<loadfile property="version" srcFile="version.properties"/> |
320 |
|
<echo>Building JSR-166 version ${version}</echo> |
321 |
+ |
<echo>java.home is ${java.home}</echo> |
322 |
|
|
323 |
|
</target> |
324 |
|
|
356 |
|
fork="true"> |
357 |
|
|
358 |
|
<compilerarg line="${gjc.args}"/> |
359 |
+ |
<!-- |
360 |
|
<bootclasspath refid="compile.bootclasspath"/> |
361 |
+ |
--> |
362 |
|
|
363 |
|
</javac> |
364 |
|
|
528 |
|
fork="true"> |
529 |
|
|
530 |
|
<compilerarg line="${gjc.args}"/> |
531 |
+ |
<!-- |
532 |
|
<bootclasspath refid="test.compile.bootclasspath"/> |
533 |
+ |
--> |
534 |
|
<classpath refid="test.classpath"/> |
535 |
+ |
|
536 |
+ |
<include name="java/**"/> |
537 |
+ |
<include name="jsr166/**"/> |
538 |
|
|
539 |
|
</javac> |
540 |
|
|
556 |
|
dir="${build.reports.dir}" |
557 |
|
fork="true"> |
558 |
|
|
559 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
559 |
> |
<jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/> |
560 |
|
|
561 |
|
<formatter type="xml"/> |
562 |
|
|
563 |
|
<batchtest todir="${build.reports.dir}"> |
564 |
|
<fileset dir="${test.src.dir}"> |
565 |
< |
<include name="**/${testcase}Test.java"/> |
565 |
> |
<include name="java/**/${testcase}Test.java"/> |
566 |
> |
<include name="jsr166/**/${testcase}Test.java"/> |
567 |
|
</fileset> |
568 |
|
</batchtest> |
569 |
|
|
575 |
|
<target name="report-tests" |
576 |
|
depends="run-tests"> |
577 |
|
|
578 |
< |
<!-- Sets junit.report.format to frames if Xalan is present, |
578 |
> |
<!-- Sets junit.report.format to frames if redirection is present, |
579 |
|
otherwise sets it to noframes. --> |
580 |
|
<available property="junit.report.format" |
581 |
|
value="frames" |
625 |
|
<property name="collect.jar" |
626 |
|
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
627 |
|
|
628 |
+ |
<!-- |
629 |
+ |
<property name="unchecked.option" value="-warnunchecked"/> |
630 |
+ |
--> |
631 |
+ |
|
632 |
+ |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
633 |
|
|
634 |
< |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
634 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
635 |
|
<istrue value="${gjc.warnunchecked}"/> |
636 |
|
</condition> |
637 |
|
|
638 |
|
<property name="warnunchecked.arg" value=""/> |
639 |
< |
|
639 |
> |
|
640 |
|
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
641 |
|
<istrue value="${build.nothreads}"/> |
642 |
|
</condition> |
647 |
|
--> |
648 |
|
|
649 |
|
<path id="pre.bootclasspath"> |
650 |
+ |
<!-- |
651 |
|
<pathelement location="${javac.jar}"/> |
652 |
+ |
--> |
653 |
|
</path> |
654 |
|
|
655 |
|
<path id="compile.bootclasspath"> |
656 |
|
<pathelement location="${build.classes.dir}"/> |
657 |
+ |
<!-- |
658 |
|
<pathelement location="${collect.jar}"/> |
659 |
+ |
--> |
660 |
|
<pathelement location="${rt.jar}"/> |
661 |
|
</path> |
662 |
|
|
666 |
|
|
667 |
|
|
668 |
|
<!-- Common options in javac invocations --> |
669 |
+ |
<!-- |
670 |
|
<property name="gjc.args" |
671 |
|
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
672 |
|
/> |
673 |
+ |
--> |
674 |
+ |
<property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/> |
675 |
|
|
676 |
|
</target> |
677 |
|
|
717 |
|
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
718 |
|
unless="junit.available"/> |
719 |
|
|
720 |
+ |
<!-- Xalan --> |
721 |
+ |
<available property="xalan.available" |
722 |
+ |
classname="org.apache.xalan.Version"/> |
723 |
+ |
|
724 |
+ |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
725 |
+ |
unless="xalan.available"/> |
726 |
+ |
|
727 |
|
|
728 |
|
<!-- |
729 |
|
! Bootclasspath munging for testing, so JUnit can test our local |
732 |
|
|
733 |
|
<path id="test.classpath"> |
734 |
|
<pathelement location="${product.jar}"/> |
735 |
+ |
<pathelement location="${rt.jar}"/> |
736 |
|
<pathelement location="${build.testcases.dir}"/> |
737 |
|
<pathelement location="${junit.jar}"/> |
738 |
|
</path> |
744 |
|
</path> |
745 |
|
|
746 |
|
<path id="test.run.bootclasspath"> |
747 |
< |
<pathelement location="${javac.jar}"/> |
747 |
> |
<!-- |
748 |
> |
<pathelement location="${javac.jar}"/> |
749 |
> |
--> |
750 |
|
<path refid="test.classpath"/> |
751 |
|
</path> |
752 |
|
|
761 |
|
|
762 |
|
<!-- Anthill targets --> |
763 |
|
|
764 |
< |
<target name="anthill-build" |
764 |
> |
<target name="anthill-build"> |
765 |
> |
|
766 |
> |
<!-- Override this in user.properties --> |
767 |
> |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
768 |
> |
|
769 |
> |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
770 |
> |
<arg value="-Xmx256000000"/> |
771 |
> |
<!-- classpath of new JVM --> |
772 |
> |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
773 |
> |
<!-- location of Ant home directory --> |
774 |
> |
<arg value="-Dant.home=${ant.home}"/> |
775 |
> |
<!-- the Ant main class --> |
776 |
> |
<arg value="org.apache.tools.ant.Main"/> |
777 |
> |
<!-- The build file --> |
778 |
> |
<arg value="-buildfile"/> <arg value="build.xml"/> |
779 |
> |
<!-- the target to build on the new Ant instance --> |
780 |
> |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
781 |
> |
<arg value="do-anthill-build"/> |
782 |
> |
</exec> |
783 |
> |
</target> |
784 |
> |
|
785 |
> |
<target name="do-anthill-build" |
786 |
|
depends="jar, test, docs, dist-docs"/> |
787 |
|
|
788 |
|
<target name="anthill-publish"> |