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.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC vs.
Revision 1.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC

#	Line 106 | Line 106
106		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107
108		<!-- Distribution locations -->
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"/>
109	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
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"/>
115
116		<!-- Jar locations -->
117		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 128 | Line 128
128		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
129
130		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131	<	<!-- The below does not yet exist as of 2012-11 -->
131	>	<!-- The below does not yet exist as of 2013-01 -->
132		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
133
134		<!-- Default jdk api doc location (latest stable release seems best) -->
#	Line 146 | Line 146
146		</path>
147
148		<macrodef name="run-tck-tests">
149	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
150	+	<attribute name="source" default="6"/>
151		<attribute name="target"/>
152		<attribute name="workdir"/>
153	<	<attribute name="product.jar" default="${product.jar}"/>
153	>	<attribute name="classes"/>
154		<attribute name="jvmflags" default=""/>
155		<sequential>
156
157		<mkdir dir="@{workdir}/tck-classes"/>
158
159	<	<javac srcdir="${tck.src.dir}"
159	>	<javac srcdir="@{tck.src.dir}"
160		destdir="@{workdir}/tck-classes"
161		debug="${build.debug}"
162		debuglevel="${build.debuglevel}"
163		deprecation="${build.deprecation}"
164	<	source="6"
164	>	source="@{source}"
165		classpath="${junit.jar}"
166	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
167		includeAntRuntime="false"
168		includeJavaRuntime="false"
169		executable="${javac@{target}}"
170		fork="true">
171
172	<	<include name="**/*.java"/>
170	<	<bootclasspath path="@{product.jar}"/>
171	<	<bootclasspath path="${bootclasspath6}"/>
172	>	<include name="*.java"/>
173		<compilerarg value="-XDignore.symbol.file=true"/>
174		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
175		<compilerarg line="${build.args}"/>
#	Line 179 | Line 180
180		failonerror="true"
181		jvm="${java@{target}}"
182		fork="true">
183	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
183	>	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
184		<jvmarg line="@{jvmflags}"/>
185		<classpath>
186		<pathelement location="${junit.jar}"/>
#	Line 196 | Line 197
197		</path>
198
199		<!-- Support @jls tag, used in jdk8+ javadoc -->
200	<	<!-- TODO: How do we get &trade to work? -->
200	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
201	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
202	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
200	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
201		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
202
203		<!-- Main targets -->
#	Line 262 | Line 260
260		packagenames="none"
261		link="${jdkapi8docs.url}"
262		overview="${src.dir}/intro.html"
263	+	sourcepath="${src.dir}:${jdk8src.dir}"
264		classpath=""
265		executable="${javadoc8}">
267	–	<sourcepath path="${src.dir}"/>
268	–	<sourcepath path="${jdk8src.dir}"/>
269	–	<arg value="-XDignore.symbol.file=true"/>
270	–	<arg value="-tag"/>
271	–	<arg value="${javadoc.jls.option}"/>
266		<fileset dir="${src.dir}" defaultexcludes="yes">
267		<include name="**/*.java"/>
268		</fileset>
269	+	<arg value="-XDignore.symbol.file=true"/>
270	+	<arg value="-tag"/>
271	+	<arg value="${javadoc.jls.option}"/>
272		</javadoc>
273		</target>
274
#	Line 338 | Line 335
335		deprecation="${build.deprecation}"
336		source="6"
337		classpath="${junit.jar}"
338	+	bootclasspath="@{product.jar}:${bootclasspath6}"
339		includeAntRuntime="false"
340		includeJavaRuntime="false"
341		executable="${javac8}"
342		fork="true">
343
344		<include name="**/*.java"/>
347	–	<bootclasspath path="@{product.jar}"/>
348	–	<bootclasspath path="${bootclasspath6}"/>
345		<compilerarg value="-XDignore.symbol.file=true"/>
346		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347		<compilerarg line="${build.args}"/>
#	Line 359 | Line 355
355		deprecation="${build.deprecation}"
356		source="6"
357		classpath=""
358	+	bootclasspath="@{product.jar}:${bootclasspath6}"
359		includeAntRuntime="false"
360		includeJavaRuntime="false"
361		executable="${javac8}"
362		fork="true">
363
364		<include name="jsr166/test/**/*.java"/>
368	–	<bootclasspath path="${product.jar}"/>
369	–	<bootclasspath path="${bootclasspath6}"/>
365		<compilerarg value="-XDignore.symbol.file=true"/>
366		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
367		<compilerarg line="${build.args}"/>
#	Line 550 | Line 545
545		deprecation="${build.deprecation}"
546		source="6"
547		classpath=""
548	+	bootclasspath="${bootclasspath6}"
549		includeAntRuntime="false"
550		includeJavaRuntime="false"
551		executable="${javac7}"
552		fork="true">
553
554		<include name="**/*.java"/>
559	–	<bootclasspath path="${bootclasspath6}"/>
555		<compilerarg value="-XDignore.symbol.file=true"/>
556		<compilerarg value="-Xlint:all"/>
557		<compilerarg line="${build.args}"/>
#	Line 583 | Line 578
578		<run-tck-tests
579		target="7"
580		workdir="${build.4jdk7.dir}"
581	<	product.jar="${4jdk7product.jar}"/>
581	>	classes="${4jdk7product.jar}"/>
582		</target>
583
584
#	Line 653 | Line 648
648		packagenames="none"
649		link="${jdkapi7docs.url}"
650		overview="${4jdk7src.dir}/intro.html"
651	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
652		classpath=""
653		executable="${javadoc7}">
658	–	<sourcepath path="${4jdk7src.dir}"/>
659	–	<sourcepath path="${jdk7src.dir}"/>
660	–	<arg value="-XDignore.symbol.file=true"/>
654		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
655		<include name="**/*.java"/>
656		</fileset>
657	+	<arg value="-XDignore.symbol.file=true"/>
658		</javadoc>
659		</target>
660
#	Line 705 | Line 699
699		debuglevel="${build.debuglevel}"
700		deprecation="${build.deprecation}"
701		classpath=""
702	+	bootclasspath="${bootclasspath6}"
703		source="5"
704		includeAntRuntime="false"
705		includeJavaRuntime="false"
#	Line 712 | Line 707
707		fork="true">
708
709		<include name="jsr166x/**/*.java"/>
715	–	<bootclasspath path="${bootclasspath6}"/>
710		<compilerarg value="-XDignore.symbol.file=true"/>
711		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
712		<compilerarg line="${build.args}"/>
#	Line 741 | Line 735
735		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
736		packagenames="jsr166x.*"
737		link="${jdkapidocs.url}"
738	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
739	+	bootclasspath="${bootclasspath6}"
740		source="5"
741		executable="${javadoc7}">
746	–	<sourcepath path="${topsrc.dir}"/>
747	–	<sourcepath path="${jdk6src.dir}"/>
748	–	<bootclasspath path="${bootclasspath6}"/>
742		<arg value="-XDignore.symbol.file=true"/>
743
744		</javadoc>
#	Line 794 | Line 787
787		deprecation="${build.deprecation}"
788		source="6"
789		classpath=""
790	+	bootclasspath="${bootclasspath6}"
791		includeAntRuntime="false"
792		includeJavaRuntime="false"
793		executable="${javac7}"
794		fork="true">
795
796		<include name="jsr166y/**/*.java"/>
803	–	<bootclasspath path="${bootclasspath6}"/>
797		<compilerarg value="-XDignore.symbol.file=true"/>
798		<compilerarg value="-Xlint:all"/>
799		<compilerarg line="${build.args}"/>
#	Line 829 | Line 822
822		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
823		packagenames="jsr166y.*"
824		link="${jdkapidocs.url}"
825	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
826	+	bootclasspath="${bootclasspath6}"
827		source="6"
828		executable="${javadoc7}">
834	–	<sourcepath path="${topsrc.dir}"/>
835	–	<sourcepath path="${jdk6src.dir}"/>
836	–	<bootclasspath path="${bootclasspath6}"/>
829		<arg value="-XDignore.symbol.file=true"/>
830
831		</javadoc>
#	Line 880 | Line 872
872		debug="${build.debug}"
873		debuglevel="${build.debuglevel}"
874		deprecation="${build.deprecation}"
875	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
876		classpath=""
877		source="6"
878		includeAntRuntime="false"
#	Line 888 | Line 881
881		fork="true">
882
883		<include name="extra166y/**/*.java"/>
891	–	<bootclasspath path="${jsr166y.jar}"/>
892	–	<bootclasspath path="${bootclasspath6}"/>
884		<compilerarg value="-XDignore.symbol.file=true"/>
885		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
886		<compilerarg line="${build.args}"/>
#	Line 918 | Line 909
909		<javadoc destdir="${dist.extra166yjavadocs.dir}"
910		packagenames="extra166y.*"
911		link="${jdkapidocs.url}"
912	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
913	+	bootclasspath="${bootclasspath6}"
914		source="6"
915		executable="${javadoc7}">
923	–	<sourcepath path="${topsrc.dir}"/>
924	–	<sourcepath path="${jdk6src.dir}"/>
925	–	<bootclasspath path="${bootclasspath6}"/>
916		<arg value="-XDignore.symbol.file=true"/>
917
918		</javadoc>
#	Line 1003 | Line 993
993		<javadoc destdir="${dist.jsr166ejavadocs.dir}"
994		packagenames="jsr166e.*"
995		link="${jdkapidocs.url}"
996	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
997		source="7"
998		executable="${javadoc7}">
1008	–	<sourcepath path="${topsrc.dir}"/>
1009	–	<sourcepath path="${jdk7src.dir}"/>
999		<arg value="-XDignore.symbol.file=true"/>
1000
1001		</javadoc>
1002		</target>
1003
1004
1005	+	<target name="jsr166e-test-tck"
1006	+	depends="jsr166e-jar"
1007	+	description="Runs tck tests for jsr166e">
1008	+
1009	+	<run-tck-tests
1010	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1011	+	source="7"
1012	+	target="8"
1013	+	workdir="${build.jsr166e.dir}"
1014	+	classes="${jsr166e.jar}"/>
1015	+	</target>
1016	+
1017	+
1018		<target name="jsr166edist"
1019		depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1020		description="Puts all distributable products in single hierarchy"/>

Diff Legend

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