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

Diff of /jsr166/build.xml

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

revision 1.242 by jsr166, Sat Apr 1 21:47:32 2017 UTC revision 1.299 by jsr166, Fri Jun 14 20:10:53 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    <!-- 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"/>
205    <!-- <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"/>
206    <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"/>
207    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <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"/> -->
211      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
212      <!-- <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="${jtreg9.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
330      <patternset id="jdk9.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="${jtreg8.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
336      <patternset id="jdk8.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      </macrodef>
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 -->
     <attribute name="source" default="7"/>  
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 332  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 341  Line 377 
377             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
378        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
379        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
380        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
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 403 
403    
404    <!-- Main targets -->    <!-- Main targets -->
405    
406    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
407      <!-- At runtime, target latest LTS, i.e. jdk11 -->
408      <!-- But at build time, target jdk9, for maximal binary portability -->
409      <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
410        o override-methods=summary
411        o {@systemProperty ...}
412        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
413        o 8202628: javadoc generates bad links in TestModules.java
414        -->
415      <property name="java.runtime.target" value="11"/>
416      <property name="build.main.java" value="${java11}"/>
417    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
418      <property name="build.main.javadoc" value="${javadoc12}"/>
419      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
420    
421    <target name="dists"    <target name="dists"
422            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
423            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
424            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
425    
426    <target name="compile"    <target name="compile"
427            depends="configure-compiler"            depends="configure-compiler"
428            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
429    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
430      <local name="destdir"/>      <local name="destdir"/>
431      <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>  
432    
433      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
434    
# Line 407  Line 445 
445             fork="true">             fork="true">
446    
447        <include name="**/*.java"/>        <include name="**/*.java"/>
448        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
449        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
450        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
451        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
452        <compilerarg value="-Werror"/>        <compilerarg line="--doclint-format html5"/>
453        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
454          <compilerarg value="-Xdoclint/package:java.util.*"/>
455          <compilerarg value="-Werror"/>
456        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
457        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
458    
# Line 451  Line 491 
491  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
492      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
493               packagenames="none"               packagenames="none"
494               link="${java9.api.url}"               link="${java.api.url}"
495               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
496               access="${build.javadoc.access}"               access="${build.javadoc.access}"
497               sourcepath="${src.dir}"               sourcepath="${src.dir}"
498               classpath=""               classpath=""
499               executable="${javadoc9}">               source="${build.main.javadoc.source}"
500                 executable="${build.main.javadoc}">
501    <!-- TODO: JDK-8214571 failonerror = "true" -->
502        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
503          <include name="**/*.java"/>          <include name="**/*.java"/>
504        </fileset>        </fileset>
505        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
506        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
507        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
508          <arg value="-html5"/>
509        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
510        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
511        <arg value="${javadoc.jls.option}"/>  <!-- TODO: - -frames no longer a supported option in jdk13+ -->
512  <!-- @apiNote currently unused -->        <arg value="--frames"/>
513  <!--       <arg value="-tag"/> -->        <arg value="--override-methods=summary"/>
514  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
515        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
516        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
517        <arg value="-tag"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="implNote:a:Implementation Note:"/>  
518  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
519  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
520  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
521      </javadoc>      </javadoc>
522    </target>    </target>
523    
# Line 487  Line 527 
527            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
528    
529    
   <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>  
   
   
530    <target name="clean"    <target name="clean"
531            description="Removes all build products">            description="Removes all build products">
532      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 537  Line 555 
555            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
556    
557      <run-tck-tests      <run-tck-tests
558        target="${build.main.java.version}"        target="${java.runtime.target}"
559        workdir="${build.dir}"        workdir="${build.dir}"
560        classes="${product.jar}">        classes="${product.jar}">
561        <javac-elements>        <javac-elements>
# Line 571  Line 589 
589            depends="jar"            depends="jar"
590            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
591      <run-jtreg-tests      <run-jtreg-tests
592         target="${build.main.java.version}"         target="${java.runtime.target}"
593         workdir="${build.dir}"         workdir="${build.dir}"
594         classes="${product.jar}"/>         classes="${product.jar}"/>
595    </target>    </target>
# Line 580  Line 598 
598            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
599            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
600    
601  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
602              depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
603      </target>
604    
605  <!--     <antcall target="jtreg"> -->    <target name="test9">
606  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall target="clean"/>
607  <!--       <param name="build.main.javac" value="${javac8}"/> -->      <antcall>
608  <!--     </antcall> -->        <param name="java.runtime.target" value="9"/>
609          <param name="build.main.javac" value="${javac9}"/>
610          <param name="build.main.javadoc" value="${javadoc12}"/>
611          <param name="build.main.javadoc.source" value="9"/>
612          <target name="test"/>
613          <target name="docs"/>
614        </antcall>
615      </target>
616    
617  <!--   </target> -->    <target name="test10">
618        <antcall target="clean"/>
619        <antcall>
620          <param name="java.runtime.target" value="10"/>
621          <param name="build.main.javac" value="${javac10}"/>
622          <param name="build.main.javadoc" value="${javadoc12}"/>
623          <param name="build.main.javadoc.source" value="10"/>
624          <target name="test"/>
625          <target name="docs"/>
626        </antcall>
627      </target>
628    
629  <!--   <target name="test89" -->    <target name="test11">
630  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->      <antcall target="clean"/>
631        <antcall>
632          <param name="java.runtime.target" value="11"/>
633          <param name="build.main.javac" value="${javac11}"/>
634          <param name="build.main.javadoc" value="${javadoc12}"/>
635          <param name="build.main.javadoc.source" value="11"/>
636          <target name="test"/>
637          <target name="docs"/>
638        </antcall>
639      </target>
640    
641  <!--     <antcall target="clean"/> -->    <target name="test12">
642  <!--     <antcall target="test"> -->      <antcall target="clean"/>
643  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall>
644  <!--       <param name="build.main.javac" value="${javac8}"/> -->        <param name="java.runtime.target" value="12"/>
645  <!--     </antcall> -->        <param name="build.main.javac" value="${javac12}"/>
646          <param name="build.main.javadoc" value="${javadoc12}"/>
647          <param name="build.main.javadoc.source" value="12"/>
648          <target name="test"/>
649          <target name="docs"/>
650        </antcall>
651      </target>
652    
653  <!--     <antcall target="clean"/> -->    <target name="test13">
654  <!--     <antcall target="test"> -->      <antcall target="clean"/>
655  <!--       <param name="build.main.java.version" value="9"/> -->      <antcall>
656  <!--       <param name="build.main.javac" value="${javac9}"/> -->        <param name="java.runtime.target" value="13"/>
657  <!--     </antcall> -->        <param name="build.main.javac" value="${javac13}"/>
658          <param name="build.main.javadoc" value="${javadoc13}"/>
659          <param name="build.main.javadoc.source" value="13"/>
660          <target name="test"/>
661          <target name="docs"/>
662        </antcall>
663      </target>
664    
665  <!--   </target> -->    <target name="test14">
666        <antcall target="clean"/>
667        <antcall>
668          <param name="java.runtime.target" value="14"/>
669          <param name="build.main.javac" value="${javac14}"/>
670          <param name="build.main.javadoc" value="${javadoc14}"/>
671          <param name="build.main.javadoc.source" value="14"/>
672          <target name="test"/>
673          <target name="docs"/>
674        </antcall>
675      </target>
676    
677      <target name="test9-11">
678        <antcall target="clean"/>
679        <antcall>
680          <param name="java.runtime.target" value="11"/>
681          <param name="build.main.javac" value="${javac9}"/>
682          <param name="build.main.javadoc" value="${javadoc12}"/>
683          <param name="build.main.javadoc.source" value="9"/>
684          <target name="test"/>
685          <target name="docs"/>
686        </antcall>
687      </target>
688    
689      <target name="test9-12">
690        <antcall target="clean"/>
691        <antcall>
692          <param name="java.runtime.target" value="12"/>
693          <param name="build.main.javac" value="${javac9}"/>
694          <param name="build.main.javadoc" value="${javadoc12}"/>
695          <param name="build.main.javadoc.source" value="9"/>
696          <target name="test"/>
697          <target name="docs"/>
698        </antcall>
699      </target>
700    
701      <target name="test9-13">
702        <antcall target="clean"/>
703        <antcall>
704          <param name="java.runtime.target" value="13"/>
705          <param name="build.main.javac" value="${javac9}"/>
706          <param name="build.main.javadoc" value="${javadoc13}"/>
707          <param name="build.main.javadoc.source" value="9"/>
708          <target name="test"/>
709          <target name="docs"/>
710        </antcall>
711      </target>
712    
713      <target name="test9-14">
714        <antcall target="clean"/>
715        <antcall>
716          <param name="java.runtime.target" value="14"/>
717          <param name="build.main.javac" value="${javac9}"/>
718          <param name="build.main.javadoc" value="${javadoc14}"/>
719          <param name="build.main.javadoc.source" value="9"/>
720          <target name="test"/>
721          <target name="docs"/>
722        </antcall>
723      </target>
724    
725    
726    <target name="configure-compiler">    <target name="configure-compiler">
# Line 628  Line 743 
743    </target>    </target>
744    
745    
   
   <!-- 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>  
   
   
746    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
747            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
748    
# Line 672  Line 756 
756             includeAntRuntime="false"             includeAntRuntime="false"
757             includeJavaRuntime="false"             includeJavaRuntime="false"
758             encoding="ASCII"             encoding="ASCII"
759             executable="${javac9}"             executable="${build.main.javac}"
760             fork="true">             fork="true">
761    
762        <include name="*.java"/>        <include name="*.java"/>
# Line 805  Line 889 
889               access="${build.javadoc.access}"               access="${build.javadoc.access}"
890               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
891               classpath=""               classpath=""
892                 source="8"
893               executable="${javadoc8}"               executable="${javadoc8}"
894               failonerror = "true">               failonerror = "true">
895        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 812  Line 897 
897        </fileset>        </fileset>
898        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
899        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
900        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
901        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
902  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
903  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
904  <!--       <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;"/>  
905      </javadoc>      </javadoc>
906    </target>    </target>
907    
# Line 1350  Line 1431 
1431    
1432  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1433    
1434    <target name="lint">  <!--   <target name="lint"> -->
1435      <antcall target="dists">  <!--     <antcall target="dists"> -->
1436        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1437      </antcall>  <!--     </antcall> -->
1438    </target>  <!--   </target> -->
1439    
1440  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1441    <target name="lint-private">    <target name="doclint-private">
1442      <antcall target="dist">      <antcall target="dist">
1443        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1444      </antcall>      </antcall>
# Line 1365  Line 1446 
1446    
1447    
1448  <!-- ==============================================================  <!-- ==============================================================
1449    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1450    You may need to bring your own errorprone jar.    https://errorprone.info
1451      https://errorprone.info/docs/installation
1452      https://github.com/google/error-prone/issues/1143
1453  =================================================================== -->  =================================================================== -->
1454      <path id="errorprone.processorpath.path">
1455        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1456        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1457        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1458        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1459      </path>
1460      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1461      <property name="errorprone.jsr166.user.flags" value=""/>
1462      <property name="errorprone.jsr166.flags"
1463                value="-Xep:HashtableContains:OFF
1464                       -Xep:JdkObsolete:OFF
1465                       -Xep:MissingOverride:OFF
1466                       -Xep:MissingFail:OFF
1467                       -Xep:ThreadPriorityCheck:OFF
1468                       -Xep:MixedArrayDimensions:ERROR
1469                       -Xep:RemoveUnusedImports:ERROR
1470                       -Xep:EmptyIf:ERROR
1471                       -Xep:MultipleTopLevelClasses:ERROR
1472                       -Xep:ClassName:ERROR
1473                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1474                       -Xep:RedundantThrows:ERROR
1475                       -Xep:IdentityBinaryExpression:WARN
1476                       -Xep:ConstructorInvokesOverridable:WARN
1477                       -Xep:MethodCanBeStatic:WARN
1478                       ${errorprone.jsr166.user.flags}"/>
1479      <!-- -Xep:WildcardImport:ERROR -->
1480      <property name="errorprone.jsr166.test.flags"
1481                value="-Xep:StringSplitter:OFF
1482                       -Xep:BoxedPrimitiveConstructor:OFF
1483                       -Xep:ModifyingCollectionWithItself:OFF"/>
1484      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1485    <target name="errorprone"    <target name="errorprone"
1486            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1487            description="Run errorprone over jsr166 source code (experimental)">            description="Run errorprone over jsr166 source code (experimental)">
# Line 1389  Line 1503 
1503             fork="true">             fork="true">
1504    
1505        <include name="**/*.java"/>        <include name="**/*.java"/>
1506        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1507        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>        <compilerarg value="-J--illegal-access=permit"/>
1508        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1509        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>        <compilerarg value="-processorpath"/>
1510        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>        <compilerarg pathref="errorprone.processorpath.path"/>
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
       <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>  
1511        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1512                            -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:ArgumentParameterSwap:ERROR  
                           -Xep:RedundantThrows:ERROR  
                           -Xep:MethodCanBeStatic:WARN"/>  
1513        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1514        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1515        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1425  Line 1524 
1524      </jar>      </jar>
1525    
1526      <run-tck-tests      <run-tck-tests
1527        target="${build.main.java.version}"        target="${java.runtime.target}"
1528        workdir="${build.dir}"        workdir="${build.dir}"
1529        classes="${product.jar}">        classes="${product.jar}">
1530        <javac-elements>        <javac-elements>
1531          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1532          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>          <compilerarg value="-J--illegal-access=permit"/>
1533          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1534          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
         <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>  
1535          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1536                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1537                              -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:ArgumentParameterSwap:ERROR  
                             -Xep:RedundantThrows:ERROR  
                             -Xep:MethodCanBeStatic:WARN"/>  
1538          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1539        </javac-elements>        </javac-elements>
1540      </run-tck-tests>      </run-tck-tests>
1541    </target>    </target>
1542    
1543      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1544      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1545      <target name="errorprone-jtreg"
1546              depends="jar"
1547              description="Run errorprone over jtreg tests (experimental)">
1548    
1549        <run-jtreg-tests
1550           target="${java.runtime.target}"
1551           workdir="${build.dir}"
1552           classes="${product.jar}"
1553           verbose="all">
1554          <jtreg-elements>
1555            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1556            <arg value="-javacoption:-processorpath"/>
1557            <arg value="-javacoption:${errorprone.processorpath}"/>
1558            <arg value="-javacoption:-Xplugin:ErrorProne
1559                                ${errorprone.jsr166.flags}
1560                                ${errorprone.jsr166.test.flags}
1561                                -Xep:MultipleTopLevelClasses:WARN
1562                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1563          </jtreg-elements>
1564        </run-jtreg-tests>
1565      </target>
1566    
1567    
1568  <!-- ==============================================================  <!-- ==============================================================
1569    Running guava tests against jsr166 code    Running guava tests against jsr166 code
# Line 1512  Line 1617 
1617      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1618           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1619      <junit printsummary="true" showoutput="true" haltonfailure="true"      <junit printsummary="true" showoutput="true" haltonfailure="true"
1620             jvm="${java9}" fork="true">             jvm="${build.main.java}" fork="true">
1621        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>        <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1622        <formatter type="brief"/>        <formatter type="brief"/>
1623        <classpath>        <classpath>
1624          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Legend:
Removed from v.1.242  
changed lines
  Added in v.1.299

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