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

Diff of /jsr166/build.xml

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

revision 1.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC revision 1.298 by jsr166, Wed May 22 17:36:58 2019 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless"    xmlns:if="ant:if"
3      xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
# Line 22  Line 23 
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11    $HOME/jdk/jdk11
26      $HOME/jdk/jdk12
27      $HOME/jdk/jdk13
28    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
29    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
33      $HOME/jdk/src/jdk12
34      $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
37    
38    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
40    for $N in 8 9 10 ...    for $N in 8 .. 13 ...
41    
42    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.
43  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 52  Line 57 
57    
58    
59    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
60    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 103  Line 107 
107      <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"
108        unless:set="have.java.base"/>        unless:set="have.java.base"/>
109      <local name="modules"/>      <local name="modules"/>
110      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
112      <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"/>
113      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 135  Line 139 
139    <defjdklocations v="9"/>    <defjdklocations v="9"/>
140    <defjdklocations v="10"/>    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>    <defjdklocations v="11"/>
142      <defjdklocations v="12"/>
143      <defjdklocations v="13"/>
144    
145    <!-- Source locations -->    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 146  Line 152 
152    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 191  Line 199 
199    <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"/>
200    <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"/>
201    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202    <!-- The location of jdk9 early access docs (RIP) -->    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203      <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205      <!-- The location of jdk early access docs (RIP) -->
206    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208    <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"/> -->
209    <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"/> -->
210    <property name="java.docroot.url"   value="${java9.docroot.url}"/>    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211      <!-- Default jdk doc location (latest stable LTS release seems best) -->
212      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
213    
214    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 206  Line 219 
219    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
220    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225    
226    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 238  Line 253 
253    
254      <local name="modules"/>      <local name="modules"/>
255      <condition property="modules">      <condition property="modules">
256        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
257      </condition>      </condition>
258    
259      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 305  Line 320 
320    </macrodef>    </macrodef>
321    
322    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
323    <fileset dir="${jtreg11.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
324      <patternset id="jdk11.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
325        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
326      </patternset>    <macrodef name="defjtregtests">
327    </fileset>      <attribute name="v"/>
328        <sequential>
329    <fileset dir="${jtreg10.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
330      <patternset id="jdk10.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
331        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
332      </patternset>          </patternset>
333    </fileset>        </fileset>
334        </sequential>
335    <fileset dir="${jtreg9.src.dir}">    </macrodef>
     <patternset id="jdk9.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
   
   <fileset dir="${jtreg8.src.dir}">  
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
336    
337    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="13"/>
338      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="12"/>
339        <include name="**/*.java"/>    <defjtregtests v="11"/>
340      </patternset>    <defjtregtests v="10"/>
341    </fileset>    <defjtregtests v="9"/>
342      <defjtregtests v="8"/>
343      <defjtregtests v="7"/>
344    
345    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
346    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
347    
348    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
349      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350      <attribute name="target"/>      <attribute name="target"/>
351      <attribute name="workdir"/>      <attribute name="workdir"/>
352      <attribute name="classes"/>      <attribute name="classes"/>
# Line 354  Line 361 
361    
362      <local name="modules"/>      <local name="modules"/>
363      <condition property="modules">      <condition property="modules">
364        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
365      </condition>      </condition>
366    
367      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 389  Line 396 
396    
397    <!-- Main targets -->    <!-- Main targets -->
398    
399    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
400    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
401    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
402      <attribute name="v"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403      <sequential>      o override-methods=summary
404        <property name="build.main.java"    value="${java@{v}}"/>      o {@systemProperty ...}
405        <property name="build.main.javac"   value="${javac@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406        <!-- Force javadoc version to be at least 10,      o 8202628: javadoc generates bad links in TestModules.java
407             so we can use override-methods=summary -->      -->
408        <condition property="build.main.javadoc"    <property name="java.runtime.target" value="11"/>
409                   value="${javadoc10}"    <property name="build.main.java" value="${java11}"/>
410                   else="${javadoc@{v}}">    <property name="build.main.javac" value="${javac9}"/>
411          <equals arg1="@{v}" arg2="9"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
412        </condition>    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
     </sequential>  
   </macrodef>  
   <define-build-main-properties v="${build.main.java.version}"/>  
413    
414    <target name="dists"    <target name="dists"
415            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
416            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
417            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
418    
419    <target name="compile"    <target name="compile"
420            depends="configure-compiler"            depends="configure-compiler"
# Line 439  Line 441 
441        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
442        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
443        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
444        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
445        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
446        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447          <compilerarg value="-Xdoclint/package:java.util.*"/>
448        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
449        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 481  Line 484 
484  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
486               packagenames="none"               packagenames="none"
487               link="${java9.api.url}"               link="${java.api.url}"
488               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
489               access="${build.javadoc.access}"               access="${build.javadoc.access}"
490               sourcepath="${src.dir}"               sourcepath="${src.dir}"
491               classpath=""               classpath=""
492               source="9"               source="${build.main.javadoc.source}"
493               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
494    <!-- TODO: JDK-8214571 failonerror = "true" -->
495        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
496          <include name="**/*.java"/>          <include name="**/*.java"/>
497        </fileset>        </fileset>
498        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
499        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
500        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
501        <arg value="-html5"/>        <arg value="-html5"/>
502        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
503    <!-- old school frames via docs/index.html?overview-summary.html -->
504    <!-- TODO: - -frames no longer a supported option in jdk13+ -->
505          <arg value="--frames"/>
506        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
507        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
508        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
509        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
510  <!-- @apiNote tag currently unused -->        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
 <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->  
511  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
512  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
513  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 514  Line 520 
520            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
521    
522    
   <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>  
   
   
523    <target name="clean"    <target name="clean"
524            description="Removes all build products">            description="Removes all build products">
525      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 564  Line 548 
548            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
549    
550      <run-tck-tests      <run-tck-tests
551        target="${build.main.java.version}"        target="${java.runtime.target}"
552        workdir="${build.dir}"        workdir="${build.dir}"
553        classes="${product.jar}">        classes="${product.jar}">
554        <javac-elements>        <javac-elements>
# Line 598  Line 582 
582            depends="jar"            depends="jar"
583            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
584      <run-jtreg-tests      <run-jtreg-tests
585         target="${build.main.java.version}"         target="${java.runtime.target}"
586         workdir="${build.dir}"         workdir="${build.dir}"
587         classes="${product.jar}"/>         classes="${product.jar}"/>
588    </target>    </target>
# Line 607  Line 591 
591            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
592            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
593    
594  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
595              depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
596  <!--     <antcall target="jtreg"> -->    </target>
 <!--       <param name="build.main.java.version" value="8"/> -->  
 <!--       <param name="build.main.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
597    
598  <!--   </target> -->    <target name="test9">
599        <antcall target="clean"/>
600        <antcall>
601          <param name="java.runtime.target" value="9"/>
602          <param name="build.main.javac" value="${javac9}"/>
603          <param name="build.main.javadoc" value="${javadoc12}"/>
604          <param name="build.main.javadoc.source" value="9"/>
605          <target name="test"/>
606          <target name="docs"/>
607        </antcall>
608      </target>
609    
610    <target name="test91011"    <target name="test10">
611            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall target="clean"/>
612        <antcall>
613          <param name="java.runtime.target" value="10"/>
614          <param name="build.main.javac" value="${javac10}"/>
615          <param name="build.main.javadoc" value="${javadoc12}"/>
616          <param name="build.main.javadoc.source" value="10"/>
617          <target name="test"/>
618          <target name="docs"/>
619        </antcall>
620      </target>
621    
622      <target name="test11">
623      <antcall target="clean"/>      <antcall target="clean"/>
624      <antcall target="test">      <antcall>
625        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="11"/>
626          <param name="build.main.javac" value="${javac11}"/>
627          <param name="build.main.javadoc" value="${javadoc12}"/>
628          <param name="build.main.javadoc.source" value="11"/>
629          <target name="test"/>
630          <target name="docs"/>
631      </antcall>      </antcall>
632      </target>
633    
634      <target name="test12">
635      <antcall target="clean"/>      <antcall target="clean"/>
636      <antcall target="test">      <antcall>
637        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="12"/>
638          <param name="build.main.javac" value="${javac12}"/>
639          <param name="build.main.javadoc" value="${javadoc12}"/>
640          <param name="build.main.javadoc.source" value="12"/>
641          <target name="test"/>
642          <target name="docs"/>
643      </antcall>      </antcall>
644      </target>
645    
646      <target name="test13">
647      <antcall target="clean"/>      <antcall target="clean"/>
648      <antcall target="test">      <antcall>
649        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="13"/>
650          <param name="build.main.javac" value="${javac13}"/>
651          <param name="build.main.javadoc" value="${javadoc13}"/>
652          <param name="build.main.javadoc.source" value="13"/>
653          <target name="test"/>
654          <target name="docs"/>
655      </antcall>      </antcall>
656      </target>
657    
658      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test9-11">
659      <antcall target="clean"/>      <antcall target="clean"/>
660        <antcall>
661          <param name="java.runtime.target" value="11"/>
662          <param name="build.main.javac" value="${javac9}"/>
663          <param name="build.main.javadoc" value="${javadoc12}"/>
664          <param name="build.main.javadoc.source" value="9"/>
665          <target name="test"/>
666          <target name="docs"/>
667        </antcall>
668      </target>
669    
670      <target name="test9-12">
671        <antcall target="clean"/>
672        <antcall>
673          <param name="java.runtime.target" value="12"/>
674          <param name="build.main.javac" value="${javac9}"/>
675          <param name="build.main.javadoc" value="${javadoc12}"/>
676          <param name="build.main.javadoc.source" value="9"/>
677          <target name="test"/>
678          <target name="docs"/>
679        </antcall>
680    </target>    </target>
681    
682      <target name="test9-13">
683        <antcall target="clean"/>
684        <antcall>
685          <param name="java.runtime.target" value="13"/>
686          <param name="build.main.javac" value="${javac9}"/>
687          <param name="build.main.javadoc" value="${javadoc13}"/>
688          <param name="build.main.javadoc.source" value="9"/>
689          <target name="test"/>
690          <target name="docs"/>
691        </antcall>
692      </target>
693    
694    
695    <target name="configure-compiler">    <target name="configure-compiler">
# Line 661  Line 712 
712    </target>    </target>
713    
714    
   
   <!-- 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>  
   
   
715    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
716            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
717    
# Line 1380  Line 1400 
1400    
1401  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1402    
1403    <target name="lint">  <!--   <target name="lint"> -->
1404      <antcall target="dists">  <!--     <antcall target="dists"> -->
1405        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1406      </antcall>  <!--     </antcall> -->
1407    </target>  <!--   </target> -->
1408    
1409  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1410    <target name="lint-private">    <target name="doclint-private">
1411      <antcall target="dist">      <antcall target="dist">
1412        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1413      </antcall>      </antcall>
# Line 1395  Line 1415 
1415    
1416    
1417  <!-- ==============================================================  <!-- ==============================================================
1418    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1419      https://errorprone.info
1420      https://errorprone.info/docs/installation
1421      https://github.com/google/error-prone/issues/1143
1422  =================================================================== -->  =================================================================== -->
1423    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>    <path id="errorprone.processorpath.path">
1424        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1425        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1426        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1427        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1428      </path>
1429      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1430      <property name="errorprone.jsr166.user.flags" value=""/>
1431    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1432              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1433                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
1434                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
1435                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
1436                       -Xep:ThreadPriorityCheck:OFF
1437                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
1438                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
1439                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1411  Line 1442 
1442                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1443                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1444                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1445                     -Xep:MethodCanBeStatic:WARN"/>                     -Xep:ConstructorInvokesOverridable:WARN
1446                       -Xep:MethodCanBeStatic:WARN
1447                       ${errorprone.jsr166.user.flags}"/>
1448    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
1449    <property name="errorprone.jsr166.test.flags"    <property name="errorprone.jsr166.test.flags"
1450              value="-Xep:StringSplitter:OFF              value="-Xep:StringSplitter:OFF
# Line 1439  Line 1472 
1472             fork="true">             fork="true">
1473    
1474        <include name="**/*.java"/>        <include name="**/*.java"/>
1475          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1476          <compilerarg value="-J--illegal-access=permit"/>
1477        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1478        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg value="-processorpath"/>
1479          <compilerarg pathref="errorprone.processorpath.path"/>
1480        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1481                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
1482        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1457  Line 1493 
1493      </jar>      </jar>
1494    
1495      <run-tck-tests      <run-tck-tests
1496        target="${build.main.java.version}"        target="${java.runtime.target}"
1497        workdir="${build.dir}"        workdir="${build.dir}"
1498        classes="${product.jar}">        classes="${product.jar}">
1499        <javac-elements>        <javac-elements>
1500            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1501            <compilerarg value="-J--illegal-access=permit"/>
1502          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1503          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1504          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1505                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1506                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1478  Line 1516 
1516            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1517    
1518      <run-jtreg-tests      <run-jtreg-tests
1519         target="${build.main.java.version}"         target="${java.runtime.target}"
1520         workdir="${build.dir}"         workdir="${build.dir}"
1521         classes="${product.jar}"         classes="${product.jar}"
1522         verbose="all">         verbose="all">
1523        <jtreg-elements>        <jtreg-elements>
1524          <arg value="-javacoption:-XDcompilePolicy=simple"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1525          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1526          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
1527          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1528                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1529                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}
1530                                -Xep:MultipleTopLevelClasses:WARN
1531                              -Xep:NonAtomicVolatileUpdate:OFF"/>                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1532        </jtreg-elements>        </jtreg-elements>
1533      </run-jtreg-tests>      </run-jtreg-tests>

Legend:
Removed from v.1.265  
changed lines
  Added in v.1.298

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