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.108 by jsr166, Sat Jan 19 23:58:12 2013 UTC vs.
Revision 1.119 by jsr166, Mon Jan 21 02:31:40 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"/>
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"/>
55	<	<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"/>
58	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59	–
56		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
62	–
57		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
65	–
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
67	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
59
60	<	<!-- JDK binary locations -->
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 locations -->
66		<property name="jdks.home"  location="${user.home}/jdk"/>
67
68		<macrodef name="defjdklocations">
#	Line 76 | Line 72
72		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
79	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
75		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76	<	<property name="bootclasspath@{v}"
77	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
76	>	<local name="boot.jar.dir"/>
77	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78	>	<path id="bootclasspath@{v}">
79	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
80	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
81	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
82	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
83	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
84	>	</path>
85	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86		</sequential>
87		</macrodef>
88
#	Line 87 | Line 90
90		<defjdklocations v="7"/>
91		<defjdklocations v="8"/>
92
90	–	<macrodef name="run-tck-tests">
91	–	<attribute name="jvm"/>
92	–	<attribute name="tck.classes"/>
93	–	<attribute name="product.jar" default="${product.jar}"/>
94	–	<attribute name="jvmflags" default=""/>
95	–	<sequential>
96	–	<java classname="JSR166TestCase"
97	–	jvm="@{jvm}" fork="true">
98	–	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
99	–	<jvmarg line="@{jvmflags}"/>
100	–	<classpath>
101	–	<pathelement location="${junit.jar}"/>
102	–	<pathelement location="@{tck.classes}"/>
103	–	</classpath>
104	–	</java>
105	–	</sequential>
106	–	</macrodef>
107	–
93		<!-- Source locations -->
94		<property name="src.dir"              location="${basedir}/src/main"/>
95		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 119 | Line 104
104		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
105		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
106		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
107
108		<!-- Distribution locations -->
109	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
110	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
111	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
112	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
113	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
114	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
109	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
115
116		<!-- Jar locations -->
117	<	<property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
118	<	<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
119	<	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
120	<	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
121	<	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
122	<	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
117	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
118	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
119	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
120	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
121	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
122	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
124
141	–	<!-- Bootclasspath argument -->
142	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
143	–
125		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
127		<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
#	Line 153 | Line 134
134		<!-- Default jdk api doc location (latest stable release seems best) -->
135		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136
137	+	<!-- Define the "jtreg" task -->
138	+	<!-- See the docs in "jtreg -onlineHelp" -->
139	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140	+	classpath="${lib.dir}/jtreg.jar" />
141	+
142		<!-- Test classpath -->
143		<path id="test.classpath">
144		<pathelement location="${build.testcases.dir}"/>
145		<pathelement location="${junit.jar}"/>
146		</path>
147
148	+	<macrodef name="run-tck-tests">
149	+	<attribute name="target"/>
150	+	<attribute name="workdir"/>
151	+	<attribute name="product.jar" default="${product.jar}"/>
152	+	<attribute name="jvmflags" default=""/>
153	+	<sequential>
154	+
155	+	<mkdir dir="@{workdir}/tck-classes"/>
156	+
157	+	<javac srcdir="${tck.src.dir}"
158	+	destdir="@{workdir}/tck-classes"
159	+	debug="${build.debug}"
160	+	debuglevel="${build.debuglevel}"
161	+	deprecation="${build.deprecation}"
162	+	source="6"
163	+	classpath="${junit.jar}"
164	+	bootclasspath="@{product.jar}:${bootclasspath6}"
165	+	includeAntRuntime="false"
166	+	includeJavaRuntime="false"
167	+	executable="${javac@{target}}"
168	+	fork="true">
169	+
170	+	<include name="JSR166TestCase.java"/>
171	+	<compilerarg value="-XDignore.symbol.file=true"/>
172	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
173	+	<compilerarg line="${build.args}"/>
174	+
175	+	</javac>
176	+
177	+	<java classname="JSR166TestCase"
178	+	failonerror="true"
179	+	jvm="${java@{target}}"
180	+	fork="true">
181	+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
182	+	<jvmarg line="@{jvmflags}"/>
183	+	<classpath>
184	+	<pathelement location="${junit.jar}"/>
185	+	<pathelement location="@{workdir}/tck-classes"/>
186	+	</classpath>
187	+	</java>
188	+
189	+	</sequential>
190	+	</macrodef>
191	+
192		<!-- ALoops classpath -->
193		<path id="loops.classpath">
194		<pathelement location="${build.loops.dir}"/>
#	Line 195 | Line 225
225		fork="true">
226
227		<include name="**/*.java"/>
198	–	<compilerarg line="${build.args}"/>
228		<compilerarg value="-XDignore.symbol.file=true"/>
229		<compilerarg value="-Xlint:all"/>
201	–
202	–	<!--
203	–	<exclude name="java/lang/**"/>
230		<compilerarg line="${build.args}"/>
205	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
206	–	-->
231
232		</javac>
209	–
233		</target>
234
235
213	–
236		<target name="jar"
237		depends="compile"
238		description="Builds library jar from compiled sources">
239
218	–	<mkdir dir="${build.lib.dir}"/>
219	–
240		<jar destfile="${product.jar}">
241		<fileset dir="${build.classes.dir}"/>
242		</jar>
223	–
243		</target>
244
245
227	–
246		<target name="test"
247		depends="configure-tests, report-tests"
248		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
249
250
233	–
251		<target name="docs"
252		description="Builds javadocs for src/main to dist dir">
253
#	Line 247 | Line 264
264		sourcepath="${src.dir}:${jdk8src.dir}"
265		classpath=""
266		executable="${javadoc8}">
250	–	<arg value="-XDignore.symbol.file=true"/>
251	–	<arg value="-tag"/>
252	–	<arg value="${javadoc.jls.option}"/>
267		<fileset dir="${src.dir}" defaultexcludes="yes">
268		<include name="**/*.java"/>
269		</fileset>
270	+	<arg value="-XDignore.symbol.file=true"/>
271	+	<arg value="-tag"/>
272	+	<arg value="${javadoc.jls.option}"/>
273		</javadoc>
257	–
274		</target>
275
276
261	–
277		<target name="dist"
278		depends="dist-clean, dist-jar, docs"
279		description="Puts all distributable products in single hierarchy"/>
#	Line 279 | Line 294
294		<exclude name="**/SyntaxTest.java"/>
295		<exclude name="**/SuperfluousAbstract.java"/>
296		</jar>
282	–
297		</target>
298
299
286	–
300		<target name="clean"
301		description="Removes all build products">
302
303		<delete dir="${build.dir}"/>
291	–	<delete dir="${build.classes.dir}"/>
292	–	<delete dir="${build.lib.dir}"/>
304
305		</target>
306
307
297	–
308		<target name="dist-clean"
309		description="Removes all build and distribution products">
310
#	Line 303 | Line 313
313		</target>
314
315
306	–
316		<!-- Internal targets -->
317
318
#	Line 321 | Line 330
330		<mkdir dir="${build.testcases.dir}"/>
331
332		<javac srcdir="${tck.src.dir}"
333	<	destdir="${build.testcases.dir}"
334	<	debug="${build.debug}"
335	<	debuglevel="${build.debuglevel}"
336	<	deprecation="${build.deprecation}"
337	<	source="${build.sourcelevel}"
338	<	fork="true">
333	>	destdir="${build.testcases.dir}"
334	>	debug="${build.debug}"
335	>	debuglevel="${build.debuglevel}"
336	>	deprecation="${build.deprecation}"
337	>	source="6"
338	>	classpath="${junit.jar}"
339	>	bootclasspath="@{product.jar}:${bootclasspath6}"
340	>	includeAntRuntime="false"
341	>	includeJavaRuntime="false"
342	>	executable="${javac8}"
343	>	fork="true">
344
345	<	<compilerarg value="${bootclasspath.args}"/>
332	<	<compilerarg line="${build.args}"/>
345	>	<include name="**/*.java"/>
346		<compilerarg value="-XDignore.symbol.file=true"/>
347	<
348	<	<classpath refid="test.classpath"/>
347	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
348	>	<compilerarg line="${build.args}"/>
349
350		</javac>
351
352		<javac srcdir="${test.src.dir}"
353	<	destdir="${build.testcases.dir}"
354	<	debug="${build.debug}"
355	<	debuglevel="${build.debuglevel}"
356	<	deprecation="${build.deprecation}"
357	<	source="${build.sourcelevel}"
358	<	fork="true">
359	<
360	<	<include name="jsr166/test/**"/>
353	>	destdir="${build.testcases.dir}"
354	>	debug="${build.debug}"
355	>	debuglevel="${build.debuglevel}"
356	>	deprecation="${build.deprecation}"
357	>	source="6"
358	>	classpath=""
359	>	bootclasspath="@{product.jar}:${bootclasspath6}"
360	>	includeAntRuntime="false"
361	>	includeJavaRuntime="false"
362	>	executable="${javac8}"
363	>	fork="true">
364
365	<	<compilerarg value="${bootclasspath.args}"/>
350	<	<compilerarg line="${build.args}"/>
365	>	<include name="jsr166/test/**/*.java"/>
366		<compilerarg value="-XDignore.symbol.file=true"/>
367	<
368	<	<classpath refid="test.classpath"/>
367	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
368	>	<compilerarg line="${build.args}"/>
369
370		</javac>
371
#	Line 363 | Line 378
378		source="${build.sourcelevel}"
379		fork="true">
380
381	<	<compilerarg value="${bootclasspath.args}"/>
367	<	<compilerarg line="${build.args}"/>
381	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
382		<compilerarg value="-XDignore.symbol.file=true"/>
383	<
370	<	<classpath refid="test.classpath"/>
383	>	<compilerarg line="${build.args}"/>
384
385		</javac>
386		-->
#	Line 388 | Line 401
401		errorProperty="junit.failed"
402		failureProperty="junit.failed"
403		dir="${build.reports.dir}"
404	+	jvm="${java8}"
405		fork="true">
406
407	<	<jvmarg value="${bootclasspath.args}"/>
407	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
408		<jvmarg value="-server"/>
409		<jvmarg value="-showversion"/>
410
#	Line 519 | Line 533
533
534		<!-- jsr166 4jdk7 -->
535
522	–
536		<target name="4jdk7compile"
537		depends="configure-compiler"
538		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 540 | Line 553
553		fork="true">
554
555		<include name="**/*.java"/>
543	–	<compilerarg line="${build.args}"/>
556		<compilerarg value="-XDignore.symbol.file=true"/>
557		<compilerarg value="-Xlint:all"/>
558	+	<compilerarg line="${build.args}"/>
559
560		</javac>
561	+	</target>
562
549	–	<mkdir dir="${build.4jdk7.lib.dir}"/>
563
564	<	<jar destfile="${4jdk7product.jar}" index="true">
564	>	<target name="4jdk7-jar"
565	>	depends="4jdk7compile"
566	>	description="Builds library jar from compiled sources">
567	>
568	>	<jar destfile="${4jdk7product.jar}">
569		<fileset dir="${build.4jdk7.classes.dir}"/>
570		</jar>
571
555	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
556	–
557	–	<javac srcdir="${tck.src.dir}"
558	–	destdir="${build.4jdk7.tck.classes.dir}"
559	–	debug="${build.debug}"
560	–	debuglevel="${build.debuglevel}"
561	–	deprecation="${build.deprecation}"
562	–	source="6"
563	–	classpath="${junit.jar}"
564	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
565	–	includeAntRuntime="false"
566	–	includeJavaRuntime="false"
567	–	executable="${javac7}"
568	–	fork="true">
569	–
570	–	<include name="**/*.java"/>
571	–	<compilerarg line="${build.args}"/>
572	–	<compilerarg value="-XDignore.symbol.file=true"/>
573	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
574	–
575	–	</javac>
576	–
572		</target>
573
574
575		<target name="4jdk7-test-tck"
576	<	depends="4jdk7compile"
576	>	depends="4jdk7-jar"
577		description="Runs tck tests for jsr166-4jdk7 directly">
578	+
579		<run-tck-tests
580	<	jvm="${java7}"
581	<	tck.classes="${build.4jdk7.tck.classes.dir}"
580	>	target="7"
581	>	workdir="${build.4jdk7.dir}"
582		product.jar="${4jdk7product.jar}"/>
583		</target>
584
#	Line 615 | Line 611
611		</junit>
612		</target>
613
614	+	<target name="4jdk7-test-jtreg"
615	+	depends="4jdk7compile"
616	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
617	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
618	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
619	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
620	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
621	+	<jtreg dir="${jtreg.src.dir}"
622	+	jdk="${jdk7.home}"
623	+	workDir="${build.4jdk7.dir}/JTwork"
624	+	reportDir="${build.4jdk7.dir}/JTreport">
625	+
626	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
627	+	<arg value="-agentvm"/>
628	+	<arg value="-v:nopass,fail"/>
629	+	<arg value="-vmoptions:-esa -ea"/>
630	+	<arg value="-automatic"/>
631	+	<arg value="-k:!ignore"/>
632	+	</jtreg>
633	+	</target>
634	+
635	+
636	+	<target name="4jdk7-test"
637	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
638	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
639	+	</target>
640	+
641
642		<target name="4jdk7docs"
643		description="Builds javadocs for src/jdk7 to dist dir">
#	Line 629 | Line 652
652		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
653		classpath=""
654		executable="${javadoc7}">
632	–	<arg value="-XDignore.symbol.file=true"/>
655		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656		<include name="**/*.java"/>
657		</fileset>
658	+	<arg value="-XDignore.symbol.file=true"/>
659		</javadoc>
637	–
660		</target>
661
662
#	Line 643 | Line 665
665		description="Puts all distributable products in single hierarchy"/>
666
667
646	–
668		<target name="4jdk7clean"
669	<	description="Removes all build products">
669	>	description="Removes all 4jdk7 build products">
670
671		<delete dir="${build.4jdk7.dir}"/>
672
673		</target>
674
675
655	–
676		<target name="4jdk7dist-clean"
677		description="Removes all build and distribution products">
678
679		</target>
680
681		<target name="4jdk7dist-jar"
682	<	depends="4jdk7clean, 4jdk7compile">
682	>	depends="4jdk7clean, 4jdk7-jar">
683
684		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
685
686		</target>
687
668	–	<!-- jsr166x -->
688
689	+	<!-- jsr166x -->
690
691		<target name="jsr166xcompile"
692		depends="configure-compiler"
693		description="Compiles jsr166x sources to build dir">
694
695	<	<mkdir dir="${build.jsr166x.dir}"/>
695	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
696
697		<javac srcdir="${topsrc.dir}"
698	<	destdir="${build.jsr166x.dir}"
698	>	destdir="${build.jsr166x.classes.dir}"
699		debug="${build.debug}"
700		debuglevel="${build.debuglevel}"
701		deprecation="${build.deprecation}"
702		classpath=""
683	–	source="5"
703		bootclasspath="${bootclasspath6}"
704	+	source="5"
705		includeAntRuntime="false"
706		includeJavaRuntime="false"
707		executable="${javac7}"
708		fork="true">
709
710		<include name="jsr166x/**/*.java"/>
691	–	<compilerarg line="${build.args}"/>
711		<compilerarg value="-XDignore.symbol.file=true"/>
712		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
713	+	<compilerarg line="${build.args}"/>
714
715		</javac>
696	–
716		</target>
717
718
719	<
701	<	<target name="jsr166xjar"
719	>	<target name="jsr166x-jar"
720		depends="jsr166xcompile"
721		description="Builds library jar from compiled sources">
722
705	–	<mkdir dir="${build.jsr166xlib.dir}"/>
706	–
723		<jar destfile="${jsr166x.jar}">
724	<	<fileset dir="${build.jsr166x.dir}"/>
724	>	<fileset dir="${build.jsr166x.classes.dir}"/>
725		</jar>
726
727		</target>
728
729
714	–
730		<target name="jsr166xdocs"
731		description="Builds javadocs to dist dir">
732
#	Line 721 | Line 736
736		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
737		packagenames="jsr166x.*"
738		link="${jdkapidocs.url}"
724	–	source="5"
725	–	bootclasspath="${bootclasspath6}"
739		sourcepath="${topsrc.dir}:${jdk6src.dir}"
740	<	executable="${javadoc7}"
741	<	additionalparam="-XDignore.symbol.file=true" />
740	>	bootclasspath="${bootclasspath6}"
741	>	source="5"
742	>	executable="${javadoc7}">
743	>	<arg value="-XDignore.symbol.file=true"/>
744
745	+	</javadoc>
746		</target>
747
748
#	Line 735 | Line 751
751		description="Puts all distributable products in single hierarchy"/>
752
753
738	–
754		<target name="jsr166xclean"
755	<	description="Removes all build products">
755	>	description="Removes all jsr166x build products">
756
757		<delete dir="${build.jsr166x.dir}"/>
743	–	<delete dir="${build.jsr166xlib.dir}"/>
758
759		</target>
760
761
748	–
762		<target name="jsr166xdist-clean"
763		description="Removes all build and distribution products">
764
#	Line 753 | Line 766
766
767
768		<target name="jsr166xdist-jar"
769	<	depends="jsr166xclean, jsr166xjar">
769	>	depends="jsr166xclean, jsr166x-jar">
770
771		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
772
#	Line 766 | Line 779
779		depends="configure-compiler"
780		description="Compiles jsr166y sources">
781
782	<	<mkdir dir="${build.jsr166y.dir}"/>
782	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
783
784		<javac srcdir="${topsrc.dir}"
785	<	destdir="${build.jsr166y.dir}"
785	>	destdir="${build.jsr166y.classes.dir}"
786		debug="${build.debug}"
787		debuglevel="${build.debuglevel}"
788		deprecation="${build.deprecation}"
#	Line 782 | Line 795
795		fork="true">
796
797		<include name="jsr166y/**/*.java"/>
785	–	<compilerarg line="${build.args}"/>
798		<compilerarg value="-XDignore.symbol.file=true"/>
799		<compilerarg value="-Xlint:all"/>
800	+	<compilerarg line="${build.args}"/>
801	+
802		</javac>
803		</target>
804
805
806	<	<target name="jsr166yjar"
806	>	<target name="jsr166y-jar"
807		depends="jsr166ycompile"
808		description="Builds library jar from compiled sources">
809
796	–	<mkdir dir="${build.jsr166ylib.dir}"/>
797	–
810		<jar destfile="${jsr166y.jar}" index="true">
811	<	<fileset dir="${build.jsr166y.dir}"/>
811	>	<fileset dir="${build.jsr166y.classes.dir}"/>
812		</jar>
813
814		</target>
815
816
805	–
817		<target name="jsr166ydocs"
818		description="Builds javadocs to dist dir">
819
#	Line 812 | Line 823
823		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
824		packagenames="jsr166y.*"
825		link="${jdkapidocs.url}"
815	–	source="6"
816	–	bootclasspath="${bootclasspath6}"
826		sourcepath="${topsrc.dir}:${jdk6src.dir}"
827	<	executable="${javadoc7}"
828	<	additionalparam="-XDignore.symbol.file=true" />
827	>	bootclasspath="${bootclasspath6}"
828	>	source="6"
829	>	executable="${javadoc7}">
830	>	<arg value="-XDignore.symbol.file=true"/>
831
832	+	</javadoc>
833		</target>
834
835
#	Line 826 | Line 838
838		description="Puts all distributable products in single hierarchy"/>
839
840
829	–
841		<target name="jsr166yclean"
842	<	description="Removes all build products">
842	>	description="Removes all jsr166y build products">
843
844		<delete dir="${build.jsr166y.dir}"/>
834	–	<delete dir="${build.jsr166ylib.dir}"/>
845
846		</target>
847
848
839	–
849		<target name="jsr166ydist-clean"
850		description="Removes all build and distribution products">
851
852		</target>
853
854		<target name="jsr166ydist-jar"
855	<	depends="jsr166yclean, jsr166yjar">
855	>	depends="jsr166yclean, jsr166y-jar">
856
857		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858
#	Line 854 | Line 863
863
864
865		<target name="extra166ycompile"
866	<	depends="configure-compiler, jsr166yjar"
866	>	depends="configure-compiler, jsr166y-jar"
867		description="Compiles extra166y sources">
868
869	<	<mkdir dir="${build.extra166y.dir}"/>
869	>	<mkdir dir="${build.extra166y.classes.dir}"/>
870
871		<javac srcdir="${topsrc.dir}"
872	<	destdir="${build.extra166y.dir}"
872	>	destdir="${build.extra166y.classes.dir}"
873		debug="${build.debug}"
874		debuglevel="${build.debuglevel}"
875		deprecation="${build.deprecation}"
876	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
877		classpath=""
878		source="6"
869	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
879		includeAntRuntime="false"
880		includeJavaRuntime="false"
881		executable="${javac7}"
882		fork="true">
883
884		<include name="extra166y/**/*.java"/>
876	–	<compilerarg line="${build.args}"/>
885		<compilerarg value="-XDignore.symbol.file=true"/>
886		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
887	+	<compilerarg line="${build.args}"/>
888
889		</javac>
881	–
890		</target>
891
892
893	<
886	<	<target name="extra166yjar"
893	>	<target name="extra166y-jar"
894		depends="extra166ycompile"
895		description="Builds library jar from compiled sources">
896
890	–	<mkdir dir="${build.extra166ylib.dir}"/>
891	–
897		<jar destfile="${extra166y.jar}" index="true">
898	<	<fileset dir="${build.extra166y.dir}"/>
898	>	<fileset dir="${build.extra166y.classes.dir}"/>
899		</jar>
900
901		</target>
902
903
899	–
904		<target name="extra166ydocs"
905		description="Builds javadocs to build dir">
906
#	Line 906 | Line 910
910		<javadoc destdir="${dist.extra166yjavadocs.dir}"
911		packagenames="extra166y.*"
912		link="${jdkapidocs.url}"
909	–	source="6"
910	–	bootclasspath="${bootclasspath6}"
913		sourcepath="${topsrc.dir}:${jdk6src.dir}"
914	<	executable="${javadoc7}"
915	<	additionalparam="-XDignore.symbol.file=true" />
914	>	bootclasspath="${bootclasspath6}"
915	>	source="6"
916	>	executable="${javadoc7}">
917	>	<arg value="-XDignore.symbol.file=true"/>
918
919	+	</javadoc>
920		</target>
921
922
#	Line 920 | Line 925
925		description="Puts all distributable products in single hierarchy"/>
926
927
923	–
928		<target name="extra166yclean"
929	<	description="Removes all build products">
929	>	description="Removes all extra166y build products">
930
931		<delete dir="${build.extra166y.dir}"/>
928	–	<delete dir="${build.extra166ylib.dir}"/>
932
933		</target>
934
935
933	–
936		<target name="extra166ydist-clean"
937		description="Removes all build and distribution products">
938
939		</target>
940
941		<target name="extra166ydist-jar"
942	<	depends="extra166yclean, extra166yjar">
942	>	depends="extra166yclean, extra166y-jar">
943
944		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
945
#	Line 949 | Line 951
951		depends="configure-compiler"
952		description="Compiles jsr166e sources">
953
954	<	<mkdir dir="${build.jsr166e.dir}"/>
954	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
955
956		<javac srcdir="${topsrc.dir}"
957	<	destdir="${build.jsr166e.dir}"
957	>	destdir="${build.jsr166e.classes.dir}"
958		debug="${build.debug}"
959		debuglevel="${build.debuglevel}"
960		deprecation="${build.deprecation}"
#	Line 964 | Line 966
966		fork="true">
967
968		<include name="jsr166e/**/*.java"/>
967	–	<compilerarg line="${build.args}"/>
969		<compilerarg value="-XDignore.symbol.file=true"/>
970		<compilerarg value="-Xlint:all"/>
971	+	<compilerarg line="${build.args}"/>
972
973		</javac>
972	–
974		</target>
975
976
977	<
977	<	<target name="jsr166ejar"
977	>	<target name="jsr166e-jar"
978		depends="jsr166ecompile"
979		description="Builds library jar from compiled sources">
980
981	–	<mkdir dir="${build.jsr166elib.dir}"/>
982	–
981		<jar destfile="${jsr166e.jar}" index="true">
982	<	<fileset dir="${build.jsr166e.dir}"/>
982	>	<fileset dir="${build.jsr166e.classes.dir}"/>
983		</jar>
984
985		</target>
986
987
990	–
988		<target name="jsr166edocs"
989		description="Builds javadocs to build dir">
990
#	Line 997 | Line 994
994		<javadoc destdir="${dist.jsr166ejavadocs.dir}"
995		packagenames="jsr166e.*"
996		link="${jdkapidocs.url}"
1000	–	source="7"
997		sourcepath="${topsrc.dir}:${jdk7src.dir}"
998	<	executable="${javadoc7}"
999	<	additionalparam="-XDignore.symbol.file=true" >
1000	<	</javadoc>
998	>	source="7"
999	>	executable="${javadoc7}">
1000	>	<arg value="-XDignore.symbol.file=true"/>
1001
1002	+	</javadoc>
1003		</target>
1004
1005
#	Line 1011 | Line 1008
1008		description="Puts all distributable products in single hierarchy"/>
1009
1010
1014	–
1011		<target name="jsr166eclean"
1012	<	description="Removes all build products">
1012	>	description="Removes all jsr166e build products">
1013
1014		<delete dir="${build.jsr166e.dir}"/>
1019	–	<delete dir="${build.jsr166elib.dir}"/>
1015
1016		</target>
1017
#	Line 1027 | Line 1022
1022		</target>
1023
1024		<target name="jsr166edist-jar"
1025	<	depends="jsr166eclean, jsr166ejar">
1025	>	depends="jsr166eclean, jsr166e-jar">
1026
1027		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1028

Diff Legend

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