/[cvs]/jsr166/build.xml

Diff of /jsr166/build.xml

Parent Directory | Revision Log | View Patch Patch

-revision 1.268 by jsr166,
Wed Mar 21 20:19:24 2018 UTC
+revision 1.283 by jsr166,
Wed Oct 24 22:31:14 2018 UTC
 Line 23
    $HOME/jdk/jdk9
    $HOME/jdk/jdk10
    $HOME/jdk/jdk11
+   $HOME/jdk/jdk12
    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
    where each of the above is a complete JDK source tree
    (e.g. mercurial forest) or a symlink to same.
-Line 104
+Line 106
      <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 138
    <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 150
    <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 197
    <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"/> -->
+   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
    <!-- Default jdk doc location (latest stable release seems best) -->
+   <!-- But pin to jdk 10 until fix for -->
+   <!-- 8211194: javadoc -link doesn't take module path into consideration -->
    <property name="java.docroot.url"   value="${java10.docroot.url}"/>
    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
-Line 208
+Line 216
    <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 249
      <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 330
      </sequential>
    </macrodef>
+   <defjtregtests v="12"/>
    <defjtregtests v="11"/>
    <defjtregtests v="10"/>
    <defjtregtests v="9"/>
-Line 346
+Line 356
      <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 391
    <!-- Main targets -->
-   <property name="build.main.java.version" value="9"/>
+   <property name="build.main.java.version" value="11"/>
    <!-- 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}}"/>
-       <!-- Force javadoc version to be at least 10,
+       <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
-            so we can use override-methods=summary -->
+       <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
        <condition property="build.main.javadoc"
-                  value="${javadoc11}"
+                  value="${javadoc12}"
                   else="${javadoc@{v}}">
-         <equals arg1="@{v}" arg2="9"/>
+         <matches pattern="^(9|10|11)$" string="@{v}"/>
        </condition>
      </sequential>
    </macrodef>
-Line 402
+Line 412
    <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 473
+Line 481
  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
      <javadoc destdir="${docs.dir}"
               packagenames="none"
-              link="${java9.api.url}"
+              link="${java11.api.url}"
               overview="${src.dir}/intro.html"
               access="${build.javadoc.access}"
               sourcepath="${src.dir}"
               classpath=""
-              source="9"
+              source="11"
               executable="${build.main.javadoc}">
        <fileset dir="${src.dir}" defaultexcludes="yes">
          <include name="**/*.java"/>
        </fileset>
-       <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+       <arg line="-Xdocrootparent ${java10.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="--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 514
            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 608
+Line 594
  <!--   </target> -->
-   <target name="test91011"
+   <target name="test9101112"
            description="Runs tck and jtreg tests for src/main for multiple java versions">
      <antcall target="clean"/>
      <antcall target="test">
        <param name="build.main.java.version" value="9"/>
+       <param name="build.main.java" value="${java9}"/>
+       <param name="build.main.javac" value="${javac9}"/>
      </antcall>
      <antcall target="clean"/>
      <antcall target="test">
        <param name="build.main.java.version" value="10"/>
+       <param name="build.main.java" value="${java10}"/>
+       <param name="build.main.javac" value="${javac10}"/>
      </antcall>
      <antcall target="clean"/>
      <antcall target="test">
        <param name="build.main.java.version" value="11"/>
+       <param name="build.main.java" value="${java11}"/>
+       <param name="build.main.javac" value="${javac11}"/>
+     </antcall>
+     <antcall target="clean"/>
+     <antcall target="test">
+       <param name="build.main.java.version" value="12"/>
+       <param name="build.main.java" value="${java12}"/>
+       <param name="build.main.javac" value="${javac12}"/>
+     </antcall>
+     <antcall target="docs">
+       <param name="build.main.java.version" value="12"/>
+       <param name="build.main.java" value="${java12}"/>
+       <param name="build.main.javac" value="${javac12}"/>
+       <param name="build.main.javadoc" value="${javadoc12}"/>
      </antcall>
      <!-- Clean up to avoid obscure wrong class file version bugs -->
-Line 1372
+Line 1377
  <!-- Find buglets that can be detected by static build tools -->
-   <target name="lint">
+ <!--   <target name="lint"> -->
-     <antcall target="dists">
+ <!--     <antcall target="dists"> -->
-       <param name="build.javadoc.access" value="public"/>
+ <!--       <param name="build.javadoc.access" value="protected"/> -->
-     </antcall>
+ <!--     </antcall> -->
-   </target>
+ <!--   </target> -->
  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
-   <target name="lint-private">
+   <target name="doclint-private">
      <antcall target="dist">
        <param name="build.javadoc.access" value="private"/>
      </antcall>
-Line 1387
+Line 1392
  <!-- ==============================================================
-   Experimental errorprone support - http://errorprone.info
+   Experimental errorprone support - https://errorprone.info
  =================================================================== -->
-   <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+   <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
    <property name="errorprone.jsr166.user.flags" value=""/>
    <property name="errorprone.jsr166.flags"
              value="-Xep:HashtableContains:OFF
-Line 1433
+Line 1438
             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="-Xplugin:ErrorProne
-Line 1455
+Line 1462
        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 value="-Xplugin:ErrorProne
-Line 1483
+Line 1492
          <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.268
 


changed lines


 
Added in v.1.283
 Legend:



Removed from v.1.268
 


changed lines


 
Added in v.1.283
-Removed from v.1.268
+Added in v.1.283

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