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

Diff of /jsr166/build.xml

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

revision 1.273 by jsr166, Fri Jun 22 17:45:02 2018 UTC revision 1.302 by jsr166, Sun Aug 18 18:55:55 2019 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if"    xmlns:if="ant:if"
3    xmlns:unless="ant:unless"    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
# Line 20  Line 20 
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
   $HOME/jdk/jdk9  
   $HOME/jdk/jdk10  
23    $HOME/jdk/jdk11    $HOME/jdk/jdk11
24      $HOME/jdk/jdk12
25      $HOME/jdk/jdk13
26      $HOME/jdk/jdk14
27    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
28    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9  
   $HOME/jdk/src/jdk10  
29    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
30      $HOME/jdk/src/jdk12
31      $HOME/jdk/src/jdk13
32      $HOME/jdk/src/jdk14
33    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
35    
36    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
37    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
38    for $N in 8 9 10 ...    for $N in 8 .. 14 ...
39    
40    As of 2016-03, the sources in src/main are for jdk9+ only.    As of 2016-03, the sources in src/main are for jdk9+ only.
41      As of 2019-08, the sources in src/main are for jdk11+ only.
42  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
43    </description>    </description>
44    
# Line 53  Line 56 
56    
57    
58    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
59    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 104  Line 106 
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>        unless:set="have.java.base"/>
108      <local name="modules"/>      <local name="modules"/>
109      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 130  Line 132 
132      </sequential>      </sequential>
133    </macrodef>    </macrodef>
134    
   <defjdklocations v="6"/>  
   <defjdklocations v="7"/>  
135    <defjdklocations v="8"/>    <defjdklocations v="8"/>
   <defjdklocations v="9"/>  
   <defjdklocations v="10"/>  
136    <defjdklocations v="11"/>    <defjdklocations v="11"/>
137      <defjdklocations v="12"/>
138      <defjdklocations v="13"/>
139      <defjdklocations v="14"/>
140    
141    <!-- Source locations -->    <!-- Source locations -->
142    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
143    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
144    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
145    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>  
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
   <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>  
   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>  
147    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
148    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
149      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
150      <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151      <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
152    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
153    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
154    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 191  Line 192 
192    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
193    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
194    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
195    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
198    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
199    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->  <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
200    <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
201    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
202    <property name="java.docroot.url"   value="${java10.docroot.url}"/>    <!-- Default jdk doc location (latest stable LTS release seems best) -->
203      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
204    
205    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>  
   <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>  
   <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>  
206    <property name="java8.api.url"      value="${java8.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/"/>  
207    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
208      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
209      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
210      <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
211    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
212    
213    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 240  Line 240 
240    
241      <local name="modules"/>      <local name="modules"/>
242      <condition property="modules">      <condition property="modules">
243        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244      </condition>      </condition>
245    
246      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 321  Line 321 
321      </sequential>      </sequential>
322    </macrodef>    </macrodef>
323    
324      <defjtregtests v="14"/>
325      <defjtregtests v="13"/>
326      <defjtregtests v="12"/>
327    <defjtregtests v="11"/>    <defjtregtests v="11"/>
   <defjtregtests v="10"/>  
   <defjtregtests v="9"/>  
328    <defjtregtests v="8"/>    <defjtregtests v="8"/>
   <defjtregtests v="7"/>  
329    
330    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
332    
333    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
334      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
335      <attribute name="target"/>      <attribute name="target"/>
336      <attribute name="workdir"/>      <attribute name="workdir"/>
337      <attribute name="classes"/>      <attribute name="classes"/>
# Line 346  Line 346 
346    
347      <local name="modules"/>      <local name="modules"/>
348      <condition property="modules">      <condition property="modules">
349        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
350      </condition>      </condition>
351    
352      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 376  Line 376 
376    </path>    </path>
377    
378    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
379      <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
380    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
381    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
382    
383    <!-- Main targets -->    <!-- Main targets -->
384    
385    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
386    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
387    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
388      <attribute name="v"/>    <!-- ButButBut as of 2019-08, target jdk11 at build time -->
389      <sequential>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
390        <property name="build.main.java"    value="${java@{v}}"/>      o override-methods=summary
391        <property name="build.main.javac"   value="${javac@{v}}"/>      o {@systemProperty ...}
392        <!-- Force javadoc version to be at least 10,      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
393             so we can use override-methods=summary -->      o 8202628: javadoc generates bad links in TestModules.java
394        <condition property="build.main.javadoc"      -->
395                   value="${javadoc11}"    <property name="java.runtime.target" value="11"/>
396                   else="${javadoc@{v}}">    <property name="build.main.java" value="${java11}"/>
397          <equals arg1="@{v}" arg2="9"/>    <property name="build.main.javac" value="${javac11}"/>
398        </condition>    <property name="build.main.javadoc" value="${javadoc12}"/>
399      </sequential>    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
   </macrodef>  
   <define-build-main-properties v="${build.main.java.version}"/>  
400    
401    <target name="dists"    <target name="dists"
402            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
403            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
404            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
405    
406    <target name="compile"    <target name="compile"
407            depends="configure-compiler"            depends="configure-compiler"
# Line 431  Line 428 
428        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
429        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
430        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
431        <compilerarg value="-Xlint:all"/>  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
432          <compilerarg value="-Xlint:all,-removal"/>
433        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
434        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
435          <compilerarg value="-Xdoclint/package:java.util.*"/>
436        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
437        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 473  Line 472 
472  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
473      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
474               packagenames="none"               packagenames="none"
475               link="${java9.api.url}"               link="${java.api.url}"
476               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
477               access="${build.javadoc.access}"               access="${build.javadoc.access}"
478               sourcepath="${src.dir}"               sourcepath="${src.dir}"
479               classpath=""               classpath=""
480               source="9"               source="${build.main.javadoc.source}"
481               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
482    <!-- TODO: JDK-8214571 failonerror = "true" -->
483        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
484          <include name="**/*.java"/>          <include name="**/*.java"/>
485        </fileset>        </fileset>
486        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
487        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
488        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
489        <arg value="-html5"/>        <arg value="-html5"/>
490        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
491    <!-- old school frames via docs/index.html?overview-summary.html -->
492    <!-- TODO: - -frames no longer a supported option in jdk13+ -->
493          <arg value="--frames"/>
494        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
495        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
496        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 505  Line 508 
508            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
509    
510    
   <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>  
   
   
511    <target name="clean"    <target name="clean"
512            description="Removes all build products">            description="Removes all build products">
513      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 555  Line 536 
536            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
537    
538      <run-tck-tests      <run-tck-tests
539        target="${build.main.java.version}"        target="${java.runtime.target}"
540        workdir="${build.dir}"        workdir="${build.dir}"
541        classes="${product.jar}">        classes="${product.jar}">
542        <javac-elements>        <javac-elements>
# Line 589  Line 570 
570            depends="jar"            depends="jar"
571            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
572      <run-jtreg-tests      <run-jtreg-tests
573         target="${build.main.java.version}"         target="${java.runtime.target}"
574         workdir="${build.dir}"         workdir="${build.dir}"
575         classes="${product.jar}"/>         classes="${product.jar}"/>
576    </target>    </target>
# Line 598  Line 579 
579            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
580            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
581    
582  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
583              depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
584      </target>
585    
586  <!--     <antcall target="jtreg"> -->    <!-- jdk9 is unsupported as of 2019-08 -->
587  <!--       <param name="build.main.java.version" value="8"/> -->  <!--   <target name="test9"> -->
588  <!--       <param name="build.main.javac" value="${javac8}"/> -->  <!--     <antcall target="clean"/> -->
589    <!--     <antcall> -->
590    <!--       <param name="java.runtime.target" value="9"/> -->
591    <!--       <param name="build.main.javac" value="${javac9}"/> -->
592    <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
593    <!--       <param name="build.main.javadoc.source" value="9"/> -->
594    <!--       <target name="test"/> -->
595    <!--       <target name="docs"/> -->
596  <!--     </antcall> -->  <!--     </antcall> -->
597    <!--   </target> -->
598    
599      <!-- jdk10 is unsupported as of 2019-08 -->
600    <!--   <target name="test10"> -->
601    <!--     <antcall target="clean"/> -->
602    <!--     <antcall> -->
603    <!--       <param name="java.runtime.target" value="10"/> -->
604    <!--       <param name="build.main.javac" value="${javac10}"/> -->
605    <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
606    <!--       <param name="build.main.javadoc.source" value="10"/> -->
607    <!--       <target name="test"/> -->
608    <!--       <target name="docs"/> -->
609    <!--     </antcall> -->
610  <!--   </target> -->  <!--   </target> -->
611    
612    <target name="test91011"    <target name="test11">
613            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall target="clean"/>
614        <antcall>
615          <param name="java.runtime.target" value="11"/>
616          <param name="build.main.javac" value="${javac11}"/>
617          <param name="build.main.javadoc" value="${javadoc12}"/>
618          <param name="build.main.javadoc.source" value="11"/>
619          <target name="test"/>
620          <target name="docs"/>
621        </antcall>
622      </target>
623    
624      <target name="test12">
625      <antcall target="clean"/>      <antcall target="clean"/>
626      <antcall target="test">      <antcall>
627        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="12"/>
628          <param name="build.main.javac" value="${javac12}"/>
629          <param name="build.main.javadoc" value="${javadoc12}"/>
630          <param name="build.main.javadoc.source" value="12"/>
631          <target name="test"/>
632          <target name="docs"/>
633      </antcall>      </antcall>
634      </target>
635    
636      <target name="test13">
637      <antcall target="clean"/>      <antcall target="clean"/>
638      <antcall target="test">      <antcall>
639        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="13"/>
640          <param name="build.main.javac" value="${javac13}"/>
641          <param name="build.main.javadoc" value="${javadoc13}"/>
642          <param name="build.main.javadoc.source" value="13"/>
643          <target name="test"/>
644          <target name="docs"/>
645      </antcall>      </antcall>
646      </target>
647    
648      <target name="test14">
649      <antcall target="clean"/>      <antcall target="clean"/>
650      <antcall target="test">      <antcall>
651        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="14"/>
652          <param name="build.main.javac" value="${javac14}"/>
653          <param name="build.main.javadoc" value="${javadoc14}"/>
654          <param name="build.main.javadoc.source" value="14"/>
655          <target name="test"/>
656          <target name="docs"/>
657      </antcall>      </antcall>
658      </target>
659    
660      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test11-12">
661      <antcall target="clean"/>      <antcall target="clean"/>
662        <antcall>
663          <param name="java.runtime.target" value="12"/>
664          <param name="build.main.javac" value="${javac11}"/>
665          <param name="build.main.javadoc" value="${javadoc12}"/>
666          <param name="build.main.javadoc.source" value="11"/>
667          <target name="test"/>
668          <target name="docs"/>
669        </antcall>
670      </target>
671    
672      <target name="test11-13">
673        <antcall target="clean"/>
674        <antcall>
675          <param name="java.runtime.target" value="13"/>
676          <param name="build.main.javac" value="${javac11}"/>
677          <param name="build.main.javadoc" value="${javadoc13}"/>
678          <param name="build.main.javadoc.source" value="11"/>
679          <target name="test"/>
680          <target name="docs"/>
681        </antcall>
682    </target>    </target>
683    
684      <target name="test11-14">
685        <antcall target="clean"/>
686        <antcall>
687          <param name="java.runtime.target" value="14"/>
688          <param name="build.main.javac" value="${javac11}"/>
689          <param name="build.main.javadoc" value="${javadoc14}"/>
690          <param name="build.main.javadoc.source" value="11"/>
691          <target name="test"/>
692          <target name="docs"/>
693        </antcall>
694      </target>
695    
696    
697    <target name="configure-compiler">    <target name="configure-compiler">
# Line 652  Line 714 
714    </target>    </target>
715    
716    
   
   <!-- 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>  
   
   
717    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
718            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
719    
# Line 1386  Line 1417 
1417    
1418    
1419  <!-- ==============================================================  <!-- ==============================================================
1420    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1421      https://errorprone.info
1422      https://errorprone.info/docs/installation
1423      https://github.com/google/error-prone/issues/1143
1424  =================================================================== -->  =================================================================== -->
1425    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <path id="errorprone.processorpath.path">
1426        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1427        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1428        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1429        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1430      </path>
1431      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1432    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
1433    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1434              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1435                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
1436                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
1437                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
1438                       -Xep:ThreadPriorityCheck:OFF
1439                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
1440                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
1441                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1403  Line 1444 
1444                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1445                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1446                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1447                       -Xep:ConstructorInvokesOverridable:WARN
1448                     -Xep:MethodCanBeStatic:WARN                     -Xep:MethodCanBeStatic:WARN
1449                     ${errorprone.jsr166.user.flags}"/>                     ${errorprone.jsr166.user.flags}"/>
1450    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
# Line 1435  Line 1477 
1477        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1478        <compilerarg value="-J--illegal-access=permit"/>        <compilerarg value="-J--illegal-access=permit"/>
1479        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1480        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg value="-processorpath"/>
1481          <compilerarg pathref="errorprone.processorpath.path"/>
1482        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1483                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
1484        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1452  Line 1495 
1495      </jar>      </jar>
1496    
1497      <run-tck-tests      <run-tck-tests
1498        target="${build.main.java.version}"        target="${java.runtime.target}"
1499        workdir="${build.dir}"        workdir="${build.dir}"
1500        classes="${product.jar}">        classes="${product.jar}">
1501        <javac-elements>        <javac-elements>
1502          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1503          <compilerarg value="-J--illegal-access=permit"/>          <compilerarg value="-J--illegal-access=permit"/>
1504          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1505          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1506          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1507                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1508                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1475  Line 1518 
1518            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1519    
1520      <run-jtreg-tests      <run-jtreg-tests
1521         target="${build.main.java.version}"         target="${java.runtime.target}"
1522         workdir="${build.dir}"         workdir="${build.dir}"
1523         classes="${product.jar}"         classes="${product.jar}"
1524         verbose="all">         verbose="all">
1525        <jtreg-elements>        <jtreg-elements>
1526          <arg value="-javacoption:-XDcompilePolicy=simple"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1527          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1528          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
1529          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1530                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1531                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}

Legend:
Removed from v.1.273  
changed lines
  Added in v.1.302

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