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.120 by jsr166, Mon Jan 21 02:34:44 2013 UTC

#	Line 161 | Line 161
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="**/*.java"/>
170	<	<bootclasspath path="@{product.jar}"/>
171	<	<bootclasspath path="${bootclasspath6}"/>
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}"/>
#	Line 196 | Line 195
195		</path>
196
197		<!-- Support @jls tag, used in jdk8+ javadoc -->
198	<	<!-- 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"/>
198	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
199		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
200
201		<!-- Main targets -->
#	Line 262 | Line 258
258		packagenames="none"
259		link="${jdkapi8docs.url}"
260		overview="${src.dir}/intro.html"
261	+	sourcepath="${src.dir}:${jdk8src.dir}"
262		classpath=""
263		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}"/>
264		<fileset dir="${src.dir}" defaultexcludes="yes">
265		<include name="**/*.java"/>
266		</fileset>
267	+	<arg value="-XDignore.symbol.file=true"/>
268	+	<arg value="-tag"/>
269	+	<arg value="${javadoc.jls.option}"/>
270		</javadoc>
271		</target>
272
#	Line 338 | Line 333
333		deprecation="${build.deprecation}"
334		source="6"
335		classpath="${junit.jar}"
336	+	bootclasspath="@{product.jar}:${bootclasspath6}"
337		includeAntRuntime="false"
338		includeJavaRuntime="false"
339		executable="${javac8}"
340		fork="true">
341
342		<include name="**/*.java"/>
347	–	<bootclasspath path="@{product.jar}"/>
348	–	<bootclasspath path="${bootclasspath6}"/>
343		<compilerarg value="-XDignore.symbol.file=true"/>
344		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
345		<compilerarg line="${build.args}"/>
#	Line 359 | Line 353
353		deprecation="${build.deprecation}"
354		source="6"
355		classpath=""
356	+	bootclasspath="@{product.jar}:${bootclasspath6}"
357		includeAntRuntime="false"
358		includeJavaRuntime="false"
359		executable="${javac8}"
360		fork="true">
361
362		<include name="jsr166/test/**/*.java"/>
368	–	<bootclasspath path="${product.jar}"/>
369	–	<bootclasspath path="${bootclasspath6}"/>
363		<compilerarg value="-XDignore.symbol.file=true"/>
364		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
365		<compilerarg line="${build.args}"/>
#	Line 550 | Line 543
543		deprecation="${build.deprecation}"
544		source="6"
545		classpath=""
546	+	bootclasspath="${bootclasspath6}"
547		includeAntRuntime="false"
548		includeJavaRuntime="false"
549		executable="${javac7}"
550		fork="true">
551
552		<include name="**/*.java"/>
559	–	<bootclasspath path="${bootclasspath6}"/>
553		<compilerarg value="-XDignore.symbol.file=true"/>
554		<compilerarg value="-Xlint:all"/>
555		<compilerarg line="${build.args}"/>
#	Line 653 | Line 646
646		packagenames="none"
647		link="${jdkapi7docs.url}"
648		overview="${4jdk7src.dir}/intro.html"
649	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
650		classpath=""
651		executable="${javadoc7}">
658	–	<sourcepath path="${4jdk7src.dir}"/>
659	–	<sourcepath path="${jdk7src.dir}"/>
660	–	<arg value="-XDignore.symbol.file=true"/>
652		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
653		<include name="**/*.java"/>
654		</fileset>
655	+	<arg value="-XDignore.symbol.file=true"/>
656		</javadoc>
657		</target>
658
#	Line 705 | Line 697
697		debuglevel="${build.debuglevel}"
698		deprecation="${build.deprecation}"
699		classpath=""
700	+	bootclasspath="${bootclasspath6}"
701		source="5"
702		includeAntRuntime="false"
703		includeJavaRuntime="false"
#	Line 712 | Line 705
705		fork="true">
706
707		<include name="jsr166x/**/*.java"/>
715	–	<bootclasspath path="${bootclasspath6}"/>
708		<compilerarg value="-XDignore.symbol.file=true"/>
709		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
710		<compilerarg line="${build.args}"/>
#	Line 741 | Line 733
733		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
734		packagenames="jsr166x.*"
735		link="${jdkapidocs.url}"
736	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
737	+	bootclasspath="${bootclasspath6}"
738		source="5"
739		executable="${javadoc7}">
746	–	<sourcepath path="${topsrc.dir}"/>
747	–	<sourcepath path="${jdk6src.dir}"/>
748	–	<bootclasspath path="${bootclasspath6}"/>
740		<arg value="-XDignore.symbol.file=true"/>
741
742		</javadoc>
#	Line 794 | Line 785
785		deprecation="${build.deprecation}"
786		source="6"
787		classpath=""
788	+	bootclasspath="${bootclasspath6}"
789		includeAntRuntime="false"
790		includeJavaRuntime="false"
791		executable="${javac7}"
792		fork="true">
793
794		<include name="jsr166y/**/*.java"/>
803	–	<bootclasspath path="${bootclasspath6}"/>
795		<compilerarg value="-XDignore.symbol.file=true"/>
796		<compilerarg value="-Xlint:all"/>
797		<compilerarg line="${build.args}"/>
#	Line 829 | Line 820
820		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
821		packagenames="jsr166y.*"
822		link="${jdkapidocs.url}"
823	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
824	+	bootclasspath="${bootclasspath6}"
825		source="6"
826		executable="${javadoc7}">
834	–	<sourcepath path="${topsrc.dir}"/>
835	–	<sourcepath path="${jdk6src.dir}"/>
836	–	<bootclasspath path="${bootclasspath6}"/>
827		<arg value="-XDignore.symbol.file=true"/>
828
829		</javadoc>
#	Line 880 | Line 870
870		debug="${build.debug}"
871		debuglevel="${build.debuglevel}"
872		deprecation="${build.deprecation}"
873	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
874		classpath=""
875		source="6"
876		includeAntRuntime="false"
#	Line 888 | Line 879
879		fork="true">
880
881		<include name="extra166y/**/*.java"/>
891	–	<bootclasspath path="${jsr166y.jar}"/>
892	–	<bootclasspath path="${bootclasspath6}"/>
882		<compilerarg value="-XDignore.symbol.file=true"/>
883		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
884		<compilerarg line="${build.args}"/>
#	Line 918 | Line 907
907		<javadoc destdir="${dist.extra166yjavadocs.dir}"
908		packagenames="extra166y.*"
909		link="${jdkapidocs.url}"
910	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
911	+	bootclasspath="${bootclasspath6}"
912		source="6"
913		executable="${javadoc7}">
923	–	<sourcepath path="${topsrc.dir}"/>
924	–	<sourcepath path="${jdk6src.dir}"/>
925	–	<bootclasspath path="${bootclasspath6}"/>
914		<arg value="-XDignore.symbol.file=true"/>
915
916		</javadoc>
#	Line 1003 | Line 991
991		<javadoc destdir="${dist.jsr166ejavadocs.dir}"
992		packagenames="jsr166e.*"
993		link="${jdkapidocs.url}"
994	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
995		source="7"
996		executable="${javadoc7}">
1008	–	<sourcepath path="${topsrc.dir}"/>
1009	–	<sourcepath path="${jdk7src.dir}"/>
997		<arg value="-XDignore.symbol.file=true"/>
998
999		</javadoc>

Diff Legend

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