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.76 by dl, Tue Jan 6 16:31:52 2009 UTC vs.
Revision 1.110 by jsr166, Sun Jan 20 01:09:12 2013 UTC

#	Line 8 | Line 8
8
9		User-specific settings are read from user.properties.
10		See user.properties.sample for an explanation of some useful settings.
11	+
12	+	The repository contains all dependencies except for ant and the JDK
13	+	itself.  Because the JDK version matters and because different
14	+	targets require different JDKs, we assume that users have created a
15	+	hierarchy containing:
16	+	$HOME/jdk/jdk6
17	+	$HOME/jdk/jdk7
18	+	$HOME/jdk/jdk8
19	+	where each of the above is a JDK or a symlink to same, and
20	+	$HOME/jdk/src/jdk6
21	+	$HOME/jdk/src/jdk7
22	+	$HOME/jdk/src/jdk8
23	+	where each of the above is a complete JDK source tree
24	+	(e.g. mercurial forest) or a symlink to same.
25		------------------------------------------------------------------------------
26		</description>
27
#	Line 21 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.5"/>
38	>	<property name="build.sourcelevel"    value="1.6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
42
43		<!-- Build locations -->
44	<	<property name="build.dir"            location="build"/>
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"/>
50	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
51	<	<property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
52	<	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
53	<	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
54	<
55	<	<property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
56	<	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
57	<	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
58	<
59	<	<property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>
60	<	<property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>
61	<	<property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>
44	>	<property name="build.dir"                   location="build"/>
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.reports.dir"           location="${build.dir}/reports"/>
49	>
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"/>
56	>	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57	>	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58	>	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59	>
60	>	<!-- JDK binary locations -->
61	>	<property name="jdks.home"  location="${user.home}/jdk"/>
62	>
63	>	<macrodef name="defjdklocations">
64	>	<attribute name="v"/>
65	>	<sequential>
66	>	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
67	>	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
68	>	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
69	>	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70	>	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
71	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
72	>	<property name="bootclasspath@{v}"
73	>	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74	>	</sequential>
75	>	</macrodef>
76	>
77	>	<defjdklocations v="6"/>
78	>	<defjdklocations v="7"/>
79	>	<defjdklocations v="8"/>
80	>
81	>	<macrodef name="run-tck-tests">
82	>	<attribute name="jvm"/>
83	>	<attribute name="tck.classes"/>
84	>	<attribute name="product.jar" default="${product.jar}"/>
85	>	<attribute name="jvmflags" default=""/>
86	>	<sequential>
87	>	<java classname="JSR166TestCase"
88	>	jvm="@{jvm}" fork="true">
89	>	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
90	>	<jvmarg line="@{jvmflags}"/>
91	>	<classpath>
92	>	<pathelement location="${junit.jar}"/>
93	>	<pathelement location="@{tck.classes}"/>
94	>	</classpath>
95	>	</java>
96	>	</sequential>
97	>	</macrodef>
98
99		<!-- Source locations -->
100		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 55 | Line 105
105		<property name="lib.dir"              location="${basedir}/lib"/>
106		<property name="dist.dir"             location="${basedir}/dist"/>
107		<property name="topsrc.dir"           location="${basedir}/src"/>
108	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
109	<	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
110	<	<property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>
108	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
109	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
110	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113
114		<!-- Distribution locations -->
115	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
116	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
117	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
118	<	<property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>
115	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121
122		<!-- Jar locations -->
123	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
125	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
126	<	<property name="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>
127	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
123	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130
131		<!-- Bootclasspath argument -->
132		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133
134	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138	+
139	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140	+	<!-- The below does not yet exist as of 2012-11 -->
141	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142	+
143	+	<!-- Default jdk api doc location (latest stable release seems best) -->
144	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145	+
146		<!-- Test classpath -->
147		<path id="test.classpath">
148		<pathelement location="${build.testcases.dir}"/>
#	Line 86 | Line 154
154		<pathelement location="${build.loops.dir}"/>
155		</path>
156
157	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
158	+	<!-- TODO: How do we get &trade to work? -->
159	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
160	+	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161	+	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
162	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163
164		<!-- Main targets -->
165
166	+	<target name="dists"
167	+	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168	+	description="Builds all public jars and docs"/>
169
170		<target name="compile"
171	<	depends="init, configure-compiler"
172	<	description="Compiles main sources to build folder">
171	>	depends="configure-compiler"
172	>	description="Compiles src/main sources to build dir">
173
174		<mkdir dir="${build.classes.dir}"/>
175
176		<javac srcdir="${src.dir}"
177	<	destdir="${build.classes.dir}"
178	<	debug="${build.debug}"
179	<	debuglevel="${build.debuglevel}"
180	<	deprecation="${build.deprecation}"
181	<	source="${build.sourcelevel}"
182	<	fork="true">
177	>	destdir="${build.classes.dir}"
178	>	debug="${build.debug}"
179	>	debuglevel="${build.debuglevel}"
180	>	deprecation="${build.deprecation}"
181	>	classpath=""
182	>	includeAntRuntime="false"
183	>	includeJavaRuntime="false"
184	>	executable="${javac8}"
185	>	fork="true">
186
187		<include name="**/*.java"/>
188	<	<compilerarg value="-XDignore.symbol.file"/>
188	>	<compilerarg line="${build.args}"/>
189	>	<compilerarg value="-XDignore.symbol.file=true"/>
190	>	<compilerarg value="-Xlint:all"/>
191
192		<!--
193		<exclude name="java/lang/**"/>
#	Line 123 | Line 205
205		depends="compile"
206		description="Builds library jar from compiled sources">
207
126	–	<mkdir dir="${build.lib.dir}"/>
127	–
208		<jar destfile="${product.jar}">
209		<fileset dir="${build.classes.dir}"/>
210		</jar>
#	Line 134 | Line 214
214
215
216		<target name="test"
217	<	depends="init, configure-tests, report-tests"
217	>	depends="configure-tests, report-tests"
218		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219
220
221
222		<target name="docs"
223	<	description="Builds javadocs with custom tags to build folder">
223	>	description="Builds javadocs for src/main to dist dir">
224
225	<	<delete dir="${build.javadocs.dir}"/>
226	<	<mkdir dir="${build.javadocs.dir}"/>
147	<
148	<	<javadoc destdir="${build.javadocs.dir}"
149	<	link="http://java.sun.com/javase/6/docs/api/"
150	<	overview="${src.dir}/intro.html"
151	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
152	<	>
225	>	<delete dir="${dist.javadocs.dir}"/>
226	>	<mkdir dir="${dist.javadocs.dir}"/>
227
228	<	<packageset dir="${src.dir}"/>
228	>	<!-- the packagenames="none" hack below prevents scanning the -->
229	>	<!-- sourcepath for packages -->
230
231	+	<javadoc destdir="${dist.javadocs.dir}"
232	+	packagenames="none"
233	+	link="${jdkapi8docs.url}"
234	+	overview="${src.dir}/intro.html"
235	+	sourcepath="${src.dir}:${jdk8src.dir}"
236	+	classpath=""
237	+	executable="${javadoc8}">
238	+	<arg value="-XDignore.symbol.file=true"/>
239	+	<arg value="-tag"/>
240	+	<arg value="${javadoc.jls.option}"/>
241	+	<fileset dir="${src.dir}" defaultexcludes="yes">
242	+	<include name="**/*.java"/>
243	+	</fileset>
244		</javadoc>
245
246		</target>
#	Line 160 | Line 248
248
249
250		<target name="dist"
251	<	depends="init, dist-clean, dist-jar, dist-docs"
251	>	depends="dist-clean, dist-jar, docs"
252		description="Puts all distributable products in single hierarchy"/>
253
254
167	–
255		<target name="release"
256		depends="dist"
257		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 189 | Line 276
276		description="Removes all build products">
277
278		<delete dir="${build.dir}"/>
192	–	<delete dir="${build.classes.dir}"/>
193	–	<delete dir="${build.lib.dir}"/>
279
280		</target>
281
#	Line 205 | Line 290
290
291
292
208	–	<target name="dist-docs"
209	–	description="Builds javadocs without custom tags to dist folder">
210	–
211	–	<delete dir="${dist.javadocs.dir}"/>
212	–	<mkdir dir="${dist.javadocs.dir}"/>
213	–
214	–	<javadoc destdir="${dist.javadocs.dir}"
215	–	link="http://java.sun.com/javase/6/docs/api/"
216	–	overview="${src.dir}/intro.html"
217	–
218	–	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
219	–	>
220	–	<!--
221	–	<packageset dir="${src.dir}" defaultexcludes="yes">
222	–	<include name="java/util/concurrent"/>
223	–	<include name="java/util/concurrent/atomic"/>
224	–	<include name="java/util/concurrent/locks"/>
225	–	</packageset>
226	–	-->
227	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
228	–	<include name="main/java/util/concurrent/*.java"/>
229	–	<include name="main/java/util/concurrent/atomic/*.java"/>
230	–	<include name="main/java/util/concurrent/locks/*.java"/>
231	–	<include name="main/java/util/*.java"/>
232	–	<!--
233	–	<include name="main/java/util/concurrent/*.html"/>
234	–	<include name="main/java/util/concurrent/atomic/*.html"/>
235	–	<include name="main/java/util/concurrent/locks/*.html"/>
236	–	<include name="main/java/util/*.html"/>
237	–	-->
238	–	<!--      <include name="jsr166x/*.java"/> -->
239	–	</fileset>
240	–	</javadoc>
241	–
242	–	</target>
243	–
244	–
245	–
293		<!-- Internal targets -->
294
295
249	–	<target name="init">
250	–
251	–	<!-- Version is kept in a separate file -->
252	–	<loadfile property="version" srcFile="version.properties"/>
253	–	<echo>Building JSR-166 version ${version}</echo>
254	–	<echo>java.home is ${java.home}</echo>
255	–
256	–	</target>
257	–
258	–
296		<target name="dist-jar"
297		depends="clean, jar">
298
#	Line 279 | Line 316
316
317		<compilerarg value="${bootclasspath.args}"/>
318		<compilerarg line="${build.args}"/>
319	+	<compilerarg value="-XDignore.symbol.file=true"/>
320
321		<classpath refid="test.classpath"/>
322
#	Line 296 | Line 334
334
335		<compilerarg value="${bootclasspath.args}"/>
336		<compilerarg line="${build.args}"/>
337	+	<compilerarg value="-XDignore.symbol.file=true"/>
338
339		<classpath refid="test.classpath"/>
340
#	Line 312 | Line 351
351
352		<compilerarg value="${bootclasspath.args}"/>
353		<compilerarg line="${build.args}"/>
354	+	<compilerarg value="-XDignore.symbol.file=true"/>
355
356		<classpath refid="test.classpath"/>
357
#	Line 437 | Line 477
477		<!-- Various demos and test programs -->
478
479
480	<	<target name="loops" depends="init, configure-compiler"
480	>	<target name="loops" depends="configure-compiler"
481		description="Benchmark from Doug Lea's AQS paper">
482
483		<mkdir dir="${build.loops.dir}"/>
#	Line 452 | Line 492
492
493		<compilerarg line="${build.args}"/>
494		<classpath refid="loops.classpath"/>
495	+	<compilerarg value="-XDignore.symbol.file=true"/>
496
497		</javac>
498
#	Line 462 | Line 503
503		</target>
504
505
506	<	<!-- jsr166x -->
506	>	<!-- jsr166 4jdk7 -->
507
508
509	<	<target name="jsr166xcompile"
510	<	depends="init, configure-compiler"
511	<	description="Compiles jsr166x sources">
509	>	<target name="4jdk7compile"
510	>	depends="configure-compiler"
511	>	description="Compiles src/jdk7 sources, targeting jdk7">
512	>
513	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
514	>
515	>	<javac srcdir="${4jdk7src.dir}"
516	>	destdir="${build.4jdk7.classes.dir}"
517	>	debug="${build.debug}"
518	>	debuglevel="${build.debuglevel}"
519	>	deprecation="${build.deprecation}"
520	>	source="6"
521	>	classpath=""
522	>	bootclasspath="${bootclasspath6}"
523	>	includeAntRuntime="false"
524	>	includeJavaRuntime="false"
525	>	executable="${javac7}"
526	>	fork="true">
527
528	<	<mkdir dir="${build.jsr166x.dir}"/>
528	>	<include name="**/*.java"/>
529	>	<compilerarg line="${build.args}"/>
530	>	<compilerarg value="-XDignore.symbol.file=true"/>
531	>	<compilerarg value="-Xlint:all"/>
532
533	<	<javac srcdir="${jsr166xsrc.dir}"
534	<	destdir="${build.jsr166x.dir}"
535	<	debug="${build.debug}"
536	<	debuglevel="${build.debuglevel}"
537	<	deprecation="${build.deprecation}"
538	<	source="${build.sourcelevel}"
539	<	fork="true">
533	>	</javac>
534	>
535	>	<jar destfile="${4jdk7product.jar}" index="true">
536	>	<fileset dir="${build.4jdk7.classes.dir}"/>
537	>	</jar>
538	>
539	>	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
540	>
541	>	<javac srcdir="${tck.src.dir}"
542	>	destdir="${build.4jdk7.tck.classes.dir}"
543	>	debug="${build.debug}"
544	>	debuglevel="${build.debuglevel}"
545	>	deprecation="${build.deprecation}"
546	>	source="6"
547	>	classpath="${junit.jar}"
548	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
549	>	includeAntRuntime="false"
550	>	includeJavaRuntime="false"
551	>	executable="${javac7}"
552	>	fork="true">
553
554		<include name="**/*.java"/>
555		<compilerarg line="${build.args}"/>
556	+	<compilerarg value="-XDignore.symbol.file=true"/>
557	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
558
559		</javac>
560
561		</target>
562
563
564	+	<target name="4jdk7-test-tck"
565	+	depends="4jdk7compile"
566	+	description="Runs tck tests for jsr166-4jdk7 directly">
567	+	<run-tck-tests
568	+	jvm="${java7}"
569	+	tck.classes="${build.4jdk7.tck.classes.dir}"
570	+	product.jar="${4jdk7product.jar}"/>
571	+	</target>
572
491	–	<target name="jsr166xjar"
492	–	depends="jsr166xcompile"
493	–	description="Builds library jar from compiled sources">
494	–
495	–	<mkdir dir="${build.jsr166xlib.dir}"/>
573
574	<	<jar destfile="${jsr166xproduct.jar}">
575	<	<fileset dir="${build.jsr166x.dir}"/>
576	<	</jar>
574	>	<target name="4jdk7-test-tck-junit"
575	>	depends="4jdk7compile"
576	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
577
578	<	</target>
578	>	<junit printsummary="true"
579	>	showoutput="true"
580	>	errorProperty="junit.failed"
581	>	failureProperty="junit.failed"
582	>	includeantruntime="true"
583	>	jvm="${java7}"
584	>	fork="true">
585
586	+	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
587	+	<jvmarg value="-server"/>
588
589	+	<classpath>
590	+	<pathelement location="${junit.jar}"/>
591	+	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
592	+	</classpath>
593
594	<	<target name="jsr166xdocs"
506	<	description="Builds javadocs with custom tags to build folder">
594	>	<formatter type="brief"/>
595
596	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
597	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
596	>	<test name="JSR166TestCase" haltonfailure="no">
597	>	</test>
598
599	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
600	<	link="http://java.sun.com/javase/6/docs/api/"
599	>	</junit>
600	>	</target>
601
514	–	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
602
603	<	>
604	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
518	<	<include name="jsr166x"/>
519	<	</packageset>
603	>	<target name="4jdk7docs"
604	>	description="Builds javadocs for src/jdk7 to dist dir">
605
606	+	<delete dir="${dist.4jdk7.docs.dir}"/>
607	+	<mkdir dir="${dist.4jdk7.docs.dir}"/>
608
609	+	<javadoc destdir="${dist.4jdk7.docs.dir}"
610	+	packagenames="none"
611	+	link="${jdkapi7docs.url}"
612	+	overview="${4jdk7src.dir}/intro.html"
613	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
614	+	classpath=""
615	+	executable="${javadoc7}">
616	+	<arg value="-XDignore.symbol.file=true"/>
617	+	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
618	+	<include name="**/*.java"/>
619	+	</fileset>
620		</javadoc>
621
622		</target>
623
624
625	<	<target name="jsr166xdist"
626	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
625	>	<target name="4jdk7dist"
626	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
627		description="Puts all distributable products in single hierarchy"/>
628
629
630
631	<	<target name="jsr166xclean"
632	<	description="Removes all build products">
631	>	<target name="4jdk7clean"
632	>	description="Removes all 4jdk7 build products">
633
634	<	<delete dir="${build.jsr166x.dir}"/>
537	<	<delete dir="${build.jsr166xlib.dir}"/>
634	>	<delete dir="${build.4jdk7.dir}"/>
635
636		</target>
637
638
639
640	<	<target name="jsr166xdist-clean"
640	>	<target name="4jdk7dist-clean"
641		description="Removes all build and distribution products">
642
643		</target>
644
645	+	<target name="4jdk7dist-jar"
646	+	depends="4jdk7clean, 4jdk7compile">
647
648	+	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
649
650	<	<target name="jsr166xdist-docs"
651	<	description="Builds javadocs without custom tags to dist folder">
650	>	</target>
651	>
652	>
653	>	<!-- jsr166x -->
654	>
655	>	<target name="jsr166xcompile"
656	>	depends="configure-compiler"
657	>	description="Compiles jsr166x sources to build dir">
658	>
659	>	<mkdir dir="${build.jsr166x.dir}"/>
660	>
661	>	<javac srcdir="${topsrc.dir}"
662	>	destdir="${build.jsr166x.dir}"
663	>	debug="${build.debug}"
664	>	debuglevel="${build.debuglevel}"
665	>	deprecation="${build.deprecation}"
666	>	classpath=""
667	>	source="5"
668	>	bootclasspath="${bootclasspath6}"
669	>	includeAntRuntime="false"
670	>	includeJavaRuntime="false"
671	>	executable="${javac7}"
672	>	fork="true">
673	>
674	>	<include name="jsr166x/**/*.java"/>
675	>	<compilerarg line="${build.args}"/>
676	>	<compilerarg value="-XDignore.symbol.file=true"/>
677	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
678	>
679	>	</javac>
680	>
681	>	</target>
682	>
683	>
684	>
685	>	<target name="jsr166xjar"
686	>	depends="jsr166xcompile"
687	>	description="Builds library jar from compiled sources">
688	>
689	>	<jar destfile="${jsr166x.jar}">
690	>	<fileset dir="${build.jsr166x.dir}"/>
691	>	</jar>
692	>
693	>	</target>
694	>
695	>
696	>
697	>	<target name="jsr166xdocs"
698	>	description="Builds javadocs to dist dir">
699
700		<delete dir="${dist.jsr166xjavadocs.dir}"/>
701		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
702
703		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
704	<	link="http://java.sun.com/javase/6/docs/api/"
705	<	source="${build.sourcelevel}">
704	>	packagenames="jsr166x.*"
705	>	link="${jdkapidocs.url}"
706	>	source="5"
707	>	bootclasspath="${bootclasspath6}"
708	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
709	>	executable="${javadoc7}"
710	>	additionalparam="-XDignore.symbol.file=true" />
711
712	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
561	<	<include name="jsr166x"/>
562	<	</packageset>
712	>	</target>
713
714	<	</javadoc>
714	>
715	>	<target name="jsr166xdist"
716	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
717	>	description="Puts all distributable products in single hierarchy"/>
718	>
719	>
720	>
721	>	<target name="jsr166xclean"
722	>	description="Removes all jsr166x build products">
723	>
724	>	<delete dir="${build.jsr166x.dir}"/>
725
726		</target>
727
728	+
729	+
730	+	<target name="jsr166xdist-clean"
731	+	description="Removes all build and distribution products">
732	+
733	+	</target>
734	+
735	+
736		<target name="jsr166xdist-jar"
737		depends="jsr166xclean, jsr166xjar">
738
739	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
739	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
740
741		</target>
742
#	Line 576 | Line 744
744
745
746		<target name="jsr166ycompile"
747	<	depends="init, configure-compiler"
747	>	depends="configure-compiler"
748		description="Compiles jsr166y sources">
749
750		<mkdir dir="${build.jsr166y.dir}"/>
751
752	<	<javac srcdir="${jsr166ysrc.dir}"
753	<	destdir="${build.jsr166y.dir}"
754	<	debug="${build.debug}"
755	<	debuglevel="${build.debuglevel}"
756	<	deprecation="${build.deprecation}"
757	<	source="${build.sourcelevel}"
758	<	fork="true">
752	>	<javac srcdir="${topsrc.dir}"
753	>	destdir="${build.jsr166y.dir}"
754	>	debug="${build.debug}"
755	>	debuglevel="${build.debuglevel}"
756	>	deprecation="${build.deprecation}"
757	>	source="6"
758	>	classpath=""
759	>	bootclasspath="${bootclasspath6}"
760	>	includeAntRuntime="false"
761	>	includeJavaRuntime="false"
762	>	executable="${javac7}"
763	>	fork="true">
764
765	<	<include name="**/*.java"/>
765	>	<include name="jsr166y/**/*.java"/>
766		<compilerarg line="${build.args}"/>
767	<	<compilerarg value="${bootclasspath.args}"/>
768	<
596	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597	<
767	>	<compilerarg value="-XDignore.symbol.file=true"/>
768	>	<compilerarg value="-Xlint:all"/>
769		</javac>
599	–
770		</target>
771
772
603	–
773		<target name="jsr166yjar"
774		depends="jsr166ycompile"
775		description="Builds library jar from compiled sources">
776
777	<	<mkdir dir="${build.jsr166ylib.dir}"/>
609	<
610	<	<jar destfile="${jsr166yproduct.jar}" index="true">
777	>	<jar destfile="${jsr166y.jar}" index="true">
778		<fileset dir="${build.jsr166y.dir}"/>
779		</jar>
780
#	Line 616 | Line 783
783
784
785		<target name="jsr166ydocs"
786	<	description="Builds javadocs with custom tags to build folder">
620	<
621	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
622	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
623	<
624	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
625	<	link="http://java.sun.com/javase/6/docs/api/"
626	<	sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
627	<
628	<	>
629	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
630	<	<include name="jsr166y"/>
631	<	</packageset>
786	>	description="Builds javadocs to dist dir">
787
788	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
789	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
790
791	<	</javadoc>
791	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
792	>	packagenames="jsr166y.*"
793	>	link="${jdkapidocs.url}"
794	>	source="6"
795	>	bootclasspath="${bootclasspath6}"
796	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
797	>	executable="${javadoc7}"
798	>	additionalparam="-XDignore.symbol.file=true" />
799
800		</target>
801
802
803		<target name="jsr166ydist"
804	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
804	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
805		description="Puts all distributable products in single hierarchy"/>
806
807
808
809		<target name="jsr166yclean"
810	<	description="Removes all build products">
810	>	description="Removes all jsr166y build products">
811
812		<delete dir="${build.jsr166y.dir}"/>
649	–	<delete dir="${build.jsr166ylib.dir}"/>
813
814		</target>
815
#	Line 657 | Line 820
820
821		</target>
822
660	–	<target name="jsr166ydist-docs"
661	–	description="Builds javadocs without custom tags to dist folder">
662	–
663	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
664	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665	–
666	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
667	–	link="http://java.sun.com/javase/6/docs/api/"
668	–	source="${build.sourcelevel}">
669	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
670	–	<include name="jsr166y/*.java"/>
671	–	</fileset>
672	–	</javadoc>
673	–
674	–	</target>
675	–
823		<target name="jsr166ydist-jar"
824		depends="jsr166yclean, jsr166yjar">
825
826	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
826	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
827
828		</target>
829
830	+
831		<!-- extra166y -->
832
833
834		<target name="extra166ycompile"
835	<	depends="init, configure-compiler"
835	>	depends="configure-compiler, jsr166yjar"
836		description="Compiles extra166y sources">
837
838		<mkdir dir="${build.extra166y.dir}"/>
839
840	<	<javac srcdir="${extra166ysrc.dir}"
841	<	destdir="${build.extra166y.dir}"
842	<	debug="${build.debug}"
843	<	debuglevel="${build.debuglevel}"
844	<	deprecation="${build.deprecation}"
845	<	source="${build.sourcelevel}"
846	<	fork="true">
840	>	<javac srcdir="${topsrc.dir}"
841	>	destdir="${build.extra166y.dir}"
842	>	debug="${build.debug}"
843	>	debuglevel="${build.debuglevel}"
844	>	deprecation="${build.deprecation}"
845	>	classpath=""
846	>	source="6"
847	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
848	>	includeAntRuntime="false"
849	>	includeJavaRuntime="false"
850	>	executable="${javac7}"
851	>	fork="true">
852
853	<	<include name="**/*.java"/>
853	>	<include name="extra166y/**/*.java"/>
854		<compilerarg line="${build.args}"/>
855	<	<compilerarg value="${bootclasspath.args}"/>
856	<
704	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
855	>	<compilerarg value="-XDignore.symbol.file=true"/>
856	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
857
858		</javac>
859
#	Line 713 | Line 865
865		depends="extra166ycompile"
866		description="Builds library jar from compiled sources">
867
868	<	<mkdir dir="${build.extra166ylib.dir}"/>
717	<
718	<	<jar destfile="${extra166yproduct.jar}" index="true">
868	>	<jar destfile="${extra166y.jar}" index="true">
869		<fileset dir="${build.extra166y.dir}"/>
870		</jar>
871
#	Line 724 | Line 874
874
875
876		<target name="extra166ydocs"
877	<	description="Builds javadocs with custom tags to build folder">
728	<
729	<	<delete dir="${build.extra166yjavadocs.dir}"/>
730	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
731	<
732	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
733	<	link="http://java.sun.com/javase/6/docs/api/"
734	<	sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
735	<
736	<	>
737	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
738	<	<include name="extra166y"/>
739	<	</packageset>
877	>	description="Builds javadocs to build dir">
878
879	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
880	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
881
882	<	</javadoc>
882	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
883	>	packagenames="extra166y.*"
884	>	link="${jdkapidocs.url}"
885	>	source="6"
886	>	bootclasspath="${bootclasspath6}"
887	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
888	>	executable="${javadoc7}"
889	>	additionalparam="-XDignore.symbol.file=true" />
890
891		</target>
892
893
894		<target name="extra166ydist"
895	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
895	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
896		description="Puts all distributable products in single hierarchy"/>
897
898
899
900		<target name="extra166yclean"
901	<	description="Removes all build products">
901	>	description="Removes all extra166y build products">
902
903		<delete dir="${build.extra166y.dir}"/>
757	–	<delete dir="${build.extra166ylib.dir}"/>
904
905		</target>
906
#	Line 765 | Line 911
911
912		</target>
913
914	<	<target name="extra166ydist-docs"
915	<	description="Builds javadocs without custom tags to dist folder">
914	>	<target name="extra166ydist-jar"
915	>	depends="extra166yclean, extra166yjar">
916
917	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
772	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
917	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
918
919	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
920	<	link="http://java.sun.com/javase/6/docs/api/"
921	<	source="${build.sourcelevel}">
922	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
923	<	<include name="extra166y/*.java"/>
924	<	</fileset>
919	>	</target>
920	>
921	>	<!-- jsr166e -->
922	>
923	>	<target name="jsr166ecompile"
924	>	depends="configure-compiler"
925	>	description="Compiles jsr166e sources">
926	>
927	>	<mkdir dir="${build.jsr166e.dir}"/>
928	>
929	>	<javac srcdir="${topsrc.dir}"
930	>	destdir="${build.jsr166e.dir}"
931	>	debug="${build.debug}"
932	>	debuglevel="${build.debuglevel}"
933	>	deprecation="${build.deprecation}"
934	>	source="7"
935	>	classpath=""
936	>	includeAntRuntime="false"
937	>	includeJavaRuntime="false"
938	>	executable="${javac7}"
939	>	fork="true">
940	>
941	>	<include name="jsr166e/**/*.java"/>
942	>	<compilerarg line="${build.args}"/>
943	>	<compilerarg value="-XDignore.symbol.file=true"/>
944	>	<compilerarg value="-Xlint:all"/>
945	>
946	>	</javac>
947	>
948	>	</target>
949	>
950	>
951	>
952	>	<target name="jsr166ejar"
953	>	depends="jsr166ecompile"
954	>	description="Builds library jar from compiled sources">
955	>
956	>	<jar destfile="${jsr166e.jar}" index="true">
957	>	<fileset dir="${build.jsr166e.dir}"/>
958	>	</jar>
959	>
960	>	</target>
961	>
962	>
963	>
964	>	<target name="jsr166edocs"
965	>	description="Builds javadocs to build dir">
966	>
967	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
968	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
969	>
970	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
971	>	packagenames="jsr166e.*"
972	>	link="${jdkapidocs.url}"
973	>	source="7"
974	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
975	>	executable="${javadoc7}"
976	>	additionalparam="-XDignore.symbol.file=true" >
977		</javadoc>
978
979		</target>
980
784	–	<target name="extra166ydist-jar"
785	–	depends="extra166yclean, extra166yjar">
981
982	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
982	>	<target name="jsr166edist"
983	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
984	>	description="Puts all distributable products in single hierarchy"/>
985	>
986	>
987	>
988	>	<target name="jsr166eclean"
989	>	description="Removes all jsr166e build products">
990	>
991	>	<delete dir="${build.jsr166e.dir}"/>
992	>
993	>	</target>
994	>
995	>
996	>	<target name="jsr166edist-clean"
997	>	description="Removes all build and distribution products">
998	>
999	>	</target>
1000	>
1001	>	<target name="jsr166edist-jar"
1002	>	depends="jsr166eclean, jsr166ejar">
1003	>
1004	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1005
1006		</target>
1007

Diff Legend

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