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.277 by jsr166, Wed Sep 26 16:11:08 2018 UTC vs.
Revision 1.283 by jsr166, Wed Oct 24 22:31:14 2018 UTC

#	Line 204 | Line 204
204		<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205		<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206		<!-- Default jdk doc location (latest stable release seems best) -->
207	<	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
207	>	<!-- But pin to jdk 10 until fix for -->
208	>	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
209	>	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
210
211		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 389 | Line 391
391
392		<!-- Main targets -->
393
394	<	<property name="build.main.java.version" value="9"/>
394	>	<property name="build.main.java.version" value="11"/>
395		<!-- Workaround "no nested properties in ant" -->
396		<macrodef name="define-build-main-properties">
397		<attribute name="v"/>
398		<sequential>
399		<property name="build.main.java"    value="${java@{v}}"/>
400		<property name="build.main.javac"   value="${javac@{v}}"/>
401	<	<!-- Force javadoc version to be at least 10,
402	<	so we can use override-methods=summary -->
401	>	<!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402	>	<!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403		<condition property="build.main.javadoc"
404	<	value="${javadoc11}"
404	>	value="${javadoc12}"
405		else="${javadoc@{v}}">
406	<	<equals arg1="@{v}" arg2="9"/>
406	>	<matches pattern="^(9|10|11)$" string="@{v}"/>
407		</condition>
408		</sequential>
409		</macrodef>
#	Line 410 | Line 412
412		<target name="dists"
413		depends="dist, 4jdk8dist"
414		description="Builds all public jars and docs"/>
415	<	<!--
414	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415	<	-->
415	>	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
416
417		<target name="compile"
418		depends="configure-compiler"
#	Line 481 | Line 481
481		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482		<javadoc destdir="${docs.dir}"
483		packagenames="none"
484	<	link="${java9.api.url}"
484	>	link="${java11.api.url}"
485		overview="${src.dir}/intro.html"
486		access="${build.javadoc.access}"
487		sourcepath="${src.dir}"
488		classpath=""
489	<	source="9"
489	>	source="11"
490		executable="${build.main.javadoc}">
491		<fileset dir="${src.dir}" defaultexcludes="yes">
492		<include name="**/*.java"/>
493		</fileset>
494	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
494	>	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
495		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496		<arg value="-XDignore.symbol.file=true"/>
497		<arg value="-html5"/>
498		<arg value="--patch-module=java.base=${src.dir}"/>
499	+	<arg value="--frames"/>
500		<arg value="--override-methods=summary"/>
501		<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
502		<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
#	Line 513 | Line 514
514		description="Puts all distributable products in single hierarchy"/>
515
516
516	–	<target name="release"
517	–	depends="dist"
518	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
519	–
520	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
521	–
522	–	<jar basedir="${basedir}" destfile="${release.jar}">
523	–	<!-- <exclude name="build/**"/> -->
524	–	<exclude name="${release.jar}"/>
525	–	<exclude name="user.properties"/>
526	–	<exclude name="etc/notes/**"/>
527	–	<exclude name="src/emulation/**"/>
528	–	<exclude name="**/SyntaxTest.java"/>
529	–	<exclude name="**/SuperfluousAbstract.java"/>
530	–	<manifest>
531	–	<attribute name="Built-By" value="${user.name}"/>
532	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
533	–	</manifest>
534	–	</jar>
535	–	</target>
536	–
537	–
517		<target name="clean"
518		description="Removes all build products">
519		<delete dir="${build.dir}"/>
#	Line 621 | Line 600
600		<antcall target="clean"/>
601		<antcall target="test">
602		<param name="build.main.java.version" value="9"/>
603	+	<param name="build.main.java" value="${java9}"/>
604	+	<param name="build.main.javac" value="${javac9}"/>
605		</antcall>
606
607		<antcall target="clean"/>
608		<antcall target="test">
609		<param name="build.main.java.version" value="10"/>
610	+	<param name="build.main.java" value="${java10}"/>
611	+	<param name="build.main.javac" value="${javac10}"/>
612		</antcall>
613
614		<antcall target="clean"/>
615		<antcall target="test">
616		<param name="build.main.java.version" value="11"/>
617	+	<param name="build.main.java" value="${java11}"/>
618	+	<param name="build.main.javac" value="${javac11}"/>
619		</antcall>
620
621		<antcall target="clean"/>
622		<antcall target="test">
623		<param name="build.main.java.version" value="12"/>
624	+	<param name="build.main.java" value="${java12}"/>
625	+	<param name="build.main.javac" value="${javac12}"/>
626	+	</antcall>
627	+	<antcall target="docs">
628	+	<param name="build.main.java.version" value="12"/>
629	+	<param name="build.main.java" value="${java12}"/>
630	+	<param name="build.main.javac" value="${javac12}"/>
631	+	<param name="build.main.javadoc" value="${javadoc12}"/>
632		</antcall>
633
634		<!-- Clean up to avoid obscure wrong class file version bugs -->

Diff Legend

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