/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.208 by jsr166, Sat Apr 2 16:09:42 2016 UTC revision 1.243 by jsr166, Sat May 13 20:16:55 2017 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless">    xmlns:if="ant:if" xmlns:unless="ant:unless"
3      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 17  Line 18 
18    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
20    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
   $HOME/jdk/jdk7  
21    $HOME/jdk/jdk8    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9    $HOME/jdk/jdk9
23      $HOME/jdk/jdk10
24    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk6  
   $HOME/jdk/src/jdk7  
25    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
26    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
27      $HOME/jdk/src/jdk10
28    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
29    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
30    
31    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
32    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
33    for $N in 6 7 8 9 ...    for $N in 8 9 10 ...
34    
35    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"    As of 2016-03, the sources in src/main are for jdk9+ only.
   target is currently broken.  
36  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
37    </description>    </description>
38    
39    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
40    <target name="usage">    <target name="usage">
41      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
42        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 63  Line 61 
61    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
62    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
63    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
64    
65    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 134  Line 131 
131    <defjdklocations v="7"/>    <defjdklocations v="7"/>
132    <defjdklocations v="8"/>    <defjdklocations v="8"/>
133    <defjdklocations v="9"/>    <defjdklocations v="9"/>
134      <defjdklocations v="10"/>
135    
136    <!-- Source locations -->    <!-- Source locations -->
137    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143  Line 141 
141    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
142    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
143    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
144      <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
145    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 186  Line 185 
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188    <!-- The expected canonical location does not yet exist as of 2016-03 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193    
# Line 233  Line 232 
232        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233      </condition>      </condition>
234    
235        <local name="use-doclint"/>
236        <condition property="use-doclint">
237          <not> <equals arg1="@{target}" arg2="7"/> </not>
238        </condition>
239    
240      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
241    
242      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 245  Line 249 
249             classpath="${junit.jar}"             classpath="${junit.jar}"
250             includeAntRuntime="false"             includeAntRuntime="false"
251             includeJavaRuntime="false"             includeJavaRuntime="false"
252               encoding="ASCII"
253             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
254             fork="true">             fork="true">
255    
256        <include name="*.java"/>        <include name="*.java"/>
257        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
258        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
259          <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261        <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
263        <javac-elements/>        <javac-elements/>
264    
# Line 263  Line 269 
269            jvm="${java@{target}}"            jvm="${java@{target}}"
270            fork="true">            fork="true">
271          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272          <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
273            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
274            <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
275            <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
276            <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
277            <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
278          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
279            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
280            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
281    
282          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
283          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
284            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
285            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
# Line 292  Line 305 
305    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
306      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
307        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
308      </patternset>      </patternset>
309    </fileset>    </fileset>
310    
# Line 326  Line 336 
336      </condition>      </condition>
337    
338      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
339      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
340             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
341             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
342        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
343        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
344        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
345          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
346        <arg value="-agentvm"/>        <arg value="-agentvm"/>
347          <arg value="-noreport"/>
348        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
349        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
350        <arg value="-automatic"/>        <arg value="-automatic"/>
# Line 360  Line 370 
370    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
371    
372    <target name="dists"    <target name="dists"
373            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
374            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
375              <!--
376                  depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377              -->
378    
379    <target name="compile"    <target name="compile"
380            depends="configure-compiler"            depends="configure-compiler"
# Line 389  Line 402 
402             classpath=""             classpath=""
403             includeAntRuntime="false"             includeAntRuntime="false"
404             includeJavaRuntime="false"             includeJavaRuntime="false"
405               encoding="ASCII"
406             executable="${build.main.javac}"             executable="${build.main.javac}"
407             fork="true">             fork="true">
408    
409        <include name="**/*.java"/>        <include name="**/*.java"/>
410        <compilerarg value="-Xmodule:java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
411        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
412        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
413        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
414          <compilerarg line="--doclint-format html5"/>
415          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
416        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>  
417        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
418        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
419    
# Line 409  Line 424 
424    <target name="jar"    <target name="jar"
425            depends="compile"            depends="compile"
426            description="Builds library jar for src/main from compiled sources">            description="Builds library jar for src/main from compiled sources">
427        <local name="subdir"/>
428        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
429      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
430        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
431        <manifest>        <manifest>
432          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
433          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429  Line 445 
445      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
446      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
447    
448    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
449    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
450    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
451    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
452    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
453      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
454               packagenames="none"               packagenames="none"
455               link="${java9.api.url}"               link="${java9.api.url}"
456               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
457               access="${build.javadoc.access}"               access="${build.javadoc.access}"
458               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
459               classpath=""               classpath=""
460               executable="${javadoc9}">               executable="${javadoc9}">
461        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 443  Line 464 
464        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
465        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
466        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
467  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-html5"/>
468          <arg value="--patch-module=java.base=${src.dir}"/>
469        <arg value="-tag"/>        <arg value="-tag"/>
470        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
471    <!-- @apiNote currently unused -->
472    <!--       <arg value="-tag"/> -->
473    <!--       <arg value="apiNote:a:API Note:"/> -->
474        <arg value="-tag"/>        <arg value="-tag"/>
475        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
476        <arg value="-tag"/>        <arg value="-tag"/>
477        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
478  <!-- tags added in jdk9 -->  <!-- tags added in jdk9: currently unused -->
479        <arg value="-tag"/>  <!--       <arg value="-tag"/> -->
480        <arg value="revised:X"/>  <!--       <arg value="revised:X"/> -->
481        <arg value="-tag"/>  <!--       <arg value="-tag"/> -->
482        <arg value="spec:X"/>  <!--       <arg value="spec:X"/> -->
483      </javadoc>      </javadoc>
484    </target>    </target>
485    
# Line 490  Line 513 
513    
514    <target name="clean"    <target name="clean"
515            description="Removes all build products">            description="Removes all build products">
   
516      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
517    </target>    </target>
518    
519    
520    <target name="dist-clean"    <target name="dist-clean"
521            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
522      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
523      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
524    </target>    </target>
525    
526    
# Line 522  Line 541 
541      <run-tck-tests      <run-tck-tests
542        target="${build.main.java.version}"        target="${build.main.java.version}"
543        workdir="${build.dir}"        workdir="${build.dir}"
544        classes="${product.jar}"/>        classes="${product.jar}">
545          <javac-elements>
546            <compilerarg value="-Werror"/>
547          </javac-elements>
548        </run-tck-tests>
549    </target>    </target>
550    
551    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
# Line 539  Line 562 
562      </antcall>      </antcall>
563    </target>    </target>
564    
565      <target name="tck-security-manager"
566              description="Runs tck with a security manager">
567        <antcall target="tck">
568          <param name="jsr166.useSecurityManager" value="true"/>
569        </antcall>
570      </target>
571    
572    <target name="jtreg"    <target name="jtreg"
573            depends="jar"            depends="jar"
574            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
# Line 550  Line 580 
580    
581    <target name="test"    <target name="test"
582            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
583            description="Runs tck and jtreg tests for src/main">            description="Runs tck and jtreg tests for src/main"/>
   </target>  
584    
585  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
586    
# Line 583  Line 612 
612    
613    <target name="configure-compiler">    <target name="configure-compiler">
614      <fail message="ant version too old">      <fail message="ant version too old">
615        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
616      </fail>      </fail>
617    
618      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 619  Line 646 
646        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
647             source="${build.sourcelevel}"             source="${build.sourcelevel}"
648             target="${build.sourcelevel}"             target="${build.sourcelevel}"
649             encoding="ASCII"
650               fork="true">               fork="true">
651    
652        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 630  Line 658 
658      <java classname="ALoops" fork="true">      <java classname="ALoops" fork="true">
659        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
660      </java>      </java>
   
661    </target>    </target>
662    
663    
664    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
665            description="compile all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
666    
667      <mkdir dir="${build.dir}/test/loops"/>      <mkdir dir="${build.dir}/test/loops"/>
668    
# Line 646  Line 673 
673             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
674             includeAntRuntime="false"             includeAntRuntime="false"
675             includeJavaRuntime="false"             includeJavaRuntime="false"
676               encoding="ASCII"
677             executable="${javac9}"             executable="${javac9}"
678             fork="true">             fork="true">
679    
# Line 654  Line 682 
682        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
683        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
684        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
685      </javac>      </javac>
   
686    </target>    </target>
687    
688    
# Line 679  Line 705 
705             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
706             includeAntRuntime="false"             includeAntRuntime="false"
707             includeJavaRuntime="false"             includeJavaRuntime="false"
708               encoding="ASCII"
709             executable="${javac8}"             executable="${javac8}"
710             fork="true">             fork="true">
   
711        <include name="**/*.java"/>        <include name="**/*.java"/>
712        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
713        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
714        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
715        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
716        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
717      </javac>      </javac>
718    </target>    </target>
719    
# Line 709  Line 734 
734             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
735             includeAntRuntime="false"             includeAntRuntime="false"
736             includeJavaRuntime="false"             includeJavaRuntime="false"
737               encoding="ASCII"
738             executable="${javac8}"             executable="${javac8}"
739             fork="true">             fork="true">
   
740        <include name="**/*.java"/>        <include name="**/*.java"/>
741        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
742        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
743        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
744        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
745        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
746      </javac>      </javac>
747    </target>    </target>
748    
# Line 734  Line 758 
758          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759        </manifest>        </manifest>
760      </jar>      </jar>
   
761    </target>    </target>
762    
763    
# Line 750  Line 773 
773          <!-- JDK9+ test classes -->          <!-- JDK9+ test classes -->
774          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
775          <exclude name="*10Test.java"/>          <exclude name="*10Test.java"/>
776            <compilerarg value="-Werror"/>
777        </javac-elements>        </javac-elements>
778      </run-tck-tests>      </run-tck-tests>
779    </target>    </target>
# Line 767  Line 791 
791    
792    <target name="4jdk8-test"    <target name="4jdk8-test"
793            depends="4jdk8-tck, 4jdk8-jtreg"            depends="4jdk8-tck, 4jdk8-jtreg"
794            description="Runs tck and jtreg tests for jsr166-4jdk8">            description="Runs tck and jtreg tests for jsr166-4jdk8"/>
   </target>  
795    
796    
797    <target name="4jdk8docs"    <target name="4jdk8docs"
# Line 793  Line 816 
816        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
817        <arg value="-tag"/>        <arg value="-tag"/>
818        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
819        <arg value="-tag"/>  <!-- @apiNote currently unused -->
820        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
821    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822        <arg value="-tag"/>        <arg value="-tag"/>
823        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824        <arg value="-tag"/>        <arg value="-tag"/>
# Line 810  Line 834 
834    
835    <target name="4jdk8clean"    <target name="4jdk8clean"
836            description="Removes all 4jdk8 build products">            description="Removes all 4jdk8 build products">
   
837      <delete dir="${build.4jdk8.dir}"/>      <delete dir="${build.4jdk8.dir}"/>
   
838    </target>    </target>
839    
840    
# Line 828  Line 850 
850    </target>    </target>
851    
852    
853      <!-- jsr166 4jdk7 (no longer maintained) -->
854    
855    <!-- jsr166 4jdk7 -->    <target name="4jdk7compile" depends="configure-compiler">
   
   <target name="4jdk7compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk7 sources, targeting jdk7">  
   
856      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
857    
858      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 848  Line 866 
866             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
867             includeAntRuntime="false"             includeAntRuntime="false"
868             includeJavaRuntime="false"             includeJavaRuntime="false"
869               encoding="ASCII"
870             executable="${javac7}"             executable="${javac7}"
871             fork="true">             fork="true">
872    
# Line 857  Line 876 
876        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
877        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
878        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
879      </javac>      </javac>
880    </target>    </target>
881    
882    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
883      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
884    
885      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 878  Line 893 
893             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
894             includeAntRuntime="false"             includeAntRuntime="false"
895             includeJavaRuntime="false"             includeJavaRuntime="false"
896               encoding="ASCII"
897             executable="${javac8}"             executable="${javac8}"
898             fork="true">             fork="true">
899    
# Line 887  Line 903 
903        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
904        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
905        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
906      </javac>      </javac>
907    </target>    </target>
908    
909      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
910      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
911        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
912        <manifest>        <manifest>
# Line 903  Line 914 
914          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
915        </manifest>        </manifest>
916      </jar>      </jar>
   
917    </target>    </target>
918    
919      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
920      <run-tck-tests      <run-tck-tests
921        target="7"        target="7"
922        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 928  Line 934 
934          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
935          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
936          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
937            <compilerarg value="-Werror"/>
938        </javac-elements>        </javac-elements>
939      </run-tck-tests>      </run-tck-tests>
940    </target>    </target>
941    
   
942    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
943    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile">  
944    
945      <junit printsummary="true"      <junit printsummary="true"
946             showoutput="true"             showoutput="true"
# Line 957  Line 962 
962    
963        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
964        </test>        </test>
   
965      </junit>      </junit>
966    </target>    </target>
967    
968    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
969      <run-jtreg-tests      <run-jtreg-tests
970         target="7"         target="7"
971         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
972         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
973    </target>    </target>
974    
975      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
976    
977    <target name="4jdk7-test"    <target name="4jdk7docs">
           depends="4jdk7-tck, 4jdk7-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk7">  
   </target>  
   
   
   <target name="4jdk7docs"  
           description="Builds javadocs for src/jdk7 to dist dir">  
   
978      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
979      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
980    
# Line 1000  Line 995 
995      </javadoc>      </javadoc>
996    </target>    </target>
997    
998      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
999    
1000    <target name="4jdk7dist"    <target name="4jdk7clean">
           depends="4jdk7dist-jar, 4jdk7dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk7clean"  
           description="Removes all 4jdk7 build products">  
   
1001      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1002    </target>    </target>
1003    
1004      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1005      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1006    </target>    </target>
1007    
1008      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1009      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1010    </target>    </target>
1011    
1012    
1013    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1014    
1015      <target name="jsr166xcompile" depends="configure-compiler">
1016      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1017    
1018      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1045  Line 1026 
1026             target="5"             target="5"
1027             includeAntRuntime="false"             includeAntRuntime="false"
1028             includeJavaRuntime="false"             includeJavaRuntime="false"
1029               encoding="ASCII"
1030             executable="${javac7}"             executable="${javac7}"
1031             fork="true">             fork="true">
   
1032        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1033        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1034        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1035        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1036        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1037      </javac>      </javac>
1038    </target>    </target>
1039    
1040      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1041      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1042        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1043        <manifest>        <manifest>
# Line 1069  Line 1045 
1045          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1046        </manifest>        </manifest>
1047      </jar>      </jar>
   
1048    </target>    </target>
1049    
1050      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1051      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1052      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1053    
# Line 1090  Line 1062 
1062               failonerror = "true">               failonerror = "true">
1063        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1064        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1065      </javadoc>      </javadoc>
1066    </target>    </target>
1067    
1068      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1069    
1070    <target name="jsr166xdist"    <target name="jsr166xclean">
           depends="jsr166xdist-jar, jsr166xdist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166xclean"  
           description="Removes all jsr166x build products">  
   
1071      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1072    </target>    </target>
1073    
1074      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1075      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1076    </target>    </target>
1077    
1078    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1079      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1080    </target>    </target>
1081    
   <!-- jsr166y -->  
1082    
1083      <!-- jsr166y (no longer maintained) -->
1084    
1085    <target name="jsr166ycompile"    <target name="jsr166ycompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
   
1086      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1087    
1088      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1138  Line 1096 
1096             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1097             includeAntRuntime="false"             includeAntRuntime="false"
1098             includeJavaRuntime="false"             includeJavaRuntime="false"
1099               encoding="ASCII"
1100             executable="${javac7}"             executable="${javac7}"
1101             fork="true">             fork="true">
1102    
# Line 1146  Line 1105 
1105        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1106        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1107        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1108      </javac>      </javac>
1109    </target>    </target>
1110    
1111      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1112      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1113        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1114        <manifest>        <manifest>
# Line 1162  Line 1116 
1116          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1117        </manifest>        </manifest>
1118      </jar>      </jar>
   
1119    </target>    </target>
1120    
1121      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1122      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1123      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1124    
# Line 1183  Line 1133 
1133               failonerror = "true">               failonerror = "true">
1134        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1135        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1136      </javadoc>      </javadoc>
1137    </target>    </target>
1138    
1139      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1140    
1141    <target name="jsr166ydist"    <target name="jsr166yclean">
           depends="jsr166ydist-jar, jsr166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166yclean"  
           description="Removes all jsr166y build products">  
   
1142      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1143    </target>    </target>
1144    
1145      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1146      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1147    </target>    </target>
1148    
1149    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1150      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1151    </target>    </target>
1152    
1153    
1154    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1155    
1156      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1157      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1158    
1159      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1232  Line 1167 
1167             target="6"             target="6"
1168             includeAntRuntime="false"             includeAntRuntime="false"
1169             includeJavaRuntime="false"             includeJavaRuntime="false"
1170               encoding="ASCII"
1171             executable="${javac7}"             executable="${javac7}"
1172             fork="true">             fork="true">
1173    
# Line 1240  Line 1176 
1176        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1177        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1178        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1179      </javac>      </javac>
1180    </target>    </target>
1181    
1182      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1183      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1184        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1185        <manifest>        <manifest>
# Line 1256  Line 1187 
1187          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1188        </manifest>        </manifest>
1189      </jar>      </jar>
   
1190    </target>    </target>
1191    
1192      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1193      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1194      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1195    
# Line 1276  Line 1203 
1203               executable="${javadoc7}">               executable="${javadoc7}">
1204        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1205        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1206      </javadoc>      </javadoc>
1207    </target>    </target>
1208    
1209      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1210    
1211    <target name="extra166ydist"    <target name="extra166yclean">
           depends="extra166ydist-jar, extra166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="extra166yclean"  
           description="Removes all extra166y build products">  
   
1212      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1213    </target>    </target>
1214    
1215      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1216      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1217    </target>    </target>
1218    
1219    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1220      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1221    </target>    </target>
1222    
1223    <!-- jsr166e -->  
1224      <!-- jsr166e (no longer maintained) -->
1225    
1226    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1227    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1228    
1229    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1230      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1231    
1232      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1333  Line 1247 
1247        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1248        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1249        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1250      </javac>      </javac>
1251    </target>    </target>
1252    
   <!-- jsr166e: find doclint errors -->  
1253    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1254      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1255    
1256      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1361  Line 1272 
1272        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1273        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1274        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1275      </javac>      </javac>
1276    </target>    </target>
1277    
1278      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1279      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1280        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1281        <manifest>        <manifest>
# Line 1377  Line 1283 
1283          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1284        </manifest>        </manifest>
1285      </jar>      </jar>
   
1286    </target>    </target>
1287    
1288      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1289      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1290      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1291    
# Line 1397  Line 1299 
1299               failonerror = "true">               failonerror = "true">
1300        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1301        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1302      </javadoc>      </javadoc>
1303    </target>    </target>
1304    
1305      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1306      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1307      <run-tck-tests      <run-tck-tests
1308        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1309        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1414  Line 1311 
1311        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1312    </target>    </target>
1313    
1314    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1315    
1316  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1317  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1436  Line 1332 
1332      </antcall>      </antcall>
1333    </target>    </target>
1334    
1335      <target name="jsr166e-test" depends="jsr166e-tck"/>
1336    
1337    <target name="jsr166e-test"    <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
           depends="jsr166e-tck"  
           description="Runs all tests for jsr166e">  
   </target>  
   
   <target name="jsr166edist"  
           depends="jsr166edist-jar, jsr166edist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
1338    
1339    <target name="jsr166eclean"    <target name="jsr166eclean">
           description="Removes all jsr166e build products">  
1340      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1341    </target>    </target>
1342    
   
1343    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1344            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1345      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1346    </target>    </target>
1347    
1348    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1349      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1350    </target>    </target>
1351    
# Line 1480  Line 1366 
1366    </target>    </target>
1367    
1368    
1369    <!-- ==============================================================
1370      Experimental errorprone support - http://errorprone.info
1371      You may need to bring your own errorprone jar.
1372    =================================================================== -->
1373      <target name="errorprone"
1374              depends="clean, configure-compiler"
1375              description="Run errorprone over jsr166 source code (experimental)">
1376    
1377        <local name="destdir"/>
1378        <property name="destdir" value="${build.classes.dir}/java.base"/>
1379        <mkdir dir="${destdir}"/>
1380    
1381        <javac srcdir="${src.dir}"
1382               destdir="${destdir}"
1383               debug="${build.debug}"
1384               debuglevel="${build.debuglevel}"
1385               deprecation="${build.deprecation}"
1386               classpath=""
1387               includeAntRuntime="false"
1388               includeJavaRuntime="false"
1389               encoding="ASCII"
1390               executable="${build.main.javac}"
1391               fork="true">
1392    
1393          <include name="**/*.java"/>
1394          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1395          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1396          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1397          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1398          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1399          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1400          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1401          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1402          <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403          <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1404          <compilerarg value="-Xplugin:ErrorProne
1405                              -Xep:IdentityBinaryExpression:WARN
1406                              -Xep:MissingOverride:OFF
1407                              -Xep:MixedArrayDimensions:WARN
1408                              -Xep:RemoveUnusedImports:ERROR
1409                              -Xep:ClassName:ERROR
1410                              -Xep:MultipleTopLevelClasses:ERROR
1411                              -Xep:EmptyIf:ERROR
1412                              -Xep:LongLiteralLowerCaseSuffix:ERROR
1413                              -Xep:ArgumentParameterSwap:ERROR
1414                              -Xep:RedundantThrows:ERROR
1415                              -Xep:MethodCanBeStatic:WARN"/>
1416          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1417          <compilerarg value="-Xprefer:source"/>
1418          <compilerarg value="-XDignore.symbol.file=true"/>
1419          <compilerarg value="-Xlint:all"/>
1420          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1421          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1422          <compilerarg line="${build.args}"/>
1423        </javac>
1424    
1425        <jar destfile="${product.jar}">
1426          <fileset dir="${destdir}"/>
1427        </jar>
1428    
1429        <run-tck-tests
1430          target="${build.main.java.version}"
1431          workdir="${build.dir}"
1432          classes="${product.jar}">
1433          <javac-elements>
1434            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1435            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1436            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1437            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1438            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1439            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1440            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1441            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1442            <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443            <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1444            <compilerarg value="-Xplugin:ErrorProne
1445                                -Xep:IdentityBinaryExpression:WARN
1446                                -Xep:BoxedPrimitiveConstructor:OFF
1447                                -Xep:HashtableContains:OFF
1448                                -Xep:ModifyingCollectionWithItself:OFF
1449                                -Xep:MissingOverride:OFF
1450                                -Xep:MixedArrayDimensions:WARN
1451                                -Xep:RemoveUnusedImports:ERROR
1452                                -Xep:ClassName:ERROR
1453                                -Xep:MultipleTopLevelClasses:ERROR
1454                                -Xep:EmptyIf:ERROR
1455                                -Xep:LongLiteralLowerCaseSuffix:ERROR
1456                                -Xep:ArgumentParameterSwap:ERROR
1457                                -Xep:RedundantThrows:ERROR
1458                                -Xep:MethodCanBeStatic:WARN"/>
1459            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1460          </javac-elements>
1461        </run-tck-tests>
1462      </target>
1463    
1464    
1465    <!-- ==============================================================
1466      Running guava tests against jsr166 code
1467    =================================================================== -->
1468    
1469    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1470    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1471    <!-- <property name="guava.version" value="21.0"/> -->
1472    
1473    <!-- HOWTO debug print a path id -->
1474    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1475    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1476    
1477    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1478    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1479    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1480    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1481    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1482    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1483    
1484    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1485    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1486    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1487    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1488    
1489    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1490    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1491    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1492    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1493    
1494    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1495    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1496    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1497    
1498      <target name="init-ivy">
1499        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1500             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1501        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1502                 classpath="${build.dir}/ivy.jar"/>
1503      </target>
1504    
1505      <target name="guava-tests" depends="jar, init-ivy"
1506              description="Guava tests run against jsr166 collections">
1507        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1508        <mkdir dir="${guava.dir}"/>
1509        <ivy:retrieve pathid="guava.testlib.classpath"
1510          type="jar,bundle" inline="true" conf="default,master"
1511          pattern="${guava.dir}/[artifact].[ext]"
1512          organisation="com.google.guava" module="guava-testlib"/>
1513        <property name="guava.version" value="21.0"/>
1514        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1515             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1516        <junit printsummary="true" showoutput="true" haltonfailure="true"
1517               jvm="${java9}" fork="true">
1518          <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1519          <formatter type="brief"/>
1520          <classpath>
1521            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1522            <path refid="guava.testlib.classpath"/>
1523          </classpath>
1524    
1525          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1526          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1527        </junit>
1528      </target>
1529    
1530  </project>  </project>

Legend:
Removed from v.1.208  
changed lines
  Added in v.1.243

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27