/[cvs]/jsr166/build.xml

Diff of /jsr166/build.xml

Parent Directory | Revision Log | View Patch Patch

-revision 1.269 by jsr166,
Wed Mar 21 23:10:39 2018 UTC
+revision 1.293 by jsr166,
Thu Dec 13 01:15:07 2018 UTC
 Line 1
  <project name="jsr166" default="usage"
    xmlns:if="ant:if"
    xmlns:unless="ant:unless"
    xmlns:ivy="antlib:org.apache.ivy.ant">
 Line 23
    $HOME/jdk/jdk9
    $HOME/jdk/jdk10
    $HOME/jdk/jdk11
+   $HOME/jdk/jdk12
+   $HOME/jdk/jdk13
    where each of the above is a JDK or a symlink to same, and
    $HOME/jdk/src/jdk8
    $HOME/jdk/src/jdk9
    $HOME/jdk/src/jdk10
    $HOME/jdk/src/jdk11
+   $HOME/jdk/src/jdk12
+   $HOME/jdk/src/jdk13
    where each of the above is a complete JDK source tree
    (e.g. mercurial forest) or a symlink to same.
    Alternatively, define ant variables thus:
    ant -Djdk$N.home=... -Djdk$N.src.home=...
-   for $N in 8 9 10 ...
+   for $N in 8 .. 13 ...
    As of 2016-03, the sources in src/main are for jdk9+ only.
  ------------------------------------------------------------------------------
-Line 53
+Line 57
    <!-- Compilation options -->
-   <property name="build.sourcelevel"    value="6"/>
    <property name="build.debug"          value="true"/>
    <property name="build.debuglevel"     value="source,lines,vars"/>
    <property name="build.deprecation"    value="false"/>
-Line 104
+Line 107
      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
        unless:set="have.java.base"/>
      <local name="modules"/>
-     <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
+     <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
      <local name="boot.jar.dir"/>
      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
      <path id="bootclasspath@{v}" unless:set="modules">
-Line 136
+Line 139
    <defjdklocations v="9"/>
    <defjdklocations v="10"/>
    <defjdklocations v="11"/>
+   <defjdklocations v="12"/>
    <!-- Source locations -->
    <property name="src.dir"              location="${basedir}/src/main"/>
-Line 147
+Line 151
    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
+   <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
    <property name="lib.dir"              location="${basedir}/lib"/>
    <property name="dist.dir"             location="${basedir}/dist"/>
-Line 193
+Line 198
    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
+   <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
    <!-- The location of jdk early access docs (RIP) -->
    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
-   <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
+   <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
-   <!-- Default jdk doc location (latest stable release seems best) -->
+   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
-   <property name="java.docroot.url"   value="${java10.docroot.url}"/>
+   <!-- Default jdk doc location (latest stable LTS release seems best) -->
+   <property name="java.docroot.url"   value="${java11.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 208
+Line 215
    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
+   <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
    <!-- Define the "jtreg" task -->
-Line 240
+Line 248
      <local name="modules"/>
      <condition property="modules">
-       <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
+       <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
      </condition>
      <local name="use-doclint"/>
-Line 321
+Line 329
      </sequential>
    </macrodef>
+   <defjtregtests v="12"/>
    <defjtregtests v="11"/>
    <defjtregtests v="10"/>
    <defjtregtests v="9"/>
-Line 331
+Line 340
    <property name="jtreg.flags" value=""/>
    <macrodef name="run-jtreg-tests">
-     <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
+     <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
      <attribute name="target"/>
      <attribute name="workdir"/>
      <attribute name="classes"/>
-Line 346
+Line 355
      <local name="modules"/>
      <condition property="modules">
-       <available file="${jdk@{target}.home}/jmods" type="dir"/>
+       <available file="${jdk@{target}.home}/lib/modules" type="file"/>
      </condition>
      <delete dir="@{workdir}/JTwork"   quiet="true"/>
-Line 381
+Line 390
    <!-- Main targets -->
-   <property name="build.main.java.version" value="9"/>
+   <!-- Default values: may seem strange ... -->
-   <!-- Workaround "no nested properties in ant" -->
+   <!-- At runtime, target latest LTS, i.e. jdk11 -->
-   <macrodef name="define-build-main-properties">
+   <!-- But at build time, target jdk9, for maximal binary portability -->
-     <attribute name="v"/>
+   <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
-     <sequential>
+     o override-methods=summary
-       <property name="build.main.java"    value="${java@{v}}"/>
+     o {@systemProperty ...}
-       <property name="build.main.javac"   value="${javac@{v}}"/>
+     o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
-       <!-- Force javadoc version to be at least 10,
+     o 8202628: javadoc generates bad links in TestModules.java
-            so we can use override-methods=summary -->
+     -->
-       <condition property="build.main.javadoc"
+   <property name="java.runtime.target" value="11"/>
-                  value="${javadoc11}"
+   <property name="build.main.java" value="${java11}"/>
-                  else="${javadoc@{v}}">
+   <property name="build.main.javac" value="${javac9}"/>
-         <equals arg1="@{v}" arg2="9"/>
+   <property name="build.main.javadoc" value="${javadoc12}"/>
-       </condition>
+   <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
-     </sequential>
-   </macrodef>
-   <define-build-main-properties v="${build.main.java.version}"/>
    <target name="dists"
            depends="dist, 4jdk8dist"
            description="Builds all public jars and docs"/>
-           <!--
+           <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
-               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
-           -->
    <target name="compile"
            depends="configure-compiler"
-Line 431
+Line 435
        <compilerarg value="--patch-module=java.base=${src.dir}"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
-       <compilerarg value="-Xlint:all"/>
+       <compilerarg value="-Xlint:all,-removal"/>
        <compilerarg line="--doclint-format html5"/>
        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
        <compilerarg value="-Werror"/>
-Line 473
+Line 477
  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
      <javadoc destdir="${docs.dir}"
               packagenames="none"
-              link="${java9.api.url}"
+              link="${java.api.url}"
               overview="${src.dir}/intro.html"
               access="${build.javadoc.access}"
               sourcepath="${src.dir}"
               classpath=""
-              source="9"
+              source="${build.main.javadoc.source}"
               executable="${build.main.javadoc}">
+ <!-- TODO: JDK-8214571 failonerror = "true" -->
        <fileset dir="${src.dir}" defaultexcludes="yes">
          <include name="**/*.java"/>
        </fileset>
-       <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+       <arg line="-Xdocrootparent ${java.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}"/>
+ <!-- old school frames via docs/index.html?overview-summary.html -->
+       <arg value="--frames"/>
        <arg value="--override-methods=summary"/>
        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
- <!-- @apiNote tag currently unused -->
+       <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
- <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
  <!-- tags added in jdk9: currently unused -->
  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
-Line 506
+Line 512
            description="Puts all distributable products in single hierarchy"/>
-   <target name="release"
-           depends="dist"
-           description="Puts entire CVS tree, plus distribution productions, in a jar">
-     <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
-     <jar basedir="${basedir}" destfile="${release.jar}">
-       <!-- <exclude name="build/**"/> -->
-       <exclude name="${release.jar}"/>
-       <exclude name="user.properties"/>
-       <exclude name="etc/notes/**"/>
-       <exclude name="src/emulation/**"/>
-       <exclude name="**/SyntaxTest.java"/>
-       <exclude name="**/SuperfluousAbstract.java"/>
-       <manifest>
-         <attribute name="Built-By" value="${user.name}"/>
-         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
-       </manifest>
-     </jar>
-   </target>
    <target name="clean"
            description="Removes all build products">
      <delete dir="${build.dir}"/>
-Line 556
+Line 540
            description="Runs tck tests for src/main directly">
      <run-tck-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}">
        <javac-elements>
-Line 590
+Line 574
            depends="jar"
            description="Runs jtreg tests for src/main using the jtreg ant task">
      <run-jtreg-tests
-        target="${build.main.java.version}"
+        target="${java.runtime.target}"
         workdir="${build.dir}"
         classes="${product.jar}"/>
    </target>
-Line 599
+Line 583
            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
            description="Runs tck and jtreg tests for src/main"/>
- <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
+   <target name="test-version-permutations"
+           depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
- <!--     <antcall target="jtreg"> -->
+   </target>
- <!--       <param name="build.main.java.version" value="8"/> -->
- <!--       <param name="build.main.javac" value="${javac8}"/> -->
- <!--     </antcall> -->
- <!--   </target> -->
-   <target name="test91011"
-           description="Runs tck and jtreg tests for src/main for multiple java versions">
+   <target name="test9">
      <antcall target="clean"/>
-     <antcall target="test">
+     <antcall>
-       <param name="build.main.java.version" value="9"/>
+       <param name="java.runtime.target" value="9"/>
+       <param name="build.main.javac" value="${javac9}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
+       <param name="build.main.javadoc.source" value="9"/>
+       <target name="test"/>
+       <target name="docs"/>
      </antcall>
+   </target>
+   <target name="test10">
      <antcall target="clean"/>
-     <antcall target="test">
+     <antcall>
-       <param name="build.main.java.version" value="10"/>
+       <param name="java.runtime.target" value="10"/>
+       <param name="build.main.javac" value="${javac10}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
+       <param name="build.main.javadoc.source" value="10"/>
+       <target name="test"/>
+       <target name="docs"/>
      </antcall>
+   </target>
+   <target name="test11">
      <antcall target="clean"/>
-     <antcall target="test">
+     <antcall>
-       <param name="build.main.java.version" value="11"/>
+       <param name="java.runtime.target" value="11"/>
+       <param name="build.main.javac" value="${javac11}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
+       <param name="build.main.javadoc.source" value="11"/>
+       <target name="test"/>
+       <target name="docs"/>
      </antcall>
+   </target>
-     <!-- Clean up to avoid obscure wrong class file version bugs -->
+   <target name="test12">
      <antcall target="clean"/>
+     <antcall>
+       <param name="java.runtime.target" value="12"/>
+       <param name="build.main.javac" value="${javac12}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
+       <param name="build.main.javadoc.source" value="12"/>
+       <target name="test"/>
+       <target name="docs"/>
+     </antcall>
+   </target>
+   <target name="test9-11">
+     <antcall target="clean"/>
+     <antcall>
+       <param name="java.runtime.target" value="11"/>
+       <param name="build.main.javac" value="${javac9}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
+       <param name="build.main.javadoc.source" value="9"/>
+       <target name="test"/>
+       <target name="docs"/>
+     </antcall>
    </target>
+   <target name="test9-12">
+     <antcall target="clean"/>
+     <antcall>
+       <param name="java.runtime.target" value="12"/>
+       <param name="build.main.javac" value="${javac9}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
+       <param name="build.main.javadoc.source" value="9"/>
+       <target name="test"/>
+       <target name="docs"/>
+     </antcall>
+   </target>
    <target name="configure-compiler">
-Line 653
+Line 680
    </target>
-   <!-- Various demos and test programs -->
-   <!-- description="Benchmark from Doug Lea's AQS paper" -->
-   <target name="loops" depends="configure-compiler">
-     <mkdir dir="${build.loops.dir}"/>
-     <javac srcdir="${loops.src.dir}"
-           destdir="${build.loops.dir}"
-             debug="${build.debug}"
-        debuglevel="${build.debuglevel}"
-       deprecation="${build.deprecation}"
-            source="${build.sourcelevel}"
-            target="${build.sourcelevel}"
-          encoding="ASCII"
-              fork="true">
-       <compilerarg line="${build.args}"/>
-       <classpath refid="loops.classpath"/>
-       <compilerarg value="-XDignore.symbol.file=true"/>
-     </javac>
-     <java classname="ALoops" fork="true">
-       <classpath refid="loops.classpath"/>
-     </java>
-   </target>
    <target name="compile-test-loops" depends="jar"
            description="Compiles all the perf tests in src/test/loops">
-Line 1387
+Line 1383
  <!-- ==============================================================
-   Experimental errorprone support - http://errorprone.info
+   Experimental errorprone support
+   https://errorprone.info
+   https://errorprone.info/docs/installation
+   https://github.com/google/error-prone/issues/1143
  =================================================================== -->
-   <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+   <path id="errorprone.processorpath.path">
+     <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
+     <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
+     <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
+     <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
+   </path>
+   <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
    <property name="errorprone.jsr166.user.flags" value=""/>
    <property name="errorprone.jsr166.flags"
              value="-Xep:HashtableContains:OFF
                     -Xep:JdkObsolete:OFF
                     -Xep:MissingOverride:OFF
                     -Xep:MissingFail:OFF
+                    -Xep:ThreadPriorityCheck:OFF
                     -Xep:MixedArrayDimensions:ERROR
                     -Xep:RemoveUnusedImports:ERROR
                     -Xep:EmptyIf:ERROR
-Line 1404
+Line 1410
                     -Xep:LongLiteralLowerCaseSuffix:ERROR
                     -Xep:RedundantThrows:ERROR
                     -Xep:IdentityBinaryExpression:WARN
+                    -Xep:ConstructorInvokesOverridable:WARN
                     -Xep:MethodCanBeStatic:WARN
                     ${errorprone.jsr166.user.flags}"/>
    <!-- -Xep:WildcardImport:ERROR -->
-Line 1433
+Line 1440
             fork="true">
        <include name="**/*.java"/>
+       <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+       <compilerarg value="-J--illegal-access=permit"/>
        <compilerarg value="-XDcompilePolicy=simple"/>
-       <compilerarg line="-processorpath ${errorprone.jar}"/>
+       <compilerarg value="-processorpath"/>
+       <compilerarg pathref="errorprone.processorpath.path"/>
        <compilerarg value="-Xplugin:ErrorProne
                            ${errorprone.jsr166.flags}"/>
        <compilerarg value="--patch-module=java.base=${src.dir}"/>
-Line 1451
+Line 1461
      </jar>
      <run-tck-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}">
        <javac-elements>
+         <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+         <compilerarg value="-J--illegal-access=permit"/>
          <compilerarg value="-XDcompilePolicy=simple"/>
-         <compilerarg line="-processorpath ${errorprone.jar}"/>
+         <compilerarg line="-processorpath ${errorprone.processorpath}"/>
          <compilerarg value="-Xplugin:ErrorProne
                              ${errorprone.jsr166.flags}
                              ${errorprone.jsr166.test.flags}"/>
-Line 1472
+Line 1484
            description="Run errorprone over jtreg tests (experimental)">
      <run-jtreg-tests
-        target="${build.main.java.version}"
+        target="${java.runtime.target}"
         workdir="${build.dir}"
         classes="${product.jar}"
         verbose="all">
        <jtreg-elements>
          <arg value="-javacoption:-XDcompilePolicy=simple"/>
          <arg value="-javacoption:-processorpath"/>
-         <arg value="-javacoption:${errorprone.jar}"/>
+         <arg value="-javacoption:${errorprone.processorpath}"/>
          <arg value="-javacoption:-Xplugin:ErrorProne
                              ${errorprone.jsr166.flags}
                              ${errorprone.jsr166.test.flags}
+                             -Xep:MultipleTopLevelClasses:WARN
                              -Xep:NonAtomicVolatileUpdate:OFF"/>
        </jtreg-elements>
      </run-jtreg-tests>

 Legend:



Removed from v.1.269
 


changed lines


 
Added in v.1.293
 Legend:



Removed from v.1.269
 


changed lines


 
Added in v.1.293
-Removed from v.1.269
+Added in v.1.293

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