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

Diff of /jsr166/build.xml

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

revision 1.254 by jsr166, Mon Sep 25 22:54:09 2017 UTC revision 1.300 by jsr166, Sat Jul 13 18:31:40 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 21  Line 22 
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10    $HOME/jdk/jdk10
25      $HOME/jdk/jdk11
26      $HOME/jdk/jdk12
27      $HOME/jdk/jdk13
28      $HOME/jdk/jdk14
29    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
30    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
31    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
32    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
33      $HOME/jdk/src/jdk11
34      $HOME/jdk/src/jdk12
35      $HOME/jdk/src/jdk13
36      $HOME/jdk/src/jdk14
37    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
38    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
39    
40    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
41    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
42    for $N in 8 9 10 ...    for $N in 8 .. 14 ...
43    
44    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.
45  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 50  Line 59 
59    
60    
61    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
62    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
63    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
64    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 101  Line 109 
109      <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"
110        unless:set="have.java.base"/>        unless:set="have.java.base"/>
111      <local name="modules"/>      <local name="modules"/>
112      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
113      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
114      <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"/>
115      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 132  Line 140 
140    <defjdklocations v="8"/>    <defjdklocations v="8"/>
141    <defjdklocations v="9"/>    <defjdklocations v="9"/>
142    <defjdklocations v="10"/>    <defjdklocations v="10"/>
143      <defjdklocations v="11"/>
144      <defjdklocations v="12"/>
145      <defjdklocations v="13"/>
146      <defjdklocations v="14"/>
147    
148    <!-- Source locations -->    <!-- Source locations -->
149    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142  Line 154 
154    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
155    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
156    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
157      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
159      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
160      <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
161    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
162    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
163    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181  Line 197 
197    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
198    
199    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
200    <property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
201    <property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>    <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
202    <property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
203    <property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
204    <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
205    <!-- The location of jdk9 early access docs -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206      <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207      <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
209      <!-- The location of jdk early access docs (RIP) -->
210    <!-- <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"/> -->
211    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
212    <property name="java.docroot.url"   value="${java9.docroot.url}"/>    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
213    <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
214      <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
215      <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216      <!-- Default jdk doc location (latest stable LTS release seems best) -->
217      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
218    
219    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
220    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197  Line 222 
222    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
223    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
224    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
225      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
226      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
228      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
229      <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
230    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
231    
232    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 229  Line 259 
259    
260      <local name="modules"/>      <local name="modules"/>
261      <condition property="modules">      <condition property="modules">
262        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
263      </condition>      </condition>
264    
265      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 296  Line 326 
326    </macrodef>    </macrodef>
327    
328    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
329    <fileset dir="${jtreg10.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
330      <patternset id="jdk10.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
331        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
332      </patternset>    <macrodef name="defjtregtests">
333    </fileset>      <attribute name="v"/>
334        <sequential>
335    <fileset dir="${jtreg9.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
336      <patternset id="jdk9.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
337        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
338      </patternset>          </patternset>
339    </fileset>        </fileset>
340        </sequential>
341    <fileset dir="${jtreg8.src.dir}">    </macrodef>
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
342    
343    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="14"/>
344      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="13"/>
345        <include name="**/*.java"/>    <defjtregtests v="12"/>
346      </patternset>    <defjtregtests v="11"/>
347    </fileset>    <defjtregtests v="10"/>
348      <defjtregtests v="9"/>
349      <defjtregtests v="8"/>
350      <defjtregtests v="7"/>
351    
352    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
353    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
354    
355    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
356      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
357      <attribute name="target"/>      <attribute name="target"/>
358      <attribute name="workdir"/>      <attribute name="workdir"/>
359      <attribute name="classes"/>      <attribute name="classes"/>
360        <attribute name="verbose" default="${jtreg.verbose}"/>
361      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
362        <element name="jtreg-elements" optional="true"/>
363    
364      <sequential>      <sequential>
365    
# Line 337  Line 368 
368    
369      <local name="modules"/>      <local name="modules"/>
370      <condition property="modules">      <condition property="modules">
371        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
372      </condition>      </condition>
373    
374      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 350  Line 381 
381        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
382        <arg value="-agentvm"/>        <arg value="-agentvm"/>
383        <arg value="-noreport"/>        <arg value="-noreport"/>
384        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:@{verbose}"/>
385        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
386        <arg value="-automatic"/>        <arg value="-automatic"/>
387        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
388        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
389        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
390          <jtreg-elements/>
391      </jtreg>      </jtreg>
392      </sequential>      </sequential>
393    </macrodef>    </macrodef>
# Line 366  Line 398 
398    </path>    </path>
399    
400    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
401      <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
402    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
403    <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;:"/>
404    
405    <!-- Main targets -->    <!-- Main targets -->
406    
407    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
408    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
409    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
410      <attribute name="v"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
411      <sequential>      o override-methods=summary
412        <property name="build.main.java"    value="${java@{v}}"/>      o {@systemProperty ...}
413        <property name="build.main.javac"   value="${javac@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
414        <property name="build.main.javadoc" value="${javadoc@{v}}"/>      o 8202628: javadoc generates bad links in TestModules.java
415      </sequential>      -->
416    </macrodef>    <property name="java.runtime.target" value="11"/>
417    <define-build-main-properties v="${build.main.java.version}"/>    <property name="build.main.java" value="${java11}"/>
418      <property name="build.main.javac" value="${javac9}"/>
419      <property name="build.main.javadoc" value="${javadoc12}"/>
420      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
421    
422    <target name="dists"    <target name="dists"
423            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
424            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
425            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
426    
427    <target name="compile"    <target name="compile"
428            depends="configure-compiler"            depends="configure-compiler"
# Line 415  Line 449 
449        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
450        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
451        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
452        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
453        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
454        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
455          <compilerarg value="-Xdoclint/package:java.util.*"/>
456        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
457        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
458        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 457  Line 492 
492  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
493      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
494               packagenames="none"               packagenames="none"
495               link="${java9.api.url}"               link="${java.api.url}"
496               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
497               access="${build.javadoc.access}"               access="${build.javadoc.access}"
498               sourcepath="${src.dir}"               sourcepath="${src.dir}"
499               classpath=""               classpath=""
500               source="9"               source="${build.main.javadoc.source}"
501               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
502    <!-- TODO: JDK-8214571 failonerror = "true" -->
503        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
504          <include name="**/*.java"/>          <include name="**/*.java"/>
505        </fileset>        </fileset>
506        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
507        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
508        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
509        <arg value="-html5"/>        <arg value="-html5"/>
510        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
511        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
512        <arg value="${javadoc.jls.option}"/>  <!-- TODO: - -frames no longer a supported option in jdk13+ -->
513  <!-- @apiNote currently unused -->        <arg value="--frames"/>
514  <!--       <arg value="-tag"/> -->        <arg value="--override-methods=summary"/>
515  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
516        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
517        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
518        <arg value="-tag"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="implNote:a:Implementation Note:"/>  
519  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
520  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
521  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
522      </javadoc>      </javadoc>
523    </target>    </target>
524    
# Line 495  Line 528 
528            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
529    
530    
   <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>  
   
   
531    <target name="clean"    <target name="clean"
532            description="Removes all build products">            description="Removes all build products">
533      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 545  Line 556 
556            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
557    
558      <run-tck-tests      <run-tck-tests
559        target="${build.main.java.version}"        target="${java.runtime.target}"
560        workdir="${build.dir}"        workdir="${build.dir}"
561        classes="${product.jar}">        classes="${product.jar}">
562        <javac-elements>        <javac-elements>
# Line 579  Line 590 
590            depends="jar"            depends="jar"
591            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
592      <run-jtreg-tests      <run-jtreg-tests
593         target="${build.main.java.version}"         target="${java.runtime.target}"
594         workdir="${build.dir}"         workdir="${build.dir}"
595         classes="${product.jar}"/>         classes="${product.jar}"/>
596    </target>    </target>
# Line 588  Line 599 
599            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
600            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
601    
602  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
603              depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
604      </target>
605    
606  <!--     <antcall target="jtreg"> -->    <target name="test9">
607  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall target="clean"/>
608  <!--       <param name="build.main.javac" value="${javac8}"/> -->      <antcall>
609  <!--     </antcall> -->        <param name="java.runtime.target" value="9"/>
610          <param name="build.main.javac" value="${javac9}"/>
611          <param name="build.main.javadoc" value="${javadoc12}"/>
612          <param name="build.main.javadoc.source" value="9"/>
613          <target name="test"/>
614          <target name="docs"/>
615        </antcall>
616      </target>
617    
618  <!--   </target> -->    <target name="test10">
619        <antcall target="clean"/>
620        <antcall>
621          <param name="java.runtime.target" value="10"/>
622          <param name="build.main.javac" value="${javac10}"/>
623          <param name="build.main.javadoc" value="${javadoc12}"/>
624          <param name="build.main.javadoc.source" value="10"/>
625          <target name="test"/>
626          <target name="docs"/>
627        </antcall>
628      </target>
629    
630    <target name="test910"    <target name="test11">
631            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall target="clean"/>
632        <antcall>
633          <param name="java.runtime.target" value="11"/>
634          <param name="build.main.javac" value="${javac11}"/>
635          <param name="build.main.javadoc" value="${javadoc12}"/>
636          <param name="build.main.javadoc.source" value="11"/>
637          <target name="test"/>
638          <target name="docs"/>
639        </antcall>
640      </target>
641    
642      <target name="test12">
643      <antcall target="clean"/>      <antcall target="clean"/>
644      <antcall target="test">      <antcall>
645        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="12"/>
646          <param name="build.main.javac" value="${javac12}"/>
647          <param name="build.main.javadoc" value="${javadoc12}"/>
648          <param name="build.main.javadoc.source" value="12"/>
649          <target name="test"/>
650          <target name="docs"/>
651      </antcall>      </antcall>
652      </target>
653    
654      <target name="test13">
655      <antcall target="clean"/>      <antcall target="clean"/>
656      <antcall target="test">      <antcall>
657        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="13"/>
658          <param name="build.main.javac" value="${javac13}"/>
659          <param name="build.main.javadoc" value="${javadoc13}"/>
660          <param name="build.main.javadoc.source" value="13"/>
661          <target name="test"/>
662          <target name="docs"/>
663      </antcall>      </antcall>
664      </target>
665    
666      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test14">
667      <antcall target="clean"/>      <antcall target="clean"/>
668        <antcall>
669          <param name="java.runtime.target" value="14"/>
670          <param name="build.main.javac" value="${javac14}"/>
671          <param name="build.main.javadoc" value="${javadoc14}"/>
672          <param name="build.main.javadoc.source" value="14"/>
673          <target name="test"/>
674          <target name="docs"/>
675        </antcall>
676      </target>
677    
678      <target name="test9-11">
679        <antcall target="clean"/>
680        <antcall>
681          <param name="java.runtime.target" value="11"/>
682          <param name="build.main.javac" value="${javac9}"/>
683          <param name="build.main.javadoc" value="${javadoc12}"/>
684          <param name="build.main.javadoc.source" value="9"/>
685          <target name="test"/>
686          <target name="docs"/>
687        </antcall>
688      </target>
689    
690      <target name="test9-12">
691        <antcall target="clean"/>
692        <antcall>
693          <param name="java.runtime.target" value="12"/>
694          <param name="build.main.javac" value="${javac9}"/>
695          <param name="build.main.javadoc" value="${javadoc12}"/>
696          <param name="build.main.javadoc.source" value="9"/>
697          <target name="test"/>
698          <target name="docs"/>
699        </antcall>
700      </target>
701    
702      <target name="test9-13">
703        <antcall target="clean"/>
704        <antcall>
705          <param name="java.runtime.target" value="13"/>
706          <param name="build.main.javac" value="${javac9}"/>
707          <param name="build.main.javadoc" value="${javadoc13}"/>
708          <param name="build.main.javadoc.source" value="9"/>
709          <target name="test"/>
710          <target name="docs"/>
711        </antcall>
712    </target>    </target>
713    
714      <target name="test9-14">
715        <antcall target="clean"/>
716        <antcall>
717          <param name="java.runtime.target" value="14"/>
718          <param name="build.main.javac" value="${javac9}"/>
719          <param name="build.main.javadoc" value="${javadoc14}"/>
720          <param name="build.main.javadoc.source" value="9"/>
721          <target name="test"/>
722          <target name="docs"/>
723        </antcall>
724      </target>
725    
726    
727    <target name="configure-compiler">    <target name="configure-compiler">
# Line 637  Line 744 
744    </target>    </target>
745    
746    
   
   <!-- 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>  
   
   
747    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
748            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
749    
# Line 822  Line 898 
898        </fileset>        </fileset>
899        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
900        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
901        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
902        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
903  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
904  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
905  <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
906      </javadoc>      </javadoc>
907    </target>    </target>
908    
# Line 1360  Line 1432 
1432    
1433  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1434    
1435    <target name="lint">  <!--   <target name="lint"> -->
1436      <antcall target="dists">  <!--     <antcall target="dists"> -->
1437        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1438      </antcall>  <!--     </antcall> -->
1439    </target>  <!--   </target> -->
1440    
1441  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1442    <target name="lint-private">    <target name="doclint-private">
1443      <antcall target="dist">      <antcall target="dist">
1444        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1445      </antcall>      </antcall>
# Line 1375  Line 1447 
1447    
1448    
1449  <!-- ==============================================================  <!-- ==============================================================
1450    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1451      https://errorprone.info
1452      https://errorprone.info/docs/installation
1453      https://github.com/google/error-prone/issues/1143
1454  =================================================================== -->  =================================================================== -->
1455    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>    <path id="errorprone.processorpath.path">
1456        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1457        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1458        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1459        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1460      </path>
1461      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1462      <property name="errorprone.jsr166.user.flags" value=""/>
1463      <property name="errorprone.jsr166.flags"
1464                value="-Xep:HashtableContains:OFF
1465                       -Xep:JdkObsolete:OFF
1466                       -Xep:MissingOverride:OFF
1467                       -Xep:MissingFail:OFF
1468                       -Xep:ThreadPriorityCheck:OFF
1469                       -Xep:MixedArrayDimensions:ERROR
1470                       -Xep:RemoveUnusedImports:ERROR
1471                       -Xep:EmptyIf:ERROR
1472                       -Xep:MultipleTopLevelClasses:ERROR
1473                       -Xep:ClassName:ERROR
1474                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1475                       -Xep:RedundantThrows:ERROR
1476                       -Xep:IdentityBinaryExpression:WARN
1477                       -Xep:ConstructorInvokesOverridable:WARN
1478                       -Xep:MethodCanBeStatic:WARN
1479                       ${errorprone.jsr166.user.flags}"/>
1480      <!-- -Xep:WildcardImport:ERROR -->
1481      <property name="errorprone.jsr166.test.flags"
1482                value="-Xep:StringSplitter:OFF
1483                       -Xep:BoxedPrimitiveConstructor:OFF
1484                       -Xep:ModifyingCollectionWithItself:OFF"/>
1485      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1486    <target name="errorprone"    <target name="errorprone"
1487            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1488            description="Run errorprone over jsr166 source code (experimental)">            description="Run errorprone over jsr166 source code (experimental)">
# Line 1399  Line 1504 
1504             fork="true">             fork="true">
1505    
1506        <include name="**/*.java"/>        <include name="**/*.java"/>
1507        <compilerarg line="-processorpath ${errorprone.jar}"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1508          <compilerarg value="-J--illegal-access=permit"/>
1509          <compilerarg value="-XDcompilePolicy=simple"/>
1510          <compilerarg value="-processorpath"/>
1511          <compilerarg pathref="errorprone.processorpath.path"/>
1512        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1513                            -Xep:IdentityBinaryExpression:WARN                            ${errorprone.jsr166.flags}"/>
                           -Xep:MissingOverride:OFF  
                           -Xep:MixedArrayDimensions:WARN  
                           -Xep:RemoveUnusedImports:ERROR  
                           -Xep:ClassName:ERROR  
                           -Xep:MultipleTopLevelClasses:ERROR  
                           -Xep:EmptyIf:ERROR  
                           -Xep:LongLiteralLowerCaseSuffix:ERROR  
                           -Xep:RedundantThrows:ERROR  
                           -Xep:MethodCanBeStatic:WARN"/>  
1514        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1515        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1516        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1425  Line 1525 
1525      </jar>      </jar>
1526    
1527      <run-tck-tests      <run-tck-tests
1528        target="${build.main.java.version}"        target="${java.runtime.target}"
1529        workdir="${build.dir}"        workdir="${build.dir}"
1530        classes="${product.jar}">        classes="${product.jar}">
1531        <javac-elements>        <javac-elements>
1532          <compilerarg line="-processorpath ${errorprone.jar}"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1533            <compilerarg value="-J--illegal-access=permit"/>
1534            <compilerarg value="-XDcompilePolicy=simple"/>
1535            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1536          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1537                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1538                              -Xep:BoxedPrimitiveConstructor:OFF                              ${errorprone.jsr166.test.flags}"/>
                             -Xep:HashtableContains:OFF  
                             -Xep:ModifyingCollectionWithItself:OFF  
                             -Xep:MissingOverride:OFF  
                             -Xep:MixedArrayDimensions:WARN  
                             -Xep:RemoveUnusedImports:ERROR  
                             -Xep:ClassName:ERROR  
                             -Xep:MultipleTopLevelClasses:ERROR  
                             -Xep:EmptyIf:ERROR  
                             -Xep:LongLiteralLowerCaseSuffix:ERROR  
                             -Xep:RedundantThrows:ERROR  
                             -Xep:MethodCanBeStatic:WARN"/>  
1539          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1540        </javac-elements>        </javac-elements>
1541      </run-tck-tests>      </run-tck-tests>
1542    </target>    </target>
1543    
1544      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1545      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1546      <target name="errorprone-jtreg"
1547              depends="jar"
1548              description="Run errorprone over jtreg tests (experimental)">
1549    
1550        <run-jtreg-tests
1551           target="${java.runtime.target}"
1552           workdir="${build.dir}"
1553           classes="${product.jar}"
1554           verbose="all">
1555          <jtreg-elements>
1556            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1557            <arg value="-javacoption:-processorpath"/>
1558            <arg value="-javacoption:${errorprone.processorpath}"/>
1559            <arg value="-javacoption:-Xplugin:ErrorProne
1560                                ${errorprone.jsr166.flags}
1561                                ${errorprone.jsr166.test.flags}
1562                                -Xep:MultipleTopLevelClasses:WARN
1563                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1564          </jtreg-elements>
1565        </run-jtreg-tests>
1566      </target>
1567    
1568    
1569  <!-- ==============================================================  <!-- ==============================================================
1570    Running guava tests against jsr166 code    Running guava tests against jsr166 code

Legend:
Removed from v.1.254  
changed lines
  Added in v.1.300

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