ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.100 by jsr166, Sat Jan 19 17:15:44 2013 UTC vs.
Revision 1.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC

#	Line 35 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.6"/>
38	>	<property name="build.sourcelevel"    value="6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
#	Line 45 | Line 45
45		<property name="build.classes.dir"           location="${build.dir}/classes"/>
46		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47		<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
49	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
48		<property name="build.reports.dir"           location="${build.dir}/reports"/>
49
50	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
51	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
52	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
53	<	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56	<	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
50	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54
55		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61	–
56		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65	–
57		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	–
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59	<	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
60	<	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59	>
60	>	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61	>	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62	>	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63	>	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64
65		<!-- JDK binary locations -->
66		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 93 | Line 84
84		<defjdklocations v="8"/>
85
86		<macrodef name="run-tck-tests">
87	<	<attribute name="jvm"/>
88	<	<attribute name="tck.classes"/>
87	>	<attribute name="target"/>
88	>	<attribute name="workdir"/>
89		<attribute name="product.jar" default="${product.jar}"/>
90		<attribute name="jvmflags" default=""/>
91		<sequential>
92	+
93	+	<mkdir dir="@{workdir}/tck-classes"/>
94	+
95	+	<javac srcdir="${tck.src.dir}"
96	+	destdir="@{workdir}/tck-classes"
97	+	debug="${build.debug}"
98	+	debuglevel="${build.debuglevel}"
99	+	deprecation="${build.deprecation}"
100	+	source="6"
101	+	classpath="${junit.jar}"
102	+	bootclasspath="@{product.jar}:${bootclasspath6}"
103	+	includeAntRuntime="false"
104	+	includeJavaRuntime="false"
105	+	executable="${javac@{target}}"
106	+	fork="true">
107	+
108	+	<include name="**/*.java"/>
109	+	<compilerarg value="-XDignore.symbol.file=true"/>
110	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111	+	<compilerarg line="${build.args}"/>
112	+	</javac>
113	+
114		<java classname="JSR166TestCase"
115	<	jvm="@{jvm}" fork="true">
115	>	failonerror="true"
116	>	jvm="${java@{target}}"
117	>	fork="true">
118		<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
119		<jvmarg line="@{jvmflags}"/>
120		<classpath>
121		<pathelement location="${junit.jar}"/>
122	<	<pathelement location="@{tck.classes}"/>
122	>	<pathelement location="@{workdir}/tck-classes"/>
123		</classpath>
124		</java>
125	+
126		</sequential>
127		</macrodef>
128
#	Line 124 | Line 140
140		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
141		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
142		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
143
144		<!-- Distribution locations -->
145	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
146	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
147	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
148	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
149	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
150	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
145	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
146	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
147	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
148	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
149	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
150	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
151
152		<!-- Jar locations -->
153	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
154	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
155	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
156	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
157	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
158	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
159	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
153	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
154	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
155	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
156	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
157	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
158	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
159	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
160
161		<!-- Bootclasspath argument -->
162		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 154 | Line 169
169		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
170		<!-- The below does not yet exist as of 2012-11 -->
171		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
172	+
173	+	<!-- Default jdk api doc location (latest stable release seems best) -->
174		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175
176	+	<!-- Define the "jtreg" task -->
177	+	<!-- See the docs in "jtreg -onlineHelp" -->
178	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
179	+	classpath="${lib.dir}/jtreg.jar" />
180	+
181		<!-- Test classpath -->
182		<path id="test.classpath">
183		<pathelement location="${build.testcases.dir}"/>
#	Line 169 | Line 191
191
192		<!-- Support @jls tag, used in jdk8+ javadoc -->
193		<!-- TODO: How do we get &trade to work? -->
194	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
195		<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196		<property name="javadoc.jls.cite" value="The Java Language Specification"/>
197		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
#	Line 176 | Line 199
199		<!-- Main targets -->
200
201		<target name="dists"
202	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
202	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
203		description="Builds all public jars and docs"/>
204
205		<target name="compile"
206		depends="configure-compiler"
207	<	description="Compiles src/main sources to build folder">
207	>	description="Compiles src/main sources to build dir">
208
209		<mkdir dir="${build.classes.dir}"/>
210
#	Line 217 | Line 240
240		depends="compile"
241		description="Builds library jar from compiled sources">
242
220	–	<mkdir dir="${build.lib.dir}"/>
221	–
243		<jar destfile="${product.jar}">
244		<fileset dir="${build.classes.dir}"/>
245		</jar>
#	Line 228 | Line 249
249
250
251		<target name="test"
252	<	depends="init, configure-tests, report-tests"
252	>	depends="configure-tests, report-tests"
253		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
254
255
256
257		<target name="docs"
258	<	description="Builds javadocs for src/main">
258	>	description="Builds javadocs for src/main to dist dir">
259
260		<delete dir="${dist.javadocs.dir}"/>
261		<mkdir dir="${dist.javadocs.dir}"/>
#	Line 262 | Line 283
283
284
285		<target name="dist"
286	<	depends="init, dist-clean, dist-jar, docs"
286	>	depends="dist-clean, dist-jar, docs"
287		description="Puts all distributable products in single hierarchy"/>
288
289
#	Line 290 | Line 311
311		description="Removes all build products">
312
313		<delete dir="${build.dir}"/>
293	–	<delete dir="${build.classes.dir}"/>
294	–	<delete dir="${build.lib.dir}"/>
314
315		</target>
316
#	Line 309 | Line 328
328		<!-- Internal targets -->
329
330
312	–	<target name="init">
313	–
314	–	<!-- Version is kept in a separate file -->
315	–	<loadfile property="version" srcFile="version.properties"/>
316	–	<echo>Building JSR-166 version ${version}</echo>
317	–	<echo>java.home is ${java.home}</echo>
318	–
319	–	</target>
320	–
321	–
331		<target name="dist-jar"
332		depends="clean, jar">
333
#	Line 333 | Line 342
342		<mkdir dir="${build.testcases.dir}"/>
343
344		<javac srcdir="${tck.src.dir}"
345	<	destdir="${build.testcases.dir}"
346	<	debug="${build.debug}"
347	<	debuglevel="${build.debuglevel}"
348	<	deprecation="${build.deprecation}"
349	<	source="${build.sourcelevel}"
350	<	fork="true">
345	>	destdir="${build.testcases.dir}"
346	>	debug="${build.debug}"
347	>	debuglevel="${build.debuglevel}"
348	>	deprecation="${build.deprecation}"
349	>	source="6"
350	>	classpath="${junit.jar}"
351	>	bootclasspath="${product.jar}:${bootclasspath6}"
352	>	includeAntRuntime="false"
353	>	includeJavaRuntime="false"
354	>	executable="${javac8}"
355	>	fork="true">
356
357	<	<compilerarg value="${bootclasspath.args}"/>
357	>	<include name="**/*.java"/>
358		<compilerarg line="${build.args}"/>
359		<compilerarg value="-XDignore.symbol.file=true"/>
360	<
347	<	<classpath refid="test.classpath"/>
360	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
361
362		</javac>
363
364		<javac srcdir="${test.src.dir}"
365	<	destdir="${build.testcases.dir}"
366	<	debug="${build.debug}"
367	<	debuglevel="${build.debuglevel}"
368	<	deprecation="${build.deprecation}"
369	<	source="${build.sourcelevel}"
370	<	fork="true">
365	>	destdir="${build.testcases.dir}"
366	>	debug="${build.debug}"
367	>	debuglevel="${build.debuglevel}"
368	>	deprecation="${build.deprecation}"
369	>	source="6"
370	>	classpath=""
371	>	bootclasspath="${product.jar}:${bootclasspath6}"
372	>	includeAntRuntime="false"
373	>	includeJavaRuntime="false"
374	>	executable="${javac8}"
375	>	fork="true">
376
377	<	<include name="jsr166/test/**"/>
377	>	<include name="jsr166/test/**/*.java"/>
378
361	–	<compilerarg value="${bootclasspath.args}"/>
379		<compilerarg line="${build.args}"/>
380		<compilerarg value="-XDignore.symbol.file=true"/>
381	<
365	<	<classpath refid="test.classpath"/>
381	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
382
383		</javac>
384
#	Line 379 | Line 395
395		<compilerarg line="${build.args}"/>
396		<compilerarg value="-XDignore.symbol.file=true"/>
397
382	–	<classpath refid="test.classpath"/>
383	–
398		</javac>
399		-->
400
#	Line 400 | Line 414
414		errorProperty="junit.failed"
415		failureProperty="junit.failed"
416		dir="${build.reports.dir}"
417	+	jvm="${java8}"
418		fork="true">
419
420	<	<jvmarg value="${bootclasspath.args}"/>
420	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
421		<jvmarg value="-server"/>
422		<jvmarg value="-showversion"/>
423
#	Line 503 | Line 518
518		<!-- Various demos and test programs -->
519
520
521	<	<target name="loops" depends="init, configure-compiler"
521	>	<target name="loops" depends="configure-compiler"
522		description="Benchmark from Doug Lea's AQS paper">
523
524		<mkdir dir="${build.loops.dir}"/>
#	Line 543 | Line 558
558		debug="${build.debug}"
559		debuglevel="${build.debuglevel}"
560		deprecation="${build.deprecation}"
561	<	source="1.6"
561	>	source="6"
562		classpath=""
563		bootclasspath="${bootclasspath6}"
564		includeAntRuntime="false"
#	Line 558 | Line 573
573
574		</javac>
575
576	<	<mkdir dir="${build.4jdk7.lib.dir}"/>
576	>	</target>
577	>
578	>	<target name="4jdk7-jar"
579	>	depends="4jdk7compile"
580	>	description="Builds library jar from compiled sources">
581
582	<	<jar destfile="${4jdk7product.jar}" index="true">
582	>	<jar destfile="${4jdk7product.jar}">
583		<fileset dir="${build.4jdk7.classes.dir}"/>
584		</jar>
585
567	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
568	–
569	–	<javac srcdir="${tck.src.dir}"
570	–	destdir="${build.4jdk7.tck.classes.dir}"
571	–	debug="${build.debug}"
572	–	debuglevel="${build.debuglevel}"
573	–	deprecation="${build.deprecation}"
574	–	source="1.6"
575	–	classpath="${junit.jar}"
576	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
577	–	includeAntRuntime="false"
578	–	includeJavaRuntime="false"
579	–	executable="${javac7}"
580	–	fork="true">
581	–
582	–	<include name="**/*.java"/>
583	–	<compilerarg line="${build.args}"/>
584	–	<compilerarg value="-XDignore.symbol.file=true"/>
585	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
586	–
587	–	</javac>
588	–
586		</target>
587
588
589		<target name="4jdk7-test-tck"
590	<	depends="4jdk7compile"
590	>	depends="4jdk7-jar"
591		description="Runs tck tests for jsr166-4jdk7 directly">
592	+
593		<run-tck-tests
594	<	jvm="${java7}"
595	<	tck.classes="${build.4jdk7.tck.classes.dir}"
594	>	target="7"
595	>	workdir="${build.4jdk7.dir}"
596		product.jar="${4jdk7product.jar}"/>
597		</target>
598
#	Line 627 | Line 625
625		</junit>
626		</target>
627
628	+	<target name="4jdk7-test-jtreg"
629	+	depends="4jdk7compile"
630	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
635	+	<jtreg dir="${jtreg.src.dir}"
636	+	jdk="${jdk7.home}"
637	+	workDir="${build.4jdk7.dir}/JTwork"
638	+	reportDir="${build.4jdk7.dir}/JTreport">
639	+
640	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641	+	<arg value="-agentvm"/>
642	+	<arg value="-v:nopass,fail"/>
643	+	<arg value="-vmoptions:-esa -ea"/>
644	+	<arg value="-automatic"/>
645	+	<arg value="-k:!ignore"/>
646	+	</jtreg>
647	+	</target>
648	+
649	+
650	+	<target name="4jdk7-test"
651	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
652	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
653	+	</target>
654	+
655
656		<target name="4jdk7docs"
657	<	description="Builds javadocs with custom tags to build folder">
657	>	description="Builds javadocs for src/jdk7 to dist dir">
658
659	<	<delete dir="${build.4jdk7.docs.dir}"/>
660	<	<mkdir dir="${build.4jdk7.docs.dir}"/>
659	>	<delete dir="${dist.4jdk7.docs.dir}"/>
660	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
661
662	<	<javadoc destdir="${build.4jdk7.docs.dir}"
662	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
663		packagenames="none"
664		link="${jdkapi7docs.url}"
665		overview="${4jdk7src.dir}/intro.html"
#	Line 651 | Line 676
676
677
678		<target name="4jdk7dist"
679	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
679	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
680		description="Puts all distributable products in single hierarchy"/>
681
682
683
684		<target name="4jdk7clean"
685	<	description="Removes all build products">
685	>	description="Removes all 4jdk7 build products">
686
687		<delete dir="${build.4jdk7.dir}"/>
688
#	Line 670 | Line 695
695
696		</target>
697
673	–	<target name="4jdk7dist-docs"
674	–	description="Builds javadocs without custom tags to dist folder">
675	–
676	–	<delete dir="${dist.4jdk7.docs.dir}"/>
677	–	<mkdir dir="${dist.4jdk7.docs.dir}"/>
678	–
679	–	<javadoc destdir="${dist.4jdk7.docs.dir}"
680	–	packagenames="none"
681	–	link="${jdkapi7docs.url}"
682	–	overview="${4jdk7src.dir}/intro.html"
683	–	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
684	–	classpath=""
685	–	executable="${javadoc7}">
686	–	<arg value="-XDignore.symbol.file=true"/>
687	–	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688	–	<include name="**/*.java"/>
689	–	</fileset>
690	–	</javadoc>
691	–
692	–	</target>
693	–
698		<target name="4jdk7dist-jar"
699		depends="4jdk7clean, 4jdk7compile">
700
#	Line 698 | Line 702
702
703		</target>
704
701	–	<!-- jsr166x -->
705
706	+	<!-- jsr166x -->
707
708		<target name="jsr166xcompile"
709	<	depends="init, configure-compiler"
710	<	description="Compiles jsr166x sources">
709	>	depends="configure-compiler"
710	>	description="Compiles jsr166x sources to build dir">
711
712	<	<mkdir dir="${build.jsr166x.dir}"/>
712	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
713
714	<	<javac srcdir="${jsr166xsrc.dir}"
715	<	destdir="${build.jsr166x.dir}"
716	<	debug="${build.debug}"
717	<	debuglevel="${build.debuglevel}"
718	<	deprecation="${build.deprecation}"
719	<	source="${build.sourcelevel}"
720	<	fork="true">
714	>	<javac srcdir="${topsrc.dir}"
715	>	destdir="${build.jsr166x.classes.dir}"
716	>	debug="${build.debug}"
717	>	debuglevel="${build.debuglevel}"
718	>	deprecation="${build.deprecation}"
719	>	classpath=""
720	>	source="5"
721	>	bootclasspath="${bootclasspath6}"
722	>	includeAntRuntime="false"
723	>	includeJavaRuntime="false"
724	>	executable="${javac7}"
725	>	fork="true">
726
727	<	<include name="**/*.java"/>
727	>	<include name="jsr166x/**/*.java"/>
728		<compilerarg line="${build.args}"/>
729		<compilerarg value="-XDignore.symbol.file=true"/>
730	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
731
732		</javac>
733
#	Line 729 | Line 739
739		depends="jsr166xcompile"
740		description="Builds library jar from compiled sources">
741
742	<	<mkdir dir="${build.jsr166xlib.dir}"/>
743	<
734	<	<jar destfile="${jsr166xproduct.jar}">
735	<	<fileset dir="${build.jsr166x.dir}"/>
742	>	<jar destfile="${jsr166x.jar}">
743	>	<fileset dir="${build.jsr166x.classes.dir}"/>
744		</jar>
745
746		</target>
#	Line 740 | Line 748
748
749
750		<target name="jsr166xdocs"
751	<	description="Builds javadocs with custom tags to build folder">
751	>	description="Builds javadocs to dist dir">
752
753	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
754	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
753	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
754	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
755
756	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
757	<	packagenames="jsr166x"
756	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
757	>	packagenames="jsr166x.*"
758		link="${jdkapidocs.url}"
759	<	source="${build.sourcelevel}"
760	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
761	<	additionalparam="-XDignore.symbol.file=true" />
759	>	source="5"
760	>	bootclasspath="${bootclasspath6}"
761	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
762	>	executable="${javadoc7}"
763	>	additionalparam="-XDignore.symbol.file=true"/>
764
765		</target>
766
767
768		<target name="jsr166xdist"
769	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
769	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
770		description="Puts all distributable products in single hierarchy"/>
771
772
773
774		<target name="jsr166xclean"
775	<	description="Removes all build products">
775	>	description="Removes all jsr166x build products">
776
777		<delete dir="${build.jsr166x.dir}"/>
768	–	<delete dir="${build.jsr166xlib.dir}"/>
778
779		</target>
780
#	Line 777 | Line 786
786		</target>
787
788
780	–
781	–	<target name="jsr166xdist-docs"
782	–	description="Builds javadocs without custom tags to dist folder">
783	–
784	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
785	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
786	–
787	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
788	–	packagenames="jsr166x"
789	–	link="${jdkapidocs.url}"
790	–	source="${build.sourcelevel}"
791	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
792	–	additionalparam="-XDignore.symbol.file=true" />
793	–
794	–	</target>
795	–
789		<target name="jsr166xdist-jar"
790		depends="jsr166xclean, jsr166xjar">
791
792	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
792	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
793
794		</target>
795
#	Line 804 | Line 797
797
798
799		<target name="jsr166ycompile"
800	<	depends="init, configure-compiler"
800	>	depends="configure-compiler"
801		description="Compiles jsr166y sources">
802
803	<	<mkdir dir="${build.jsr166y.dir}"/>
803	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
804
805	<	<javac srcdir="${jsr166ysrc.dir}"
806	<	destdir="${build.jsr166y.dir}"
807	<	debug="${build.debug}"
808	<	debuglevel="${build.debuglevel}"
809	<	deprecation="${build.deprecation}"
810	<	source="${build.sourcelevel}"
811	<	fork="true">
805	>	<javac srcdir="${topsrc.dir}"
806	>	destdir="${build.jsr166y.classes.dir}"
807	>	debug="${build.debug}"
808	>	debuglevel="${build.debuglevel}"
809	>	deprecation="${build.deprecation}"
810	>	source="6"
811	>	classpath=""
812	>	bootclasspath="${bootclasspath6}"
813	>	includeAntRuntime="false"
814	>	includeJavaRuntime="false"
815	>	executable="${javac7}"
816	>	fork="true">
817
818	<	<include name="**/*.java"/>
818	>	<include name="jsr166y/**/*.java"/>
819		<compilerarg line="${build.args}"/>
820		<compilerarg value="-XDignore.symbol.file=true"/>
821	<	<compilerarg value="${bootclasspath.args}"/>
824	<
825	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
826	<
821	>	<compilerarg value="-Xlint:all"/>
822		</javac>
828	–
823		</target>
824
825
832	–
826		<target name="jsr166yjar"
827		depends="jsr166ycompile"
828		description="Builds library jar from compiled sources">
829
830	<	<mkdir dir="${build.jsr166ylib.dir}"/>
831	<
839	<	<jar destfile="${jsr166yproduct.jar}" index="true">
840	<	<fileset dir="${build.jsr166y.dir}"/>
830	>	<jar destfile="${jsr166y.jar}" index="true">
831	>	<fileset dir="${build.jsr166y.classes.dir}"/>
832		</jar>
833
834		</target>
#	Line 845 | Line 836
836
837
838		<target name="jsr166ydocs"
839	<	description="Builds javadocs with custom tags to build folder">
839	>	description="Builds javadocs to dist dir">
840
841	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
842	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
841	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
842	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
843
844	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
845	<	packagenames="jsr166y"
844	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
845	>	packagenames="jsr166y.*"
846		link="${jdkapidocs.url}"
847	<	source="${build.sourcelevel}"
848	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
849	<	additionalparam="-XDignore.symbol.file=true" />
847	>	source="6"
848	>	bootclasspath="${bootclasspath6}"
849	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
850	>	executable="${javadoc7}"
851	>	additionalparam="-XDignore.symbol.file=true"/>
852
853		</target>
854
855
856		<target name="jsr166ydist"
857	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
857	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
858		description="Puts all distributable products in single hierarchy"/>
859
860
861
862		<target name="jsr166yclean"
863	<	description="Removes all build products">
863	>	description="Removes all jsr166y build products">
864
865		<delete dir="${build.jsr166y.dir}"/>
873	–	<delete dir="${build.jsr166ylib.dir}"/>
866
867		</target>
868
#	Line 881 | Line 873
873
874		</target>
875
884	–	<target name="jsr166ydist-docs"
885	–	description="Builds javadocs without custom tags to dist folder">
886	–
887	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
888	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
889	–
890	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
891	–	packagenames="jsr166y"
892	–	link="${jdkapidocs.url}"
893	–	source="${build.sourcelevel}"
894	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
895	–	additionalparam="-XDignore.symbol.file=true" />
896	–
897	–	</target>
898	–
876		<target name="jsr166ydist-jar"
877		depends="jsr166yclean, jsr166yjar">
878
879	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
879	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
880
881		</target>
882
#	Line 908 | Line 885
885
886
887		<target name="extra166ycompile"
888	<	depends="init, configure-compiler, jsr166ycompile"
888	>	depends="configure-compiler, jsr166yjar"
889		description="Compiles extra166y sources">
890
891	<	<mkdir dir="${build.extra166y.dir}"/>
891	>	<mkdir dir="${build.extra166y.classes.dir}"/>
892
893	<	<javac srcdir="${extra166ysrc.dir}"
894	<	destdir="${build.extra166y.dir}"
895	<	debug="${build.debug}"
896	<	classpath="${jsr166yproduct.jar}"
897	<	debuglevel="${build.debuglevel}"
898	<	deprecation="${build.deprecation}"
899	<	source="${build.sourcelevel}"
900	<	fork="true">
893	>	<javac srcdir="${topsrc.dir}"
894	>	destdir="${build.extra166y.classes.dir}"
895	>	debug="${build.debug}"
896	>	debuglevel="${build.debuglevel}"
897	>	deprecation="${build.deprecation}"
898	>	classpath=""
899	>	source="6"
900	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
901	>	includeAntRuntime="false"
902	>	includeJavaRuntime="false"
903	>	executable="${javac7}"
904	>	fork="true">
905
906	<	<include name="**/*.java"/>
906	>	<include name="extra166y/**/*.java"/>
907		<compilerarg line="${build.args}"/>
908		<compilerarg value="-XDignore.symbol.file=true"/>
909	<	<compilerarg value="${bootclasspath.args}"/>
929	<
930	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
909	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
910
911		</javac>
912
#	Line 939 | Line 918
918		depends="extra166ycompile"
919		description="Builds library jar from compiled sources">
920
921	<	<mkdir dir="${build.extra166ylib.dir}"/>
922	<
944	<	<jar destfile="${extra166yproduct.jar}" index="true">
945	<	<fileset dir="${build.extra166y.dir}"/>
921	>	<jar destfile="${extra166y.jar}" index="true">
922	>	<fileset dir="${build.extra166y.classes.dir}"/>
923		</jar>
924
925		</target>
#	Line 950 | Line 927
927
928
929		<target name="extra166ydocs"
930	<	description="Builds javadocs with custom tags to build folder">
930	>	description="Builds javadocs to build dir">
931
932	<	<delete dir="${build.extra166yjavadocs.dir}"/>
933	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
932	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
933	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
934
935	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
936	<	packagenames="extra166y"
935	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
936	>	packagenames="extra166y.*"
937		link="${jdkapidocs.url}"
938	<	source="${build.sourcelevel}"
939	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
940	<	additionalparam="-XDignore.symbol.file=true" />
938	>	source="6"
939	>	bootclasspath="${bootclasspath6}"
940	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
941	>	executable="${javadoc7}"
942	>	additionalparam="-XDignore.symbol.file=true"/>
943
944		</target>
945
946
947		<target name="extra166ydist"
948	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
948	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
949		description="Puts all distributable products in single hierarchy"/>
950
951
952
953		<target name="extra166yclean"
954	<	description="Removes all build products">
954	>	description="Removes all extra166y build products">
955
956		<delete dir="${build.extra166y.dir}"/>
978	–	<delete dir="${build.extra166ylib.dir}"/>
957
958		</target>
959
#	Line 986 | Line 964
964
965		</target>
966
989	–	<target name="extra166ydist-docs"
990	–	description="Builds javadocs without custom tags to dist folder">
991	–
992	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
993	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
994	–
995	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
996	–	packagenames="extra166y"
997	–	link="${jdkapidocs.url}"
998	–	source="${build.sourcelevel}"
999	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1000	–	additionalparam="-XDignore.symbol.file=true" />
1001	–
1002	–	</target>
1003	–
967		<target name="extra166ydist-jar"
968		depends="extra166yclean, extra166yjar">
969
970	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
970	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
971
972		</target>
973
#	Line 1014 | Line 977
977		depends="configure-compiler"
978		description="Compiles jsr166e sources">
979
980	<	<mkdir dir="${build.jsr166e.dir}"/>
980	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
981
982		<javac srcdir="${topsrc.dir}"
983	<	destdir="${build.jsr166e.dir}"
983	>	destdir="${build.jsr166e.classes.dir}"
984		debug="${build.debug}"
985		debuglevel="${build.debuglevel}"
986		deprecation="${build.deprecation}"
987	<	source="1.7"
987	>	source="7"
988		classpath=""
989		includeAntRuntime="false"
990		includeJavaRuntime="false"
#	Line 1043 | Line 1006
1006		depends="jsr166ecompile"
1007		description="Builds library jar from compiled sources">
1008
1009	<	<mkdir dir="${build.jsr166elib.dir}"/>
1010	<
1048	<	<jar destfile="${jsr166eproduct.jar}" index="true">
1049	<	<fileset dir="${build.jsr166e.dir}"/>
1009	>	<jar destfile="${jsr166e.jar}" index="true">
1010	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1011		</jar>
1012
1013		</target>
#	Line 1054 | Line 1015
1015
1016
1017		<target name="jsr166edocs"
1018	<	description="Builds javadocs with custom tags to build folder">
1018	>	description="Builds javadocs to build dir">
1019
1020	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
1021	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1020	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1021	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1022
1023	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1024	<	packagenames="jsr166e,jsr166e.extra"
1025	<	link="${jdkapi7docs.url}"
1026	<	source="1.7"
1023	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1024	>	packagenames="jsr166e.*"
1025	>	link="${jdkapidocs.url}"
1026	>	source="7"
1027		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1028		executable="${javadoc7}"
1029		additionalparam="-XDignore.symbol.file=true" >
1069	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1070	–	<include name="jsr166e/**/*.java"/>
1071	–	</fileset>
1030		</javadoc>
1031
1032		</target>
1033
1034
1035		<target name="jsr166edist"
1036	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1036	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1037		description="Puts all distributable products in single hierarchy"/>
1038
1039
1040
1041		<target name="jsr166eclean"
1042	<	description="Removes all build products">
1042	>	description="Removes all jsr166e build products">
1043
1044		<delete dir="${build.jsr166e.dir}"/>
1087	–	<delete dir="${build.jsr166elib.dir}"/>
1045
1046		</target>
1047
1048
1092	–
1049		<target name="jsr166edist-clean"
1050		description="Removes all build and distribution products">
1051
1052		</target>
1053
1098	–	<target name="jsr166edist-docs"
1099	–	description="Builds javadocs without custom tags to dist folder">
1100	–
1101	–	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1102	–	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1103	–
1104	–	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1105	–	packagenames="jsr166e,jsr166e.extra"
1106	–	link="${jdkapidocs.url}"
1107	–	source="1.7"
1108	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1109	–	additionalparam="-XDignore.symbol.file=true" />
1110	–
1111	–	</target>
1112	–
1054		<target name="jsr166edist-jar"
1055		depends="jsr166eclean, jsr166ejar">
1056
1057	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1057	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1058
1059		</target>
1060

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines