/[cvs]/jsr166/build.xml

Diff of /jsr166/build.xml

Parent Directory | Revision Log | View Patch Patch

-revision 1.234 by jsr166,
Sat Feb 18 18:33:42 2017 UTC
+revision 1.259 by jsr166,
Mon Dec 18 21:07:18 2017 UTC
 Line 18
    itself.  Because the JDK version matters and because different
    targets require different JDKs, we assume that users have created a
    hierarchy containing:
-   $HOME/jdk/jdk7
    $HOME/jdk/jdk8
    $HOME/jdk/jdk9
    $HOME/jdk/jdk10
    where each of the above is a JDK or a symlink to same, and
-   $HOME/jdk/src/jdk7
    $HOME/jdk/src/jdk8
    $HOME/jdk/src/jdk9
    $HOME/jdk/src/jdk10
-Line 32
+Line 30
    Alternatively, define ant variables thus:
    ant -Djdk$N.home=... -Djdk$N.src.home=...
-   for $N in 7 8 9 10 ...
+   for $N in 8 9 10 ...
    As of 2016-03, the sources in src/main are for jdk9+ only.
  ------------------------------------------------------------------------------
-Line 183
+Line 181
    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
-   <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
+   <!-- Switched to https: in 2017-10 - JDK-8190312 -->
-   <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
+   <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
-   <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
+   <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
-   <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
+   <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
-   <!-- The expected canonical location does not yet exist as of 2016-04 -->
+   <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
-   <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
+   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
-   <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
+   <!-- The location of jdk9 early access docs (RIP) -->
+   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
    <!-- Default jdk doc location (latest stable release seems best) -->
-   <property name="java.docroot.url"       value="${java8.docroot.url}"/>
+   <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
+   <property name="java.docroot.url"   value="${java9.docroot.url}"/>
    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
 Line 199
    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
+   <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
    <!-- Define the "jtreg" task -->
-Line 234
+Line 235
        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
      </condition>
+     <local name="use-doclint"/>
+     <condition property="use-doclint">
+       <not> <equals arg1="@{target}" arg2="7"/> </not>
+     </condition>
      <mkdir dir="@{workdir}/tck-classes"/>
      <javac srcdir="@{tck.src.dir}"
-Line 253
+Line 259
        <include name="*.java"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
+       <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
        <compilerarg line="${build.args}"/>
-Line 292
+Line 299
    </macrodef>
    <!-- Define jtreg test sets for different jdk versions -->
+   <fileset dir="${jtreg10.src.dir}">
+     <patternset id="jdk10.jtreg.tests">
+       <include name="**/*.java"/>
+     </patternset>
+   </fileset>
    <fileset dir="${jtreg9.src.dir}">
      <patternset id="jdk9.jtreg.tests">
        <include name="**/*.java"/>
-Line 315
+Line 328
    <macrodef name="run-jtreg-tests">
      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
-     <attribute name="source" default="7"/>
      <attribute name="target"/>
      <attribute name="workdir"/>
      <attribute name="classes"/>
+     <attribute name="verbose" default="${jtreg.verbose}"/>
      <attribute name="jtregflags" default=""/>
+     <element name="jtreg-elements" optional="true"/>
      <sequential>
-Line 337
+Line 351
             workDir="@{workdir}/JTwork">
        <patternset refid="jdk@{target}.jtreg.tests"/>
        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-       <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
+       <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
-       <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
+       <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
        <arg value="-agentvm"/>
        <arg value="-noreport"/>
-       <arg value="-verbose:${jtreg.verbose}"/>
+       <arg value="-verbose:@{verbose}"/>
        <arg value="-vmoptions:-esa -ea"/>
        <arg value="-automatic"/>
        <arg value="-k:!ignore"/>
        <arg line="@{jtregflags}"/>
        <arg line="${jtreg.flags}"/>
+       <jtreg-elements/>
      </jtreg>
      </sequential>
    </macrodef>
-Line 363
+Line 378
    <!-- Main targets -->
    <property name="build.main.java.version" value="9"/>
-   <property name="build.main.javac" value="${javac9}"/>
+   <!-- Workaround "no nested properties in ant" -->
+   <macrodef name="define-build-main-properties">
+     <attribute name="v"/>
+     <sequential>
+       <property name="build.main.java"    value="${java@{v}}"/>
+       <property name="build.main.javac"   value="${javac@{v}}"/>
+       <property name="build.main.javadoc" value="${javadoc@{v}}"/>
+     </sequential>
+   </macrodef>
+   <define-build-main-properties v="${build.main.java.version}"/>
    <target name="dists"
-           depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+           depends="dist, 4jdk8dist"
            description="Builds all public jars and docs"/>
+           <!--
+               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+           -->
    <target name="compile"
            depends="configure-compiler"
            description="Compiles src/main sources to build dir">
-     <local name="modules"/>
-     <condition property="modules">
-       <and>
-         <available file="${jdk9.home}/jmods" type="dir"/>
-         <equals arg1="9" arg2="${build.main.java.version}"/>
-       </and>
-     </condition>
      <local name="destdir"/>
-     <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
+     <property name="destdir" value="${build.classes.dir}/java.base"/>
-     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
      <mkdir dir="${destdir}"/>
-Line 400
+Line 418
             fork="true">
        <include name="**/*.java"/>
-       <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
+       <compilerarg value="--patch-module=java.base=${src.dir}"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all"/>
+       <compilerarg line="--doclint-format html5"/>
+       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
        <compilerarg value="-Werror"/>
-       <compilerarg value="-Xdoclint:all/protected"/>
        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
        <compilerarg line="${build.args}"/>
-Line 449
+Line 468
               access="${build.javadoc.access}"
               sourcepath="${src.dir}"
               classpath=""
-              executable="${javadoc9}">
+              source="9"
+              executable="${build.main.javadoc}">
        <fileset dir="${src.dir}" defaultexcludes="yes">
          <include name="**/*.java"/>
        </fileset>
        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
        <arg value="-XDignore.symbol.file=true"/>
+       <arg value="-html5"/>
        <arg value="--patch-module=java.base=${src.dir}"/>
        <arg value="-tag"/>
        <arg value="${javadoc.jls.option}"/>
-Line 504
+Line 525
    <target name="clean"
            description="Removes all build products">
      <delete dir="${build.dir}"/>
    </target>
    <target name="dist-clean"
            description="Removes all build and distribution products">
      <delete dir="${build.dir}"/>
      <delete dir="${dist.dir}"/>
    </target>
-Line 536
+Line 553
      <run-tck-tests
        target="${build.main.java.version}"
        workdir="${build.dir}"
-       classes="${product.jar}"/>
+       classes="${product.jar}">
+       <javac-elements>
+         <compilerarg value="-Werror"/>
+       </javac-elements>
+     </run-tck-tests>
    </target>
    <target name="tck-parallelism-1"
-Line 571
+Line 592
    <target name="test"
            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
-           description="Runs tck and jtreg tests for src/main">
+           description="Runs tck and jtreg tests for src/main"/>
-   </target>
  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
-Line 583
+Line 603
  <!--   </target> -->
- <!--   <target name="test89" -->
+   <target name="test910"
- <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
+           description="Runs tck and jtreg tests for src/main for multiple java versions">
- <!--     <antcall target="clean"/> -->
+     <antcall target="clean"/>
- <!--     <antcall target="test"> -->
+     <antcall target="test">
- <!--       <param name="build.main.java.version" value="8"/> -->
+       <param name="build.main.java.version" value="9"/>
- <!--       <param name="build.main.javac" value="${javac8}"/> -->
+     </antcall>
- <!--     </antcall> -->
- <!--     <antcall target="clean"/> -->
+     <antcall target="clean"/>
- <!--     <antcall target="test"> -->
+     <antcall target="test">
- <!--       <param name="build.main.java.version" value="9"/> -->
+       <param name="build.main.java.version" value="10"/>
- <!--       <param name="build.main.javac" value="${javac9}"/> -->
+     </antcall>
- <!--     </antcall> -->
- <!--   </target> -->
+     <!-- Clean up to avoid obscure wrong class file version bugs -->
+     <antcall target="clean"/>
+   </target>
    <target name="configure-compiler">
      <fail message="ant version too old">
-       <condition>
+       <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
-         <not> <antversion atleast="1.9.1"/> </not>
-       </condition>
      </fail>
      <property name="unchecked.option" value="-Xlint:unchecked"/>
-Line 652
+Line 671
      <java classname="ALoops" fork="true">
        <classpath refid="loops.classpath"/>
      </java>
    </target>
    <target name="compile-test-loops" depends="jar"
-           description="compile all the perf tests in src/test/loops">
+           description="Compiles all the perf tests in src/test/loops">
      <mkdir dir="${build.dir}/test/loops"/>
-Line 669
+Line 687
             includeAntRuntime="false"
             includeJavaRuntime="false"
             encoding="ASCII"
-            executable="${javac9}"
+            executable="${build.main.javac}"
             fork="true">
        <include name="*.java"/>
-Line 677
+Line 695
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-Line 705
+Line 721
             encoding="ASCII"
             executable="${javac8}"
             fork="true">
        <include name="**/*.java"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-Line 736
+Line 750
             encoding="ASCII"
             executable="${javac8}"
             fork="true">
        <include name="**/*.java"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all"/>
-       <compilerarg value="-Xdoclint:all/protected"/>
+       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-Line 759
+Line 771
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
-Line 775
+Line 786
          <!-- JDK9+ test classes -->
          <exclude name="*9Test.java"/>
          <exclude name="*10Test.java"/>
+         <compilerarg value="-Werror"/>
        </javac-elements>
      </run-tck-tests>
    </target>
-Line 792
+Line 804
    <target name="4jdk8-test"
            depends="4jdk8-tck, 4jdk8-jtreg"
-           description="Runs tck and jtreg tests for jsr166-4jdk8">
+           description="Runs tck and jtreg tests for jsr166-4jdk8"/>
-   </target>
    <target name="4jdk8docs"
-Line 809
+Line 820
               access="${build.javadoc.access}"
               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
               classpath=""
+              source="8"
               executable="${javadoc8}"
               failonerror = "true">
        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
-Line 836
+Line 848
    <target name="4jdk8clean"
            description="Removes all 4jdk8 build products">
      <delete dir="${build.4jdk8.dir}"/>
    </target>
-Line 854
+Line 864
    </target>
+   <!-- jsr166 4jdk7 (no longer maintained) -->
-   <!-- jsr166 4jdk7 -->
+   <target name="4jdk7compile" depends="configure-compiler">
-   <target name="4jdk7compile"
-           depends="configure-compiler"
-           description="Compiles src/jdk7 sources, targeting jdk7">
      <mkdir dir="${build.4jdk7.classes.dir}"/>
      <javac srcdir="${4jdk7src.dir}"
-Line 884
+Line 890
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-   <target name="4jdk7doclint"
+   <target name="4jdk7doclint" depends="configure-compiler">
-           depends="configure-compiler"
-           description="Finds doclint warnings">
      <mkdir dir="${build.4jdk7.classes.dir}"/>
      <javac srcdir="${4jdk7src.dir}"
-Line 915
+Line 917
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Xdoclint:all/protected"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="4jdk7jar" depends="4jdk7compile">
-   <target name="4jdk7jar"
-           depends="4jdk7compile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${4jdk7product.jar}">
        <fileset dir="${build.4jdk7.classes.dir}"/>
        <manifest>
-Line 931
+Line 928
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="4jdk7-tck" depends="4jdk7jar">
-   <target name="4jdk7-tck"
-           depends="4jdk7jar"
-           description="Runs tck tests for jsr166-4jdk7 directly">
      <run-tck-tests
        target="7"
        workdir="${build.4jdk7.dir}"
-Line 956
+Line 948
          <exclude name="SplittableRandomTest.java"/>
          <exclude name="StampedLockTest.java"/>
          <exclude name="SubmissionPublisherTest.java"/>
+         <compilerarg value="-Werror"/>
        </javac-elements>
      </run-tck-tests>
    </target>
    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
-   <target name="4jdk7-tck-junit"
+   <target name="4jdk7-tck-junit" depends="4jdk7compile">
-           depends="4jdk7compile">
      <junit printsummary="true"
             showoutput="true"
-Line 985
+Line 976
        <test name="${jsr166.tckTestClass}" haltonfailure="no">
        </test>
      </junit>
    </target>
-   <target name="4jdk7-jtreg"
+   <target name="4jdk7-jtreg" depends="4jdk7jar">
-           depends="4jdk7jar"
-           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
      <run-jtreg-tests
         target="7"
         workdir="${build.4jdk7.dir}"
         classes="${4jdk7product.jar}"/>
    </target>
+   <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
-   <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">
      <delete dir="${4jdk7docs.dir}"/>
      <mkdir dir="${4jdk7docs.dir}"/>
-Line 1028
+Line 1009
      </javadoc>
    </target>
+   <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
-   <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">
      <delete dir="${build.4jdk7.dir}"/>
    </target>
+   <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
-   <target name="4jdk7dist-jar"
-           depends="4jdk7clean, 4jdk7jar">
      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
    </target>
+   <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
-   <target name="4jdk7dist-docs"
-           depends="4jdk7clean, 4jdk7docs">
      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
    </target>
-   <!-- jsr166x -->
+   <!-- jsr166x (no longer maintained) -->
-   <target name="jsr166xcompile"
-           depends="configure-compiler"
-           description="Compiles jsr166x sources to build dir">
+   <target name="jsr166xcompile" depends="configure-compiler">
      <mkdir dir="${build.jsr166x.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1076
+Line 1043
             encoding="ASCII"
             executable="${javac7}"
             fork="true">
        <include name="jsr166x/**/*.java"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="jsr166xjar" depends="jsr166xcompile">
-   <target name="jsr166xjar"
-           depends="jsr166xcompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${jsr166x.jar}">
        <fileset dir="${build.jsr166x.classes.dir}"/>
        <manifest>
-Line 1098
+Line 1059
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="jsr166xdocs">
-   <target name="jsr166xdocs"
-           description="Builds javadocs to dist dir">
      <delete dir="${jsr166xdocs.dir}"/>
      <mkdir dir="${jsr166xdocs.dir}"/>
-Line 1119
+Line 1076
               failonerror = "true">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
-   <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">
      <delete dir="${build.jsr166x.dir}"/>
    </target>
+   <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
-   <target name="jsr166xdist-jar"
-           depends="jsr166xclean, jsr166xjar">
      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="jsr166xdist-docs"
+   <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
-           depends="jsr166xclean, jsr166xdocs">
      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
    </target>
-   <!-- jsr166y -->
-   <target name="jsr166ycompile"
+   <!-- jsr166y (no longer maintained) -->
-           depends="configure-compiler"
-           description="Compiles jsr166y sources">
+   <target name="jsr166ycompile" depends="configure-compiler">
      <mkdir dir="${build.jsr166y.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1176
+Line 1119
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="jsr166yjar" depends="jsr166ycompile">
-   <target name="jsr166yjar"
-           depends="jsr166ycompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${jsr166y.jar}" index="true">
        <fileset dir="${build.jsr166y.classes.dir}"/>
        <manifest>
-Line 1192
+Line 1130
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="jsr166ydocs">
-   <target name="jsr166ydocs"
-           description="Builds javadocs to dist dir">
      <delete dir="${jsr166ydocs.dir}"/>
      <mkdir dir="${jsr166ydocs.dir}"/>
-Line 1213
+Line 1147
               failonerror = "true">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
-   <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">
      <delete dir="${build.jsr166y.dir}"/>
    </target>
+   <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
-   <target name="jsr166ydist-jar"
-           depends="jsr166yclean, jsr166yjar">
      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="jsr166ydist-docs"
+   <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
-           depends="jsr166yclean, jsr166ydocs">
      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
    </target>
-   <!-- extra166y -->
+   <!-- extra166y (no longer maintained) -->
-   <target name="extra166ycompile"
-           depends="configure-compiler, jsr166yjar"
-           description="Compiles extra166y sources">
+   <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
      <mkdir dir="${build.extra166y.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1271
+Line 1190
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="extra166yjar" depends="extra166ycompile">
-   <target name="extra166yjar"
-           depends="extra166ycompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${extra166y.jar}" index="true">
        <fileset dir="${build.extra166y.classes.dir}"/>
        <manifest>
-Line 1287
+Line 1201
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="extra166ydocs">
-   <target name="extra166ydocs"
-           description="Builds javadocs to build dir">
      <delete dir="${extra166ydocs.dir}"/>
      <mkdir dir="${extra166ydocs.dir}"/>
-Line 1307
+Line 1217
               executable="${javadoc7}">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
-   <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">
      <delete dir="${build.extra166y.dir}"/>
    </target>
+   <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
-   <target name="extra166ydist-jar"
-           depends="extra166yclean, extra166yjar">
      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="extra166ydist-docs"
+   <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
-           depends="extra166yclean, extra166ydocs">
      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
    </target>
-   <!-- jsr166e -->
+   <!-- jsr166e (no longer maintained) -->
    <property name="build.jsr166e.java.version" value="6"/>
    <property name="build.jsr166e.javac" value="${javac6}"/>
-   <target name="jsr166ecompile"
+   <target name="jsr166ecompile" depends="configure-compiler">
-           depends="configure-compiler"
-           description="Compiles jsr166e sources">
      <mkdir dir="${build.jsr166e.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1364
+Line 1261
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-   <!-- jsr166e: find doclint errors -->
    <target name="jsr166edoclint">
      <mkdir dir="${build.jsr166e.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1392
+Line 1286
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg value="-Xdoclint:all/protected"/>
      </javac>
    </target>
+   <target name="jsr166ejar" depends="jsr166ecompile">
-   <target name="jsr166ejar"
-           depends="jsr166ecompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${jsr166e.jar}" index="true">
        <fileset dir="${build.jsr166e.classes.dir}"/>
        <manifest>
-Line 1408
+Line 1297
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="jsr166edocs">
-   <target name="jsr166edocs"
-           description="Builds javadocs to build dir">
      <delete dir="${jsr166edocs.dir}"/>
      <mkdir dir="${jsr166edocs.dir}"/>
-Line 1428
+Line 1313
               failonerror = "true">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
-   <target name="jsr166e-tck-one-java-version"
-           depends="jsr166ejar">
      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
      <run-tck-tests
        tck.src.dir="${test.src.dir}/tck-jsr166e"
        target="${build.jsr166e.java.version}"
-Line 1445
+Line 1325
        classes="${jsr166e.jar}"/>
    </target>
-   <target name="jsr166e-tck"
+   <target name="jsr166e-tck">
-           description="Runs tck tests for jsr166e for multiple java versions">
  <!--     <antcall target="clean"/> -->
  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
-Line 1467
+Line 1346
      </antcall>
    </target>
+   <target name="jsr166e-test" depends="jsr166e-tck"/>
-   <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"
+   <target name="jsr166eclean">
-           depends="jsr166edist-jar, jsr166edist-docs"
-           description="Puts all distributable products in single hierarchy"/>
-   <target name="jsr166eclean"
-           description="Removes all jsr166e build products">
      <delete dir="${build.jsr166e.dir}"/>
    </target>
    <target name="jsr166edist-jar"
            depends="jsr166eclean, jsr166ejar">
      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="jsr166edist-docs"
+   <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
-           depends="jsr166eclean, jsr166edocs">
      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
    </target>
-Line 1510
+Line 1379
      </antcall>
    </target>
+ <!-- ==============================================================
+   Experimental errorprone support - http://errorprone.info
+ =================================================================== -->
+   <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
+   <target name="errorprone"
+           depends="clean, configure-compiler"
+           description="Run errorprone over jsr166 source code (experimental)">
+     <local name="destdir"/>
+     <property name="destdir" value="${build.classes.dir}/java.base"/>
+     <mkdir dir="${destdir}"/>
+     <javac srcdir="${src.dir}"
+            destdir="${destdir}"
+            debug="${build.debug}"
+            debuglevel="${build.debuglevel}"
+            deprecation="${build.deprecation}"
+            classpath=""
+            includeAntRuntime="false"
+            includeJavaRuntime="false"
+            encoding="ASCII"
+            executable="${build.main.javac}"
+            fork="true">
+       <include name="**/*.java"/>
+       <compilerarg line="-processorpath ${errorprone.jar}"/>
+       <compilerarg value="-Xplugin:ErrorProne
+                           -Xep:IdentityBinaryExpression:WARN
+                           -Xep:MissingOverride:OFF
+                           -Xep:MixedArrayDimensions:ERROR
+                           -Xep:RemoveUnusedImports:ERROR
+                           -Xep:ClassName:ERROR
+                           -Xep:MultipleTopLevelClasses:ERROR
+                           -Xep:EmptyIf:ERROR
+                           -Xep:LongLiteralLowerCaseSuffix:ERROR
+                           -Xep:RedundantThrows:ERROR
+                           -Xep:MethodCanBeStatic:WARN"/>
+       <compilerarg value="--patch-module=java.base=${src.dir}"/>
+       <compilerarg value="-Xprefer:source"/>
+       <compilerarg value="-XDignore.symbol.file=true"/>
+       <compilerarg value="-Xlint:all"/>
+       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+       <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+       <compilerarg line="${build.args}"/>
+     </javac>
+     <jar destfile="${product.jar}">
+       <fileset dir="${destdir}"/>
+     </jar>
+     <run-tck-tests
+       target="${build.main.java.version}"
+       workdir="${build.dir}"
+       classes="${product.jar}">
+       <javac-elements>
+         <compilerarg line="-processorpath ${errorprone.jar}"/>
+         <compilerarg value="-Xplugin:ErrorProne
+                             -Xep:IdentityBinaryExpression:WARN
+                             -Xep:BoxedPrimitiveConstructor:OFF
+                             -Xep:HashtableContains:OFF
+                             -Xep:ModifyingCollectionWithItself:OFF
+                             -Xep:MissingOverride:OFF
+                             -Xep:MissingFail:OFF
+                             -Xep:JdkObsolete:OFF
+                             -Xep:MixedArrayDimensions:ERROR
+                             -Xep:RemoveUnusedImports:ERROR
+                             -Xep:ClassName:ERROR
+                             -Xep:MultipleTopLevelClasses:ERROR
+                             -Xep:EmptyIf:ERROR
+                             -Xep:LongLiteralLowerCaseSuffix:ERROR
+                             -Xep:RedundantThrows:ERROR
+                             -Xep:MethodCanBeStatic:WARN"/>
+         <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+       </javac-elements>
+     </run-tck-tests>
+   </target>
+   <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+   <target name="errorprone-jtreg"
+           depends="jar"
+           description="Run errorprone over jtreg tests (experimental)">
+     <run-jtreg-tests
+        target="${build.main.java.version}"
+        workdir="${build.dir}"
+        classes="${product.jar}"
+        verbose="all">
+       <jtreg-elements>
+         <arg value="-javacoption:-processorpath"/>
+         <arg value="-javacoption:${errorprone.jar}"/>
+         <arg value="-javacoption:-Xplugin:ErrorProne
+                             -Xep:IdentityBinaryExpression:WARN
+                             -Xep:BoxedPrimitiveConstructor:OFF
+                             -Xep:HashtableContains:OFF
+                             -Xep:ModifyingCollectionWithItself:OFF
+                             -Xep:MissingOverride:OFF
+                             -Xep:JdkObsolete:OFF
+                             -Xep:NonAtomicVolatileUpdate:OFF
+                             -Xep:MixedArrayDimensions:ERROR
+                             -Xep:RemoveUnusedImports:ERROR
+                             -Xep:ClassName:ERROR
+                             -Xep:MultipleTopLevelClasses:ERROR
+                             -Xep:EmptyIf:ERROR
+                             -Xep:LongLiteralLowerCaseSuffix:ERROR
+                             -Xep:RedundantThrows:ERROR
+                             -Xep:MethodCanBeStatic:WARN"/>
+       </jtreg-elements>
+     </run-jtreg-tests>
+   </target>
  <!-- ==============================================================
    Running guava tests against jsr166 code
  =================================================================== -->
-Line 1562
+Line 1543
      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
      <junit printsummary="true" showoutput="true" haltonfailure="true"
-            jvm="${java9}" fork="true">
+            jvm="${build.main.java}" fork="true">
-       <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
+       <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
        <formatter type="brief"/>
        <classpath>
          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

 Legend:



Removed from v.1.234
 


changed lines


 
Added in v.1.259
 Legend:



Removed from v.1.234
 


changed lines


 
Added in v.1.259
-Removed from v.1.234
+Added in v.1.259

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