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.98 by jsr166, Wed Jan 16 07:39:51 2013 UTC vs.
Revision 1.141 by jsr166, Tue Jun 18 19:03:50 2013 UTC

#	Line 16 | Line 16
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.
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	>	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 30 | Line 38
38
39
40		<!-- Compilation options -->
41	<	<property name="build.sourcelevel"    value="1.6"/>
41	>	<property name="build.sourcelevel"    value="6"/>
42		<property name="build.debug"          value="true"/>
43		<property name="build.debuglevel"     value="source,lines,vars"/>
44		<property name="build.deprecation"    value="false"/>
45	+	<property name="build.javadoc.access" value="protected"/>
46	+
47	+	<!-- Tck options; see JSR166TestCase.java -->
48	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49	+	<property name="jsr166.profileTests"     value="false"/>
50	+	<property name="jsr166.profileThreshold" value="100"/>
51	+	<property name="jsr166.runsPerTest"      value="1"/>
52	+	<!-- Allow running an individual tck test class -->
53	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
56		<!-- Build locations -->
57		<property name="build.dir"                   location="build"/>
58		<property name="build.classes.dir"           location="${build.dir}/classes"/>
59		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
60		<property name="build.loops.dir"             location="${build.dir}/loops"/>
43	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
44	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
61		<property name="build.reports.dir"           location="${build.dir}/reports"/>
62
63	<	<property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
64	<	<property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
65	<	<property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
66	<	<property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>
51	<	<property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
63	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
67
68		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
54	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
55	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
56	–
69		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
58	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
59	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
60	–
70		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
63	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
64	–
71		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
66	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
67	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
72
73	<	<!-- JDK binary locations -->
73	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77	>
78	>	<!-- JDK locations -->
79		<property name="jdks.home"  location="${user.home}/jdk"/>
80
81		<macrodef name="defjdklocations">
82		<attribute name="v"/>
83		<sequential>
84	<	<property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
85	<	<property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
86	<	<property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
87	<	<property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
88	<	<property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
89	<	<property name="bootclasspath@{v}"
90	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
84	>	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
85	>	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
86	>	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
87	>	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
88	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
89	>	<local name="boot.jar.dir"/>
90	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91	>	<path id="bootclasspath@{v}">
92	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
93	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
94	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
95	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
96	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
97	>	</path>
98	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
99		</sequential>
100		</macrodef>
101
102	<	<defjdklocations v="6"/>
103	<	<defjdklocations v="7"/>
104	<	<defjdklocations v="8"/>
88	<
89	<	<macrodef name="run-tck-tests">
90	<	<attribute name="jvm"/>
91	<	<attribute name="tck.classes"/>
92	<	<attribute name="product.jar" default="${product.jar}"/>
93	<	<attribute name="jvmflags" default=""/>
102	>	<macrodef name="mirror-dir">
103	>	<attribute name="src"/>
104	>	<attribute name="dst"/>
105		<sequential>
106	<	<java classname="JSR166TestCase"
107	<	jvm="@{jvm}" fork="true">
108	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
109	<	<jvmarg line="@{jvmflags}"/>
110	<	<classpath>
100	<	<pathelement location="${junit.jar}"/>
101	<	<pathelement location="@{tck.classes}"/>
102	<	</classpath>
103	<	</java>
106	>	<delete dir="@{dst}"/>
107	>	<mkdir dir="@{dst}"/>
108	>	<copy todir="@{dst}" preservelastmodified="true">
109	>	<fileset dir="@{src}"/>
110	>	</copy>
111		</sequential>
112		</macrodef>
113
114	+	<defjdklocations v="6"/>
115	+	<defjdklocations v="7"/>
116	+	<defjdklocations v="8"/>
117	+
118		<!-- Source locations -->
119		<property name="src.dir"              location="${basedir}/src/main"/>
120		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 113 | Line 124
124		<property name="lib.dir"              location="${basedir}/lib"/>
125		<property name="dist.dir"             location="${basedir}/dist"/>
126		<property name="topsrc.dir"           location="${basedir}/src"/>
127	<	<property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
127	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
128		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
129		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
130		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
121	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
132
133	<	<!-- Distribution locations -->
134	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
135	<	<property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
136	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
137	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
138	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
139	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
133	>	<!-- Javadoc locations -->
134	>	<property name="docs.dir"          location="${build.dir}/docs"/>
135	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140	>
141	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147
148		<!-- Jar locations -->
149	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
150	<	<property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
151	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
152	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
153	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
154	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
155	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
139	<
140	<	<!-- Bootclasspath argument -->
141	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
149	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
150	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
151	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
155	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
156
157		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
158		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
#	Line 146 | Line 160
160		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161
162		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163	<	<!-- The below does not yet exist as of 2012-11 -->
163	>	<!-- The below does not yet exist as of 2013-01 -->
164		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165	+
166	+	<!-- Default jdk api doc location (latest stable release seems best) -->
167		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
168
169	+	<!-- Define the "jtreg" task -->
170	+	<!-- See the docs in "jtreg -onlineHelp" -->
171	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
172	+	classpath="${lib.dir}/jtreg.jar" />
173	+
174		<!-- Test classpath -->
175		<path id="test.classpath">
176		<pathelement location="${build.testcases.dir}"/>
177		<pathelement location="${junit.jar}"/>
178		</path>
179
180	+	<macrodef name="run-tck-tests">
181	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
182	+	<attribute name="target"/>
183	+	<attribute name="compile-target" default="@{target}"/>
184	+	<attribute name="workdir"/>
185	+	<attribute name="classes"/>
186	+	<attribute name="jvmflags" default=""/>
187	+	<element name="javac-elements" optional="true"/>
188	+	<sequential>
189	+
190	+	<mkdir dir="@{workdir}/tck-classes"/>
191	+
192	+	<javac srcdir="@{tck.src.dir}"
193	+	destdir="@{workdir}/tck-classes"
194	+	debug="${build.debug}"
195	+	debuglevel="${build.debuglevel}"
196	+	deprecation="${build.deprecation}"
197	+	source="@{compile-target}"
198	+	target="@{compile-target}"
199	+	classpath="${junit.jar}"
200	+	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201	+	includeAntRuntime="false"
202	+	includeJavaRuntime="false"
203	+	executable="${javac@{compile-target}}"
204	+	fork="true">
205	+
206	+	<include name="*.java"/>
207	+	<compilerarg value="-XDignore.symbol.file=true"/>
208	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209	+	<compilerarg line="${build.args}"/>
210	+	<javac-elements/>
211	+
212	+	</javac>
213	+
214	+	<java classname="${jsr166.tckTestClass}"
215	+	failonerror="true"
216	+	jvm="${java@{target}}"
217	+	fork="true">
218	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
219	+	<jvmarg line="@{jvmflags}"/>
220	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223	+	<classpath>
224	+	<pathelement location="${junit.jar}"/>
225	+	<pathelement location="@{workdir}/tck-classes"/>
226	+	</classpath>
227	+	</java>
228	+
229	+	</sequential>
230	+	</macrodef>
231	+
232	+	<macrodef name="run-jtreg-tests">
233	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234	+	<attribute name="source" default="7"/>
235	+	<attribute name="target"/>
236	+	<attribute name="workdir"/>
237	+	<attribute name="classes"/>
238	+	<attribute name="jtregflags" default=""/>
239	+	<sequential>
240	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
241	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
242	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
243	+	<mkdir dir="@{workdir}/JTreport"/>
244	+	<jtreg dir="@{jtreg.src.dir}"
245	+	jdk="${jdk@{target}.home}"
246	+	workDir="@{workdir}/JTwork"
247	+	reportDir="@{workdir}/JTreport">
248	+
249	+	<arg value="-Xbootclasspath/p:@{classes}"/>
250	+	<arg value="-agentvm"/>
251	+	<arg value="-v:nopass,fail"/>
252	+	<arg value="-vmoptions:-esa -ea"/>
253	+	<arg value="-automatic"/>
254	+	<arg value="-k:!ignore"/>
255	+	<arg line="@{jtregflags}"/>
256	+	</jtreg>
257	+	</sequential>
258	+	</macrodef>
259	+
260		<!-- ALoops classpath -->
261		<path id="loops.classpath">
262		<pathelement location="${build.loops.dir}"/>
263		</path>
264
265	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
266	+	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
267	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268
269		<!-- Main targets -->
270
271		<target name="dists"
272	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
272	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
273		description="Builds all public jars and docs"/>
274
275		<target name="compile"
276	<	depends="init, configure-compiler"
277	<	description="Compiles main sources to build folder">
276	>	depends="configure-compiler"
277	>	description="Compiles src/main sources to build dir">
278
279		<mkdir dir="${build.classes.dir}"/>
280
281		<javac srcdir="${src.dir}"
282	<	destdir="${build.classes.dir}"
283	<	debug="${build.debug}"
284	<	debuglevel="${build.debuglevel}"
285	<	deprecation="${build.deprecation}"
286	<	source="${build.sourcelevel}"
287	<	fork="true">
282	>	destdir="${build.classes.dir}"
283	>	debug="${build.debug}"
284	>	debuglevel="${build.debuglevel}"
285	>	deprecation="${build.deprecation}"
286	>	classpath=""
287	>	includeAntRuntime="false"
288	>	includeJavaRuntime="false"
289	>	executable="${javac8}"
290	>	fork="true">
291
292		<include name="**/*.java"/>
293	+	<compilerarg value="-Xprefer:source"/>
294		<compilerarg value="-XDignore.symbol.file=true"/>
295	<
188	<	<!--
189	<	<exclude name="java/lang/**"/>
295	>	<compilerarg value="-Xlint:all"/>
296		<compilerarg line="${build.args}"/>
191	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
192	–	-->
297
298		</javac>
195	–
299		</target>
300
301
199	–
302		<target name="jar"
303		depends="compile"
304		description="Builds library jar from compiled sources">
305
204	–	<mkdir dir="${build.lib.dir}"/>
205	–
306		<jar destfile="${product.jar}">
307		<fileset dir="${build.classes.dir}"/>
308		</jar>
209	–
309		</target>
310
311
213	–
312		<target name="test"
313	<	depends="init, configure-tests, report-tests"
313	>	depends="configure-tests, report-tests"
314		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315
316
219	–
317		<target name="docs"
318	<	description="Builds javadocs with custom tags to build folder">
318	>	description="Builds javadocs for src/main to dist dir">
319
320	<	<delete dir="${build.javadocs.dir}"/>
321	<	<mkdir dir="${build.javadocs.dir}"/>
320	>	<delete dir="${docs.dir}"/>
321	>	<mkdir dir="${docs.dir}"/>
322
323		<!-- the packagenames="none" hack below prevents scanning the -->
324		<!-- sourcepath for packages -->
325
326	<	<javadoc destdir="${build.javadocs.dir}"
326	>	<javadoc destdir="${docs.dir}"
327		packagenames="none"
328	<	link="${jdkapidocs.url}"
328	>	link="${jdkapi8docs.url}"
329		overview="${src.dir}/intro.html"
330	<	sourcepath="${src.dir}:${jdksrc.dir}"
331	<	additionalparam="-XDignore.symbol.file=true" >
330	>	access="${build.javadoc.access}"
331	>	sourcepath="${src.dir}:${jdk8src.dir}"
332	>	classpath=""
333	>	executable="${javadoc8}">
334		<fileset dir="${src.dir}" defaultexcludes="yes">
335		<include name="**/*.java"/>
336		</fileset>
337	+	<arg value="-XDignore.symbol.file=true"/>
338	+	<arg value="-tag"/>
339	+	<arg value="${javadoc.jls.option}"/>
340		</javadoc>
239	–
341		</target>
342
343
243	–
344		<target name="dist"
345	<	depends="init, dist-clean, dist-jar, dist-docs"
345	>	depends="dist-clean, dist-jar, dist-docs"
346		description="Puts all distributable products in single hierarchy"/>
347
348
#	Line 261 | Line 361
361		<exclude name="**/SyntaxTest.java"/>
362		<exclude name="**/SuperfluousAbstract.java"/>
363		</jar>
264	–
364		</target>
365
366
268	–
367		<target name="clean"
368		description="Removes all build products">
369
370		<delete dir="${build.dir}"/>
273	–	<delete dir="${build.classes.dir}"/>
274	–	<delete dir="${build.lib.dir}"/>
371
372		</target>
373
374
279	–
375		<target name="dist-clean"
376		description="Removes all build and distribution products">
377
#	Line 285 | Line 380
380		</target>
381
382
288	–
289	–	<target name="dist-docs"
290	–	description="Builds javadocs without custom tags to dist folder">
291	–
292	–	<delete dir="${dist.javadocs.dir}"/>
293	–	<mkdir dir="${dist.javadocs.dir}"/>
294	–
295	–	<!-- the packagenames="none" hack below prevents scanning the -->
296	–	<!-- sourcepath for packages -->
297	–
298	–	<javadoc destdir="${dist.javadocs.dir}"
299	–	packagenames="none"
300	–	link="${jdkapidocs.url}"
301	–	overview="${src.dir}/intro.html"
302	–	sourcepath="${src.dir}:${jdksrc.dir}"
303	–	additionalparam="-XDignore.symbol.file=true" >
304	–	<fileset dir="${src.dir}" defaultexcludes="yes">
305	–	<include name="**/*.java"/>
306	–	</fileset>
307	–	</javadoc>
308	–
309	–	</target>
310	–
311	–
312	–
383		<!-- Internal targets -->
384
385
316	–	<target name="init">
317	–
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	–
325	–
386		<target name="dist-jar"
387		depends="clean, jar">
328	–
388		<copy file="${product.jar}" todir="${dist.dir}"/>
389	+	</target>
390
391	+	<target name="dist-docs"
392	+	depends="clean, docs">
393	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
394		</target>
395
396
#	Line 337 | Line 400
400		<mkdir dir="${build.testcases.dir}"/>
401
402		<javac srcdir="${tck.src.dir}"
403	<	destdir="${build.testcases.dir}"
404	<	debug="${build.debug}"
405	<	debuglevel="${build.debuglevel}"
406	<	deprecation="${build.deprecation}"
407	<	source="${build.sourcelevel}"
408	<	fork="true">
403	>	destdir="${build.testcases.dir}"
404	>	debug="${build.debug}"
405	>	debuglevel="${build.debuglevel}"
406	>	deprecation="${build.deprecation}"
407	>	source="6"
408	>	classpath="${junit.jar}"
409	>	bootclasspath="@{product.jar}:${bootclasspath6}"
410	>	includeAntRuntime="false"
411	>	includeJavaRuntime="false"
412	>	executable="${javac8}"
413	>	fork="true">
414
415	<	<compilerarg value="${bootclasspath.args}"/>
348	<	<compilerarg line="${build.args}"/>
415	>	<include name="**/*.java"/>
416		<compilerarg value="-XDignore.symbol.file=true"/>
417	<
418	<	<classpath refid="test.classpath"/>
417	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418	>	<compilerarg line="${build.args}"/>
419
420		</javac>
421
422		<javac srcdir="${test.src.dir}"
423	<	destdir="${build.testcases.dir}"
424	<	debug="${build.debug}"
425	<	debuglevel="${build.debuglevel}"
426	<	deprecation="${build.deprecation}"
427	<	source="${build.sourcelevel}"
428	<	fork="true">
429	<
430	<	<include name="jsr166/test/**"/>
423	>	destdir="${build.testcases.dir}"
424	>	debug="${build.debug}"
425	>	debuglevel="${build.debuglevel}"
426	>	deprecation="${build.deprecation}"
427	>	source="6"
428	>	classpath=""
429	>	bootclasspath="@{product.jar}:${bootclasspath6}"
430	>	includeAntRuntime="false"
431	>	includeJavaRuntime="false"
432	>	executable="${javac8}"
433	>	fork="true">
434
435	<	<compilerarg value="${bootclasspath.args}"/>
366	<	<compilerarg line="${build.args}"/>
435	>	<include name="jsr166/test/**/*.java"/>
436		<compilerarg value="-XDignore.symbol.file=true"/>
437	<
438	<	<classpath refid="test.classpath"/>
437	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438	>	<compilerarg line="${build.args}"/>
439
440		</javac>
441
#	Line 379 | Line 448
448		source="${build.sourcelevel}"
449		fork="true">
450
451	<	<compilerarg value="${bootclasspath.args}"/>
383	<	<compilerarg line="${build.args}"/>
451	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452		<compilerarg value="-XDignore.symbol.file=true"/>
453	<
386	<	<classpath refid="test.classpath"/>
453	>	<compilerarg line="${build.args}"/>
454
455		</javac>
456		-->
457
458		</target>
459
460	+	<target name="test-tck"
461	+	depends="jar"
462	+	description="Runs tck tests for main directly">
463	+
464	+	<run-tck-tests
465	+	target="8"
466	+	workdir="${build.dir}"
467	+	classes="${product.jar}"/>
468	+	</target>
469	+
470	+	<target name="test-jtreg"
471	+	depends="jar"
472	+	description="Runs jtreg tests for main using the jtreg ant task">
473	+	<run-jtreg-tests
474	+	target="8"
475	+	workdir="${build.dir}"
476	+	classes="${product.jar}"/>
477	+	</target>
478	+
479	+	<target name="test-ng"
480	+	depends="test-tck, test-jtreg"
481	+	description="Runs tck and jtreg tests for main">
482	+	</target>
483
484		<target name="run-tests"
485		depends="compile-tests">
#	Line 404 | Line 494
494		errorProperty="junit.failed"
495		failureProperty="junit.failed"
496		dir="${build.reports.dir}"
497	+	jvm="${java8}"
498		fork="true">
499
500	<	<jvmarg value="${bootclasspath.args}"/>
500	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501		<jvmarg value="-server"/>
502		<jvmarg value="-showversion"/>
503
#	Line 507 | Line 598
598		<!-- Various demos and test programs -->
599
600
601	<	<target name="loops" depends="init, configure-compiler"
601	>	<target name="loops" depends="configure-compiler"
602		description="Benchmark from Doug Lea's AQS paper">
603
604		<mkdir dir="${build.loops.dir}"/>
#	Line 533 | Line 624
624		</target>
625
626
627	<	<!-- jdk7 -->
537	<
627	>	<!-- jsr166 4jdk7 -->
628
629	<	<target name="jdk7compile"
629	>	<target name="4jdk7compile"
630		depends="configure-compiler"
631	<	description="Compiles src/jdk7 sources">
631	>	description="Compiles src/jdk7 sources, targeting jdk7">
632
633	<	<mkdir dir="${build.jdk7.classes.dir}"/>
633	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
634
635	<	<javac srcdir="${jdk7src.dir}"
636	<	destdir="${build.jdk7.classes.dir}"
635	>	<javac srcdir="${4jdk7src.dir}"
636	>	destdir="${build.4jdk7.classes.dir}"
637		debug="${build.debug}"
638		debuglevel="${build.debuglevel}"
639		deprecation="${build.deprecation}"
640	<	source="1.6"
640	>	source="6"
641		classpath=""
642		bootclasspath="${bootclasspath6}"
643		includeAntRuntime="false"
#	Line 556 | Line 646
646		fork="true">
647
648		<include name="**/*.java"/>
649	<	<compilerarg line="${build.args}"/>
649	>	<compilerarg value="-Xprefer:source"/>
650		<compilerarg value="-XDignore.symbol.file=true"/>
651		<compilerarg value="-Xlint:all"/>
652	+	<compilerarg line="${build.args}"/>
653
654		</javac>
655	+	</target>
656
565	–	<mkdir dir="${build.jdk7.lib.dir}"/>
566	–
567	–	<jar destfile="${jdk7product.jar}" index="true">
568	–	<fileset dir="${build.jdk7.classes.dir}"/>
569	–	</jar>
570	–
571	–	<mkdir dir="${build.jdk7.tck.classes.dir}"/>
572	–
573	–	<javac srcdir="${tck.src.dir}"
574	–	destdir="${build.jdk7.tck.classes.dir}"
575	–	debug="${build.debug}"
576	–	debuglevel="${build.debuglevel}"
577	–	deprecation="${build.deprecation}"
578	–	source="1.6"
579	–	classpath="${junit.jar}"
580	–	bootclasspath="${jdk7product.jar}:${bootclasspath6}"
581	–	includeAntRuntime="false"
582	–	includeJavaRuntime="false"
583	–	executable="${javac7}"
584	–	fork="true">
657
658	<	<include name="**/*.java"/>
659	<	<compilerarg line="${build.args}"/>
660	<	<compilerarg value="-XDignore.symbol.file=true"/>
589	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
658	>	<target name="4jdk7jar"
659	>	depends="4jdk7compile"
660	>	description="Builds library jar from compiled sources">
661
662	<	</javac>
662	>	<jar destfile="${4jdk7product.jar}">
663	>	<fileset dir="${build.4jdk7.classes.dir}"/>
664	>	</jar>
665
666		</target>
667
668
669	<	<target name="run-jdk7-tck-tests"
670	<	depends="jdk7compile"
671	<	description="Runs tck tests for jsr166-jdk7 directly">
669	>	<target name="4jdk7-test-tck"
670	>	depends="4jdk7jar"
671	>	description="Runs tck tests for jsr166-4jdk7 directly">
672	>
673		<run-tck-tests
674	<	jvm="${java7}"
675	<	tck.classes="${build.jdk7.tck.classes.dir}"
676	<	product.jar="${jdk7product.jar}"/>
674	>	target="7"
675	>	workdir="${build.4jdk7.dir}"
676	>	classes="${4jdk7product.jar}">
677	>	<javac-elements>
678	>	<!-- JDK8+ test classes -->
679	>	<exclude name="*8Test.java"/>
680	>	<exclude name="DoubleAccumulatorTest.java"/>
681	>	<exclude name="DoubleAdderTest.java"/>
682	>	<exclude name="LongAccumulatorTest.java"/>
683	>	<exclude name="LongAdderTest.java"/>
684	>	<exclude name="CompletableFutureTest.java"/>
685	>	<exclude name="StampedLockTest.java"/>
686	>	</javac-elements>
687	>	</run-tck-tests>
688		</target>
689
690
691	<	<target name="run-jdk7-tck-tests-via-junit-task"
692	<	depends="jdk7compile">
691	>	<target name="4jdk7-test-tck-junit"
692	>	depends="4jdk7compile"
693	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
694
695		<junit printsummary="true"
696		showoutput="true"
#	Line 614 | Line 700
700		jvm="${java7}"
701		fork="true">
702
703	<	<jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>
703	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
704		<jvmarg value="-server"/>
705
706		<classpath>
707		<pathelement location="${junit.jar}"/>
708	<	<pathelement location="${build.jdk7.tck.classes.dir}"/>
708	>	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
709		</classpath>
710
711		<formatter type="brief"/>
712
713	<	<test name="JSR166TestCase" haltonfailure="no">
713	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
714		</test>
715
716		</junit>
717		</target>
718
719	+	<target name="4jdk7-test-jtreg"
720	+	depends="4jdk7jar"
721	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722	+	<run-jtreg-tests
723	+	target="7"
724	+	workdir="${build.4jdk7.dir}"
725	+	classes="${4jdk7product.jar}"
726	+	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
727	+	</target>
728	+
729
730	<	<target name="jdk7docs"
731	<	description="Builds javadocs with custom tags to build folder">
730	>	<target name="4jdk7-test"
731	>	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
732	>	description="Runs tck and jtreg tests for jsr166-4jdk7">
733	>	</target>
734	>
735	>
736	>	<target name="4jdk7docs"
737	>	description="Builds javadocs for src/jdk7 to dist dir">
738
739	<	<delete dir="${build.jdk7.docs.dir}"/>
740	<	<mkdir dir="${build.jdk7.docs.dir}"/>
739	>	<delete dir="${4jdk7docs.dir}"/>
740	>	<mkdir dir="${4jdk7docs.dir}"/>
741
742	<	<javadoc destdir="${build.jdk7.docs.dir}"
742	>	<javadoc destdir="${4jdk7docs.dir}"
743		packagenames="none"
744		link="${jdkapi7docs.url}"
745	<	overview="${jdk7src.dir}/intro.html"
746	<	sourcepath="${jdk7src.dir}"
747	<	bootclasspath="${bootclasspath6}"
745	>	overview="${4jdk7src.dir}/intro.html"
746	>	access="${build.javadoc.access}"
747	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
748		classpath=""
749	<	source="1.6"
750	<	executable="${javadoc7}"
649	<	additionalparam="-XDignore.symbol.file=true" >
650	<	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
749	>	executable="${javadoc7}">
750	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
751		<include name="**/*.java"/>
752		</fileset>
753	+	<arg value="-XDignore.symbol.file=true"/>
754		</javadoc>
654	–
755		</target>
756
757
758	<	<target name="jdk7dist"
759	<	depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
758	>	<target name="4jdk7dist"
759	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
760		description="Puts all distributable products in single hierarchy"/>
761
762
763	+	<target name="4jdk7clean"
764	+	description="Removes all 4jdk7 build products">
765
766	<	<target name="jdk7clean"
665	<	description="Removes all build products">
666	<
667	<	<delete dir="${build.jdk7.dir}"/>
766	>	<delete dir="${build.4jdk7.dir}"/>
767
768		</target>
769
770
771	<
673	<	<target name="jdk7dist-clean"
771	>	<target name="4jdk7dist-clean"
772		description="Removes all build and distribution products">
773
774		</target>
775
776	<	<target name="jdk7dist-docs"
777	<	description="Builds javadocs without custom tags to dist folder">
778	<
681	<	<delete dir="${dist.jdk7.docs.dir}"/>
682	<	<mkdir dir="${dist.jdk7.docs.dir}"/>
683	<
684	<	<javadoc destdir="${dist.jdk7.docs.dir}"
685	<	packagenames="none"
686	<	link="${jdkapi7docs.url}"
687	<	overview="${jdk7src.dir}/intro.html"
688	<	sourcepath="${jdk7src.dir}"
689	<	classpath=""
690	<	executable="${javadoc7}"
691	<	bootclasspath="${bootclasspath6}"
692	<	source="1.6">
693	<	<arg value="-XDignore.symbol.file=true"/>
694	<	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
695	<	<include name="**/*.java"/>
696	<	</fileset>
697	<	</javadoc>
698	<
776	>	<target name="4jdk7dist-jar"
777	>	depends="4jdk7clean, 4jdk7jar">
778	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
779		</target>
780
701	–	<target name="jdk7dist-jar"
702	–	depends="jdk7clean, jdk7compile">
703	–
704	–	<copy file="${jdk7product.jar}" todir="${dist.dir}"/>
781
782	+	<target name="4jdk7dist-docs"
783	+	depends="4jdk7clean, 4jdk7docs">
784	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
785		</target>
786
708	–	<!-- jsr166x -->
787
788	+	<!-- jsr166x -->
789
790		<target name="jsr166xcompile"
791	<	depends="init, configure-compiler"
792	<	description="Compiles jsr166x sources">
791	>	depends="configure-compiler"
792	>	description="Compiles jsr166x sources to build dir">
793
794	<	<mkdir dir="${build.jsr166x.dir}"/>
794	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
795
796	<	<javac srcdir="${jsr166xsrc.dir}"
797	<	destdir="${build.jsr166x.dir}"
798	<	debug="${build.debug}"
799	<	debuglevel="${build.debuglevel}"
800	<	deprecation="${build.deprecation}"
801	<	source="${build.sourcelevel}"
802	<	fork="true">
796	>	<javac srcdir="${topsrc.dir}"
797	>	destdir="${build.jsr166x.classes.dir}"
798	>	debug="${build.debug}"
799	>	debuglevel="${build.debuglevel}"
800	>	deprecation="${build.deprecation}"
801	>	classpath=""
802	>	bootclasspath="${bootclasspath6}"
803	>	source="5"
804	>	includeAntRuntime="false"
805	>	includeJavaRuntime="false"
806	>	executable="${javac7}"
807	>	fork="true">
808
809	<	<include name="**/*.java"/>
726	<	<compilerarg line="${build.args}"/>
809	>	<include name="jsr166x/**/*.java"/>
810		<compilerarg value="-XDignore.symbol.file=true"/>
811	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
812	+	<compilerarg line="${build.args}"/>
813
814		</javac>
730	–
815		</target>
816
817
734	–
818		<target name="jsr166xjar"
819		depends="jsr166xcompile"
820		description="Builds library jar from compiled sources">
821
822	<	<mkdir dir="${build.jsr166xlib.dir}"/>
823	<
741	<	<jar destfile="${jsr166xproduct.jar}">
742	<	<fileset dir="${build.jsr166x.dir}"/>
822	>	<jar destfile="${jsr166x.jar}">
823	>	<fileset dir="${build.jsr166x.classes.dir}"/>
824		</jar>
825
826		</target>
827
828
748	–
829		<target name="jsr166xdocs"
830	<	description="Builds javadocs with custom tags to build folder">
830	>	description="Builds javadocs to dist dir">
831
832	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
833	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
832	>	<delete dir="${jsr166xdocs.dir}"/>
833	>	<mkdir dir="${jsr166xdocs.dir}"/>
834
835	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
836	<	packagenames="jsr166x"
835	>	<javadoc destdir="${jsr166xdocs.dir}"
836	>	packagenames="jsr166x.*"
837		link="${jdkapidocs.url}"
838	<	source="${build.sourcelevel}"
839	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
840	<	additionalparam="-XDignore.symbol.file=true" />
838	>	access="${build.javadoc.access}"
839	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
840	>	bootclasspath="${bootclasspath6}"
841	>	source="5"
842	>	executable="${javadoc7}">
843	>	<arg value="-XDignore.symbol.file=true"/>
844
845	+	</javadoc>
846		</target>
847
848
849		<target name="jsr166xdist"
850	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
850	>	depends="jsr166xdist-jar, jsr166xdist-docs"
851		description="Puts all distributable products in single hierarchy"/>
852
853
770	–
854		<target name="jsr166xclean"
855	<	description="Removes all build products">
855	>	description="Removes all jsr166x build products">
856
857		<delete dir="${build.jsr166x.dir}"/>
775	–	<delete dir="${build.jsr166xlib.dir}"/>
858
859		</target>
860
861
780	–
862		<target name="jsr166xdist-clean"
863		description="Removes all build and distribution products">
864
865		</target>
866
867
787	–
788	–	<target name="jsr166xdist-docs"
789	–	description="Builds javadocs without custom tags to dist folder">
790	–
791	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
792	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
793	–
794	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
795	–	packagenames="jsr166x"
796	–	link="${jdkapidocs.url}"
797	–	source="${build.sourcelevel}"
798	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
799	–	additionalparam="-XDignore.symbol.file=true" />
800	–
801	–	</target>
802	–
868		<target name="jsr166xdist-jar"
869		depends="jsr166xclean, jsr166xjar">
870	+	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
871	+	</target>
872
873	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
874	<
873	>	<target name="jsr166xdist-docs"
874	>	depends="jsr166xclean, jsr166xdocs">
875	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
876		</target>
877
878		<!-- jsr166y -->
879
880
881		<target name="jsr166ycompile"
882	<	depends="init, configure-compiler"
882	>	depends="configure-compiler"
883		description="Compiles jsr166y sources">
884
885	<	<mkdir dir="${build.jsr166y.dir}"/>
885	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
886
887	<	<javac srcdir="${jsr166ysrc.dir}"
888	<	destdir="${build.jsr166y.dir}"
889	<	debug="${build.debug}"
890	<	debuglevel="${build.debuglevel}"
891	<	deprecation="${build.deprecation}"
892	<	source="${build.sourcelevel}"
893	<	fork="true">
887	>	<javac srcdir="${topsrc.dir}"
888	>	destdir="${build.jsr166y.classes.dir}"
889	>	debug="${build.debug}"
890	>	debuglevel="${build.debuglevel}"
891	>	deprecation="${build.deprecation}"
892	>	source="6"
893	>	classpath=""
894	>	bootclasspath="${bootclasspath6}"
895	>	includeAntRuntime="false"
896	>	includeJavaRuntime="false"
897	>	executable="${javac7}"
898	>	fork="true">
899
900	<	<include name="**/*.java"/>
828	<	<compilerarg line="${build.args}"/>
900	>	<include name="jsr166y/**/*.java"/>
901		<compilerarg value="-XDignore.symbol.file=true"/>
902	<	<compilerarg value="${bootclasspath.args}"/>
903	<
832	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
902	>	<compilerarg value="-Xlint:all"/>
903	>	<compilerarg line="${build.args}"/>
904
905		</javac>
835	–
906		</target>
907
908
839	–
909		<target name="jsr166yjar"
910		depends="jsr166ycompile"
911		description="Builds library jar from compiled sources">
912
913	<	<mkdir dir="${build.jsr166ylib.dir}"/>
914	<
846	<	<jar destfile="${jsr166yproduct.jar}" index="true">
847	<	<fileset dir="${build.jsr166y.dir}"/>
913	>	<jar destfile="${jsr166y.jar}" index="true">
914	>	<fileset dir="${build.jsr166y.classes.dir}"/>
915		</jar>
916
917		</target>
918
919
853	–
920		<target name="jsr166ydocs"
921	<	description="Builds javadocs with custom tags to build folder">
921	>	description="Builds javadocs to dist dir">
922
923	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
924	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
923	>	<delete dir="${jsr166ydocs.dir}"/>
924	>	<mkdir dir="${jsr166ydocs.dir}"/>
925
926	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
927	<	packagenames="jsr166y"
926	>	<javadoc destdir="${jsr166ydocs.dir}"
927	>	packagenames="jsr166y.*"
928		link="${jdkapidocs.url}"
929	<	source="${build.sourcelevel}"
930	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
931	<	additionalparam="-XDignore.symbol.file=true" />
929	>	access="${build.javadoc.access}"
930	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
931	>	bootclasspath="${bootclasspath6}"
932	>	source="6"
933	>	executable="${javadoc7}">
934	>	<arg value="-XDignore.symbol.file=true"/>
935
936	+	</javadoc>
937		</target>
938
939
940		<target name="jsr166ydist"
941	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
941	>	depends="jsr166ydist-jar, jsr166ydist-docs"
942		description="Puts all distributable products in single hierarchy"/>
943
944
875	–
945		<target name="jsr166yclean"
946	<	description="Removes all build products">
946	>	description="Removes all jsr166y build products">
947
948		<delete dir="${build.jsr166y.dir}"/>
880	–	<delete dir="${build.jsr166ylib.dir}"/>
949
950		</target>
951
952
885	–
953		<target name="jsr166ydist-clean"
954		description="Removes all build and distribution products">
955
956		</target>
957
891	–	<target name="jsr166ydist-docs"
892	–	description="Builds javadocs without custom tags to dist folder">
893	–
894	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
895	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
896	–
897	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
898	–	packagenames="jsr166y"
899	–	link="${jdkapidocs.url}"
900	–	source="${build.sourcelevel}"
901	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
902	–	additionalparam="-XDignore.symbol.file=true" />
903	–
904	–	</target>
905	–
958		<target name="jsr166ydist-jar"
959		depends="jsr166yclean, jsr166yjar">
960	+	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
961	+	</target>
962
963	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
964	<
963	>	<target name="jsr166ydist-docs"
964	>	depends="jsr166yclean, jsr166ydocs">
965	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
966		</target>
967
968
#	Line 915 | Line 970
970
971
972		<target name="extra166ycompile"
973	<	depends="init, configure-compiler, jsr166ycompile"
973	>	depends="configure-compiler, jsr166yjar"
974		description="Compiles extra166y sources">
975
976	<	<mkdir dir="${build.extra166y.dir}"/>
976	>	<mkdir dir="${build.extra166y.classes.dir}"/>
977
978	<	<javac srcdir="${extra166ysrc.dir}"
979	<	destdir="${build.extra166y.dir}"
980	<	debug="${build.debug}"
981	<	classpath="${jsr166yproduct.jar}"
982	<	debuglevel="${build.debuglevel}"
983	<	deprecation="${build.deprecation}"
984	<	source="${build.sourcelevel}"
985	<	fork="true">
978	>	<javac srcdir="${topsrc.dir}"
979	>	destdir="${build.extra166y.classes.dir}"
980	>	debug="${build.debug}"
981	>	debuglevel="${build.debuglevel}"
982	>	deprecation="${build.deprecation}"
983	>	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
984	>	classpath=""
985	>	source="6"
986	>	includeAntRuntime="false"
987	>	includeJavaRuntime="false"
988	>	executable="${javac7}"
989	>	fork="true">
990
991	<	<include name="**/*.java"/>
933	<	<compilerarg line="${build.args}"/>
991	>	<include name="extra166y/**/*.java"/>
992		<compilerarg value="-XDignore.symbol.file=true"/>
993	<	<compilerarg value="${bootclasspath.args}"/>
994	<
937	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
993	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
994	>	<compilerarg line="${build.args}"/>
995
996		</javac>
940	–
997		</target>
998
999
944	–
1000		<target name="extra166yjar"
1001		depends="extra166ycompile"
1002		description="Builds library jar from compiled sources">
1003
1004	<	<mkdir dir="${build.extra166ylib.dir}"/>
1005	<
951	<	<jar destfile="${extra166yproduct.jar}" index="true">
952	<	<fileset dir="${build.extra166y.dir}"/>
1004	>	<jar destfile="${extra166y.jar}" index="true">
1005	>	<fileset dir="${build.extra166y.classes.dir}"/>
1006		</jar>
1007
1008		</target>
1009
1010
958	–
1011		<target name="extra166ydocs"
1012	<	description="Builds javadocs with custom tags to build folder">
1012	>	description="Builds javadocs to build dir">
1013
1014	<	<delete dir="${build.extra166yjavadocs.dir}"/>
1015	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
1014	>	<delete dir="${extra166ydocs.dir}"/>
1015	>	<mkdir dir="${extra166ydocs.dir}"/>
1016
1017	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
1018	<	packagenames="extra166y"
1017	>	<javadoc destdir="${extra166ydocs.dir}"
1018	>	packagenames="extra166y.*"
1019		link="${jdkapidocs.url}"
1020	<	source="${build.sourcelevel}"
1021	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1022	<	additionalparam="-XDignore.symbol.file=true" />
1020	>	access="${build.javadoc.access}"
1021	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1022	>	bootclasspath="${bootclasspath6}"
1023	>	source="6"
1024	>	executable="${javadoc7}">
1025	>	<arg value="-XDignore.symbol.file=true"/>
1026
1027	+	</javadoc>
1028		</target>
1029
1030
1031		<target name="extra166ydist"
1032	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
1032	>	depends="extra166ydist-jar, extra166ydist-docs"
1033		description="Puts all distributable products in single hierarchy"/>
1034
1035
980	–
1036		<target name="extra166yclean"
1037	<	description="Removes all build products">
1037	>	description="Removes all extra166y build products">
1038
1039		<delete dir="${build.extra166y.dir}"/>
985	–	<delete dir="${build.extra166ylib.dir}"/>
1040
1041		</target>
1042
1043
990	–
1044		<target name="extra166ydist-clean"
1045		description="Removes all build and distribution products">
1046
1047		</target>
1048
996	–	<target name="extra166ydist-docs"
997	–	description="Builds javadocs without custom tags to dist folder">
998	–
999	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
1000	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
1001	–
1002	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
1003	–	packagenames="extra166y"
1004	–	link="${jdkapidocs.url}"
1005	–	source="${build.sourcelevel}"
1006	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1007	–	additionalparam="-XDignore.symbol.file=true" />
1008	–
1009	–	</target>
1010	–
1049		<target name="extra166ydist-jar"
1050		depends="extra166yclean, extra166yjar">
1051	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1052	+	</target>
1053
1054	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1055	<
1054	>	<target name="extra166ydist-docs"
1055	>	depends="extra166yclean, extra166ydocs">
1056	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1057		</target>
1058
1059		<!-- jsr166e -->
#	Line 1021 | Line 1062
1062		depends="configure-compiler"
1063		description="Compiles jsr166e sources">
1064
1065	<	<mkdir dir="${build.jsr166e.dir}"/>
1065	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1066
1067		<javac srcdir="${topsrc.dir}"
1068	<	destdir="${build.jsr166e.dir}"
1068	>	destdir="${build.jsr166e.classes.dir}"
1069		debug="${build.debug}"
1070		debuglevel="${build.debuglevel}"
1071		deprecation="${build.deprecation}"
1072	<	source="1.7"
1072	>	source="7"
1073		classpath=""
1074		includeAntRuntime="false"
1075		includeJavaRuntime="false"
#	Line 1036 | Line 1077
1077		fork="true">
1078
1079		<include name="jsr166e/**/*.java"/>
1039	–	<compilerarg line="${build.args}"/>
1080		<compilerarg value="-XDignore.symbol.file=true"/>
1081		<compilerarg value="-Xlint:all"/>
1082	+	<compilerarg line="${build.args}"/>
1083
1084		</javac>
1044	–
1085		</target>
1086
1087
1048	–
1088		<target name="jsr166ejar"
1089		depends="jsr166ecompile"
1090		description="Builds library jar from compiled sources">
1091
1092	<	<mkdir dir="${build.jsr166elib.dir}"/>
1093	<
1055	<	<jar destfile="${jsr166eproduct.jar}" index="true">
1056	<	<fileset dir="${build.jsr166e.dir}"/>
1092	>	<jar destfile="${jsr166e.jar}" index="true">
1093	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1094		</jar>
1095
1096		</target>
1097
1098
1062	–
1099		<target name="jsr166edocs"
1100	<	description="Builds javadocs with custom tags to build folder">
1100	>	description="Builds javadocs to build dir">
1101
1102	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
1103	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1102	>	<delete dir="${jsr166edocs.dir}"/>
1103	>	<mkdir dir="${jsr166edocs.dir}"/>
1104	>
1105	>	<javadoc destdir="${jsr166edocs.dir}"
1106	>	packagenames="jsr166e.*"
1107	>	link="${jdkapidocs.url}"
1108	>	access="${build.javadoc.access}"
1109	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1110	>	source="7"
1111	>	executable="${javadoc7}">
1112	>	<arg value="-XDignore.symbol.file=true"/>
1113
1069	–	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1070	–	packagenames="jsr166e,jsr166e.extra"
1071	–	link="${jdkapi7docs.url}"
1072	–	source="1.7"
1073	–	sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
1074	–	executable="${javadoc7}"
1075	–	additionalparam="-XDignore.symbol.file=true" >
1076	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1077	–	<include name="jsr166e/**/*.java"/>
1078	–	</fileset>
1114		</javadoc>
1115	+	</target>
1116
1117	+
1118	+	<target name="jsr166e-test-tck"
1119	+	depends="jsr166ejar"
1120	+	description="Runs tck tests for jsr166e">
1121	+
1122	+	<run-tck-tests
1123	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1124	+	target="7"
1125	+	workdir="${build.jsr166e.dir}"
1126	+	classes="${jsr166e.jar}"/>
1127		</target>
1128
1129
1130		<target name="jsr166edist"
1131	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1131	>	depends="jsr166edist-jar, jsr166edist-docs"
1132		description="Puts all distributable products in single hierarchy"/>
1133
1134
1089	–
1135		<target name="jsr166eclean"
1136	<	description="Removes all build products">
1092	<
1136	>	description="Removes all jsr166e build products">
1137		<delete dir="${build.jsr166e.dir}"/>
1094	–	<delete dir="${build.jsr166elib.dir}"/>
1095	–
1138		</target>
1139
1140
1099	–
1141		<target name="jsr166edist-clean"
1142		description="Removes all build and distribution products">
1143
1144		</target>
1145
1146	<	<target name="jsr166edist-docs"
1147	<	description="Builds javadocs without custom tags to dist folder">
1148	<
1149	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1109	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1110	<
1111	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1112	<	packagenames="jsr166e,jsr166e.extra"
1113	<	link="${jdkapidocs.url}"
1114	<	source="1.7"
1115	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1116	<	additionalparam="-XDignore.symbol.file=true" />
1146	>	<target name="jsr166edist-jar"
1147	>	depends="jsr166eclean, jsr166ejar">
1148	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1149	>	</target>
1150
1151	+	<target name="jsr166edist-docs"
1152	+	depends="jsr166eclean, jsr166edocs">
1153	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1154		</target>
1155
1120	–	<target name="jsr166edist-jar"
1121	–	depends="jsr166eclean, jsr166ejar">
1156
1157	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1157	>	<!-- Find buglets that can be detected by static build tools -->
1158
1159	+	<target name="lint">
1160	+	<antcall target="dists">
1161	+	<param name="build.javadoc.access" value="private"/>
1162	+	</antcall>
1163		</target>
1164
1165	+
1166		</project>

Diff Legend

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