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

Diff of /jsr166/build.xml

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

revision 1.251 by jsr166, Tue Sep 19 19:47:20 2017 UTC revision 1.294 by jsr166, Mon Dec 31 07:05:54 2018 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    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
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 50  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 101  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 132  Line 138 
138    <defjdklocations v="8"/>    <defjdklocations v="8"/>
139    <defjdklocations v="9"/>    <defjdklocations v="9"/>
140    <defjdklocations v="10"/>    <defjdklocations v="10"/>
141      <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 142  Line 151 
151    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
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"/>
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 181  Line 193 
193    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
194    
195    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
196    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
197    <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"/>
198    <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"/>
199    <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"/>
200    <!-- The expected canonical location does not yet exist as of 2016-04 -->    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
201    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <!-- The location of jdk early access docs (RIP) -->
205      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
206      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
207      <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
208      <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
209      <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
210      <!-- Default jdk doc location (latest stable LTS release seems best) -->
211      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
212    
213    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
214    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197  Line 216 
216    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
217    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
218    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
219      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
220      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
221      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
222      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
223    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
224    
225    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 229  Line 252 
252    
253      <local name="modules"/>      <local name="modules"/>
254      <condition property="modules">      <condition property="modules">
255        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
256      </condition>      </condition>
257    
258      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 296  Line 319 
319    </macrodef>    </macrodef>
320    
321    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
322    <fileset dir="${jtreg10.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
323      <patternset id="jdk10.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
324        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
325      </patternset>    <macrodef name="defjtregtests">
326    </fileset>      <attribute name="v"/>
327        <sequential>
328    <fileset dir="${jtreg9.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
329      <patternset id="jdk9.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
330        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
331      </patternset>          </patternset>
332    </fileset>        </fileset>
333        </sequential>
334      </macrodef>
335    
336    <fileset dir="${jtreg8.src.dir}">    <defjtregtests v="13"/>
337      <patternset id="jdk8.jtreg.tests">    <defjtregtests v="12"/>
338        <include name="**/*.java"/>    <defjtregtests v="11"/>
339      </patternset>    <defjtregtests v="10"/>
340    </fileset>    <defjtregtests v="9"/>
341      <defjtregtests v="8"/>
342    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="7"/>
     <patternset id="jdk7.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
343    
344    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
345    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
346    
347    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
348      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
349      <attribute name="target"/>      <attribute name="target"/>
350      <attribute name="workdir"/>      <attribute name="workdir"/>
351      <attribute name="classes"/>      <attribute name="classes"/>
352        <attribute name="verbose" default="${jtreg.verbose}"/>
353      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
354        <element name="jtreg-elements" optional="true"/>
355    
356      <sequential>      <sequential>
357    
# Line 337  Line 360 
360    
361      <local name="modules"/>      <local name="modules"/>
362      <condition property="modules">      <condition property="modules">
363        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
364      </condition>      </condition>
365    
366      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 350  Line 373 
373        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
374        <arg value="-agentvm"/>        <arg value="-agentvm"/>
375        <arg value="-noreport"/>        <arg value="-noreport"/>
376        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:@{verbose}"/>
377        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
378        <arg value="-automatic"/>        <arg value="-automatic"/>
379        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
380        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
381        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
382          <jtreg-elements/>
383      </jtreg>      </jtreg>
384      </sequential>      </sequential>
385    </macrodef>    </macrodef>
# Line 371  Line 395 
395    
396    <!-- Main targets -->    <!-- Main targets -->
397    
398    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
399    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
400    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
401      <attribute name="v"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
402      <sequential>      o override-methods=summary
403        <property name="build.main.java"    value="${java@{v}}"/>      o {@systemProperty ...}
404        <property name="build.main.javac"   value="${javac@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
405        <property name="build.main.javadoc" value="${javadoc@{v}}"/>      o 8202628: javadoc generates bad links in TestModules.java
406      </sequential>      -->
407    </macrodef>    <property name="java.runtime.target" value="11"/>
408    <define-build-main-properties v="${build.main.java.version}"/>    <property name="build.main.java" value="${java11}"/>
409      <property name="build.main.javac" value="${javac9}"/>
410      <property name="build.main.javadoc" value="${javadoc12}"/>
411      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
412    
413    <target name="dists"    <target name="dists"
414            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
415            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
416            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
417    
418    <target name="compile"    <target name="compile"
419            depends="configure-compiler"            depends="configure-compiler"
# Line 415  Line 440 
440        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
441        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
442        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
443        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
444        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
445        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
446        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
# Line 457  Line 482 
482  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
483      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
484               packagenames="none"               packagenames="none"
485               link="${java9.api.url}"               link="${java.api.url}"
486               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
487               access="${build.javadoc.access}"               access="${build.javadoc.access}"
488               sourcepath="${src.dir}"               sourcepath="${src.dir}"
489               classpath=""               classpath=""
490               source="9"               source="${build.main.javadoc.source}"
491               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
492    <!-- TODO: JDK-8214571 failonerror = "true" -->
493        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
494          <include name="**/*.java"/>          <include name="**/*.java"/>
495        </fileset>        </fileset>
496        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
497        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
498        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
499        <arg value="-html5"/>        <arg value="-html5"/>
500        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
501        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
502        <arg value="${javadoc.jls.option}"/>        <arg value="--frames"/>
503  <!-- @apiNote currently unused -->        <arg value="--override-methods=summary"/>
504  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
505  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
506        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
507        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
508  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
509  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
510  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
511      </javadoc>      </javadoc>
512    </target>    </target>
513    
# Line 495  Line 517 
517            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
518    
519    
   <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>  
   
   
520    <target name="clean"    <target name="clean"
521            description="Removes all build products">            description="Removes all build products">
522      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 545  Line 545 
545            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
546    
547      <run-tck-tests      <run-tck-tests
548        target="${build.main.java.version}"        target="${java.runtime.target}"
549        workdir="${build.dir}"        workdir="${build.dir}"
550        classes="${product.jar}">        classes="${product.jar}">
551        <javac-elements>        <javac-elements>
# Line 579  Line 579 
579            depends="jar"            depends="jar"
580            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
581      <run-jtreg-tests      <run-jtreg-tests
582         target="${build.main.java.version}"         target="${java.runtime.target}"
583         workdir="${build.dir}"         workdir="${build.dir}"
584         classes="${product.jar}"/>         classes="${product.jar}"/>
585    </target>    </target>
# Line 588  Line 588 
588            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
589            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
590    
591  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
592              depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
593      </target>
594    
595  <!--     <antcall target="jtreg"> -->    <target name="test9">
596  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall target="clean"/>
597  <!--       <param name="build.main.javac" value="${javac8}"/> -->      <antcall>
598  <!--     </antcall> -->        <param name="java.runtime.target" value="9"/>
599          <param name="build.main.javac" value="${javac9}"/>
600          <param name="build.main.javadoc" value="${javadoc12}"/>
601          <param name="build.main.javadoc.source" value="9"/>
602          <target name="test"/>
603          <target name="docs"/>
604        </antcall>
605      </target>
606    
607  <!--   </target> -->    <target name="test10">
608        <antcall target="clean"/>
609        <antcall>
610          <param name="java.runtime.target" value="10"/>
611          <param name="build.main.javac" value="${javac10}"/>
612          <param name="build.main.javadoc" value="${javadoc12}"/>
613          <param name="build.main.javadoc.source" value="10"/>
614          <target name="test"/>
615          <target name="docs"/>
616        </antcall>
617      </target>
618    
619    <target name="test910"    <target name="test11">
620            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall target="clean"/>
621        <antcall>
622          <param name="java.runtime.target" value="11"/>
623          <param name="build.main.javac" value="${javac11}"/>
624          <param name="build.main.javadoc" value="${javadoc12}"/>
625          <param name="build.main.javadoc.source" value="11"/>
626          <target name="test"/>
627          <target name="docs"/>
628        </antcall>
629      </target>
630    
631      <target name="test12">
632      <antcall target="clean"/>      <antcall target="clean"/>
633      <antcall target="test">      <antcall>
634        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="12"/>
635          <param name="build.main.javac" value="${javac12}"/>
636          <param name="build.main.javadoc" value="${javadoc12}"/>
637          <param name="build.main.javadoc.source" value="12"/>
638          <target name="test"/>
639          <target name="docs"/>
640      </antcall>      </antcall>
641      </target>
642    
643      <target name="test13">
644      <antcall target="clean"/>      <antcall target="clean"/>
645      <antcall target="test">      <antcall>
646        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="13"/>
647          <param name="build.main.javac" value="${javac13}"/>
648          <param name="build.main.javadoc" value="${javadoc13}"/>
649          <param name="build.main.javadoc.source" value="13"/>
650          <target name="test"/>
651          <target name="docs"/>
652      </antcall>      </antcall>
653      </target>
654    
655      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test9-11">
656      <antcall target="clean"/>      <antcall target="clean"/>
657        <antcall>
658          <param name="java.runtime.target" value="11"/>
659          <param name="build.main.javac" value="${javac9}"/>
660          <param name="build.main.javadoc" value="${javadoc12}"/>
661          <param name="build.main.javadoc.source" value="9"/>
662          <target name="test"/>
663          <target name="docs"/>
664        </antcall>
665      </target>
666    
667      <target name="test9-12">
668        <antcall target="clean"/>
669        <antcall>
670          <param name="java.runtime.target" value="12"/>
671          <param name="build.main.javac" value="${javac9}"/>
672          <param name="build.main.javadoc" value="${javadoc12}"/>
673          <param name="build.main.javadoc.source" value="9"/>
674          <target name="test"/>
675          <target name="docs"/>
676        </antcall>
677    </target>    </target>
678    
679      <target name="test9-13">
680        <antcall target="clean"/>
681        <antcall>
682          <param name="java.runtime.target" value="13"/>
683          <param name="build.main.javac" value="${javac9}"/>
684          <param name="build.main.javadoc" value="${javadoc13}"/>
685          <param name="build.main.javadoc.source" value="9"/>
686          <target name="test"/>
687          <target name="docs"/>
688        </antcall>
689      </target>
690    
691    
692    <target name="configure-compiler">    <target name="configure-compiler">
# Line 637  Line 709 
709    </target>    </target>
710    
711    
   
   <!-- 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>  
   
   
712    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
713            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
714    
# Line 822  Line 863 
863        </fileset>        </fileset>
864        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
865        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
866        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
867        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
868  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
869  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
870  <!--       <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;"/>  
871      </javadoc>      </javadoc>
872    </target>    </target>
873    
# Line 1360  Line 1397 
1397    
1398  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1399    
1400    <target name="lint">  <!--   <target name="lint"> -->
1401      <antcall target="dists">  <!--     <antcall target="dists"> -->
1402        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1403      </antcall>  <!--     </antcall> -->
1404    </target>  <!--   </target> -->
1405    
1406  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1407    <target name="lint-private">    <target name="doclint-private">
1408      <antcall target="dist">      <antcall target="dist">
1409        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1410      </antcall>      </antcall>
# Line 1375  Line 1412 
1412    
1413    
1414  <!-- ==============================================================  <!-- ==============================================================
1415    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1416      https://errorprone.info
1417      https://errorprone.info/docs/installation
1418      https://github.com/google/error-prone/issues/1143
1419  =================================================================== -->  =================================================================== -->
1420      <path id="errorprone.processorpath.path">
1421        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1422        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1423        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1424        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1425      </path>
1426      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1427      <property name="errorprone.jsr166.user.flags" value=""/>
1428      <property name="errorprone.jsr166.flags"
1429                value="-Xep:HashtableContains:OFF
1430                       -Xep:JdkObsolete:OFF
1431                       -Xep:MissingOverride:OFF
1432                       -Xep:MissingFail:OFF
1433                       -Xep:ThreadPriorityCheck:OFF
1434                       -Xep:MixedArrayDimensions:ERROR
1435                       -Xep:RemoveUnusedImports:ERROR
1436                       -Xep:EmptyIf:ERROR
1437                       -Xep:MultipleTopLevelClasses:ERROR
1438                       -Xep:ClassName:ERROR
1439                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1440                       -Xep:RedundantThrows:ERROR
1441                       -Xep:IdentityBinaryExpression:WARN
1442                       -Xep:ConstructorInvokesOverridable:WARN
1443                       -Xep:MethodCanBeStatic:WARN
1444                       ${errorprone.jsr166.user.flags}"/>
1445      <!-- -Xep:WildcardImport:ERROR -->
1446      <property name="errorprone.jsr166.test.flags"
1447                value="-Xep:StringSplitter:OFF
1448                       -Xep:BoxedPrimitiveConstructor:OFF
1449                       -Xep:ModifyingCollectionWithItself:OFF"/>
1450      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1451    <target name="errorprone"    <target name="errorprone"
1452            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1453            description="Run errorprone over jsr166 source code (experimental)">            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398  Line 1469 
1469             fork="true">             fork="true">
1470    
1471        <include name="**/*.java"/>        <include name="**/*.java"/>
1472        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1473          <compilerarg value="-J--illegal-access=permit"/>
1474          <compilerarg value="-XDcompilePolicy=simple"/>
1475          <compilerarg value="-processorpath"/>
1476          <compilerarg pathref="errorprone.processorpath.path"/>
1477        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1478                            -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"/>  
1479        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1480        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1481        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1424  Line 1490 
1490      </jar>      </jar>
1491    
1492      <run-tck-tests      <run-tck-tests
1493        target="${build.main.java.version}"        target="${java.runtime.target}"
1494        workdir="${build.dir}"        workdir="${build.dir}"
1495        classes="${product.jar}">        classes="${product.jar}">
1496        <javac-elements>        <javac-elements>
1497          <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1498            <compilerarg value="-J--illegal-access=permit"/>
1499            <compilerarg value="-XDcompilePolicy=simple"/>
1500            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1501          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1502                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1503                              -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"/>  
1504          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1505        </javac-elements>        </javac-elements>
1506      </run-tck-tests>      </run-tck-tests>
1507    </target>    </target>
1508    
1509      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1510      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1511      <target name="errorprone-jtreg"
1512              depends="jar"
1513              description="Run errorprone over jtreg tests (experimental)">
1514    
1515        <run-jtreg-tests
1516           target="${java.runtime.target}"
1517           workdir="${build.dir}"
1518           classes="${product.jar}"
1519           verbose="all">
1520          <jtreg-elements>
1521            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1522            <arg value="-javacoption:-processorpath"/>
1523            <arg value="-javacoption:${errorprone.processorpath}"/>
1524            <arg value="-javacoption:-Xplugin:ErrorProne
1525                                ${errorprone.jsr166.flags}
1526                                ${errorprone.jsr166.test.flags}
1527                                -Xep:MultipleTopLevelClasses:WARN
1528                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1529          </jtreg-elements>
1530        </run-jtreg-tests>
1531      </target>
1532    
1533    
1534  <!-- ==============================================================  <!-- ==============================================================
1535    Running guava tests against jsr166 code    Running guava tests against jsr166 code
# Line 1502  Line 1584 
1584           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1585      <junit printsummary="true" showoutput="true" haltonfailure="true"      <junit printsummary="true" showoutput="true" haltonfailure="true"
1586             jvm="${build.main.java}" fork="true">             jvm="${build.main.java}" fork="true">
1587        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>        <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1588        <formatter type="brief"/>        <formatter type="brief"/>
1589        <classpath>        <classpath>
1590          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
Legend:
Removed from v.1.251  
changed lines
  Added in v.1.294
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27