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

Diff of /jsr166/build.xml

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

revision 1.259 by jsr166, Mon Dec 18 21:07:18 2017 UTC revision 1.293 by jsr166, Thu Dec 13 01:15:07 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    
144    <!-- Source locations -->    <!-- Source locations -->
145    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142  Line 150 
150    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
151    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
152    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
153      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
154      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
156    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
157    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 187  Line 197 
197    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
198    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
199    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
200    <!-- The location of jdk9 early access docs (RIP) -->    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
201      <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
202      <!-- The location of jdk early access docs (RIP) -->
203    <!-- <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"/> -->
204    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
205    <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
206    <property name="java.docroot.url"   value="${java9.docroot.url}"/>    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
207      <!-- Default jdk doc location (latest stable LTS release seems best) -->
208      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
209    
210    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 200  Line 214 
214    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
220    
221    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 232  Line 248 
248    
249      <local name="modules"/>      <local name="modules"/>
250      <condition property="modules">      <condition property="modules">
251        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252      </condition>      </condition>
253    
254      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 299  Line 315 
315    </macrodef>    </macrodef>
316    
317    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
318    <fileset dir="${jtreg10.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319      <patternset id="jdk10.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
321      </patternset>    <macrodef name="defjtregtests">
322    </fileset>      <attribute name="v"/>
323        <sequential>
324    <fileset dir="${jtreg9.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
325      <patternset id="jdk9.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
326        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
327      </patternset>          </patternset>
328    </fileset>        </fileset>
329        </sequential>
330    <fileset dir="${jtreg8.src.dir}">    </macrodef>
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
331    
332    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="12"/>
333      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="11"/>
334        <include name="**/*.java"/>    <defjtregtests v="10"/>
335      </patternset>    <defjtregtests v="9"/>
336    </fileset>    <defjtregtests v="8"/>
337      <defjtregtests v="7"/>
338    
339    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
341    
342    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
343      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
344      <attribute name="target"/>      <attribute name="target"/>
345      <attribute name="workdir"/>      <attribute name="workdir"/>
346      <attribute name="classes"/>      <attribute name="classes"/>
# Line 342  Line 355 
355    
356      <local name="modules"/>      <local name="modules"/>
357      <condition property="modules">      <condition property="modules">
358        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
359      </condition>      </condition>
360    
361      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 377  Line 390 
390    
391    <!-- Main targets -->    <!-- Main targets -->
392    
393    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
394    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
395    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
396      <attribute name="v"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
397      <sequential>      o override-methods=summary
398        <property name="build.main.java"    value="${java@{v}}"/>      o {@systemProperty ...}
399        <property name="build.main.javac"   value="${javac@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
400        <property name="build.main.javadoc" value="${javadoc@{v}}"/>      o 8202628: javadoc generates bad links in TestModules.java
401      </sequential>      -->
402    </macrodef>    <property name="java.runtime.target" value="11"/>
403    <define-build-main-properties v="${build.main.java.version}"/>    <property name="build.main.java" value="${java11}"/>
404      <property name="build.main.javac" value="${javac9}"/>
405      <property name="build.main.javadoc" value="${javadoc12}"/>
406      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
407    
408    <target name="dists"    <target name="dists"
409            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
410            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
411            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
412    
413    <target name="compile"    <target name="compile"
414            depends="configure-compiler"            depends="configure-compiler"
# Line 421  Line 435 
435        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
436        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
437        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
438        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
439        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
440        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
441        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
# Line 463  Line 477 
477  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
478      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
479               packagenames="none"               packagenames="none"
480               link="${java9.api.url}"               link="${java.api.url}"
481               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
482               access="${build.javadoc.access}"               access="${build.javadoc.access}"
483               sourcepath="${src.dir}"               sourcepath="${src.dir}"
484               classpath=""               classpath=""
485               source="9"               source="${build.main.javadoc.source}"
486               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
487    <!-- TODO: JDK-8214571 failonerror = "true" -->
488        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
489          <include name="**/*.java"/>          <include name="**/*.java"/>
490        </fileset>        </fileset>
491        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
492        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
493        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
494        <arg value="-html5"/>        <arg value="-html5"/>
495        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
496        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
497        <arg value="${javadoc.jls.option}"/>        <arg value="--frames"/>
498  <!-- @apiNote currently unused -->        <arg value="--override-methods=summary"/>
499  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
500  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
501        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
502        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
503  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
504  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
505  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
506      </javadoc>      </javadoc>
507    </target>    </target>
508    
# Line 501  Line 512 
512            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
513    
514    
   <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>  
   
   
515    <target name="clean"    <target name="clean"
516            description="Removes all build products">            description="Removes all build products">
517      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 551  Line 540 
540            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
541    
542      <run-tck-tests      <run-tck-tests
543        target="${build.main.java.version}"        target="${java.runtime.target}"
544        workdir="${build.dir}"        workdir="${build.dir}"
545        classes="${product.jar}">        classes="${product.jar}">
546        <javac-elements>        <javac-elements>
# Line 585  Line 574 
574            depends="jar"            depends="jar"
575            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
576      <run-jtreg-tests      <run-jtreg-tests
577         target="${build.main.java.version}"         target="${java.runtime.target}"
578         workdir="${build.dir}"         workdir="${build.dir}"
579         classes="${product.jar}"/>         classes="${product.jar}"/>
580    </target>    </target>
# Line 594  Line 583 
583            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
584            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
585    
586  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
587              depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
588  <!--     <antcall target="jtreg"> -->    </target>
 <!--       <param name="build.main.java.version" value="8"/> -->  
 <!--       <param name="build.main.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
   
 <!--   </target> -->  
589    
590    <target name="test910"    <target name="test9">
591            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall target="clean"/>
592        <antcall>
593          <param name="java.runtime.target" value="9"/>
594          <param name="build.main.javac" value="${javac9}"/>
595          <param name="build.main.javadoc" value="${javadoc12}"/>
596          <param name="build.main.javadoc.source" value="9"/>
597          <target name="test"/>
598          <target name="docs"/>
599        </antcall>
600      </target>
601    
602      <target name="test10">
603      <antcall target="clean"/>      <antcall target="clean"/>
604      <antcall target="test">      <antcall>
605        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="10"/>
606          <param name="build.main.javac" value="${javac10}"/>
607          <param name="build.main.javadoc" value="${javadoc12}"/>
608          <param name="build.main.javadoc.source" value="10"/>
609          <target name="test"/>
610          <target name="docs"/>
611      </antcall>      </antcall>
612      </target>
613    
614      <target name="test11">
615      <antcall target="clean"/>      <antcall target="clean"/>
616      <antcall target="test">      <antcall>
617        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="11"/>
618          <param name="build.main.javac" value="${javac11}"/>
619          <param name="build.main.javadoc" value="${javadoc12}"/>
620          <param name="build.main.javadoc.source" value="11"/>
621          <target name="test"/>
622          <target name="docs"/>
623      </antcall>      </antcall>
624      </target>
625    
626      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test12">
627      <antcall target="clean"/>      <antcall target="clean"/>
628        <antcall>
629          <param name="java.runtime.target" value="12"/>
630          <param name="build.main.javac" value="${javac12}"/>
631          <param name="build.main.javadoc" value="${javadoc12}"/>
632          <param name="build.main.javadoc.source" value="12"/>
633          <target name="test"/>
634          <target name="docs"/>
635        </antcall>
636      </target>
637    
638      <target name="test9-11">
639        <antcall target="clean"/>
640        <antcall>
641          <param name="java.runtime.target" value="11"/>
642          <param name="build.main.javac" value="${javac9}"/>
643          <param name="build.main.javadoc" value="${javadoc12}"/>
644          <param name="build.main.javadoc.source" value="9"/>
645          <target name="test"/>
646          <target name="docs"/>
647        </antcall>
648    </target>    </target>
649    
650      <target name="test9-12">
651        <antcall target="clean"/>
652        <antcall>
653          <param name="java.runtime.target" value="12"/>
654          <param name="build.main.javac" value="${javac9}"/>
655          <param name="build.main.javadoc" value="${javadoc12}"/>
656          <param name="build.main.javadoc.source" value="9"/>
657          <target name="test"/>
658          <target name="docs"/>
659        </antcall>
660      </target>
661    
662    
663    <target name="configure-compiler">    <target name="configure-compiler">
# Line 643  Line 680 
680    </target>    </target>
681    
682    
   
   <!-- 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>  
   
   
683    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
684            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
685    
# Line 828  Line 834 
834        </fileset>        </fileset>
835        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
836        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
837        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
838        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
839  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
840  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
841  <!--       <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;"/>  
842      </javadoc>      </javadoc>
843    </target>    </target>
844    
# Line 1366  Line 1368 
1368    
1369  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1370    
1371    <target name="lint">  <!--   <target name="lint"> -->
1372      <antcall target="dists">  <!--     <antcall target="dists"> -->
1373        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1374      </antcall>  <!--     </antcall> -->
1375    </target>  <!--   </target> -->
1376    
1377  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1378    <target name="lint-private">    <target name="doclint-private">
1379      <antcall target="dist">      <antcall target="dist">
1380        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1381      </antcall>      </antcall>
# Line 1381  Line 1383 
1383    
1384    
1385  <!-- ==============================================================  <!-- ==============================================================
1386    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1387      https://errorprone.info
1388      https://errorprone.info/docs/installation
1389      https://github.com/google/error-prone/issues/1143
1390  =================================================================== -->  =================================================================== -->
1391    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>    <path id="errorprone.processorpath.path">
1392        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1393        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1394        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1395        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1396      </path>
1397      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1398      <property name="errorprone.jsr166.user.flags" value=""/>
1399      <property name="errorprone.jsr166.flags"
1400                value="-Xep:HashtableContains:OFF
1401                       -Xep:JdkObsolete:OFF
1402                       -Xep:MissingOverride:OFF
1403                       -Xep:MissingFail:OFF
1404                       -Xep:ThreadPriorityCheck:OFF
1405                       -Xep:MixedArrayDimensions:ERROR
1406                       -Xep:RemoveUnusedImports:ERROR
1407                       -Xep:EmptyIf:ERROR
1408                       -Xep:MultipleTopLevelClasses:ERROR
1409                       -Xep:ClassName:ERROR
1410                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1411                       -Xep:RedundantThrows:ERROR
1412                       -Xep:IdentityBinaryExpression:WARN
1413                       -Xep:ConstructorInvokesOverridable:WARN
1414                       -Xep:MethodCanBeStatic:WARN
1415                       ${errorprone.jsr166.user.flags}"/>
1416      <!-- -Xep:WildcardImport:ERROR -->
1417      <property name="errorprone.jsr166.test.flags"
1418                value="-Xep:StringSplitter:OFF
1419                       -Xep:BoxedPrimitiveConstructor:OFF
1420                       -Xep:ModifyingCollectionWithItself:OFF"/>
1421      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1422    <target name="errorprone"    <target name="errorprone"
1423            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1424            description="Run errorprone over jsr166 source code (experimental)">            description="Run errorprone over jsr166 source code (experimental)">
# Line 1405  Line 1440 
1440             fork="true">             fork="true">
1441    
1442        <include name="**/*.java"/>        <include name="**/*.java"/>
1443        <compilerarg line="-processorpath ${errorprone.jar}"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1444          <compilerarg value="-J--illegal-access=permit"/>
1445          <compilerarg value="-XDcompilePolicy=simple"/>
1446          <compilerarg value="-processorpath"/>
1447          <compilerarg pathref="errorprone.processorpath.path"/>
1448        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1449                            -Xep:IdentityBinaryExpression:WARN                            ${errorprone.jsr166.flags}"/>
                           -Xep:MissingOverride:OFF  
                           -Xep:MixedArrayDimensions:ERROR  
                           -Xep:RemoveUnusedImports:ERROR  
                           -Xep:ClassName:ERROR  
                           -Xep:MultipleTopLevelClasses:ERROR  
                           -Xep:EmptyIf:ERROR  
                           -Xep:LongLiteralLowerCaseSuffix:ERROR  
                           -Xep:RedundantThrows:ERROR  
                           -Xep:MethodCanBeStatic:WARN"/>  
1450        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1451        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1452        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1431  Line 1461 
1461      </jar>      </jar>
1462    
1463      <run-tck-tests      <run-tck-tests
1464        target="${build.main.java.version}"        target="${java.runtime.target}"
1465        workdir="${build.dir}"        workdir="${build.dir}"
1466        classes="${product.jar}">        classes="${product.jar}">
1467        <javac-elements>        <javac-elements>
1468          <compilerarg line="-processorpath ${errorprone.jar}"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1469            <compilerarg value="-J--illegal-access=permit"/>
1470            <compilerarg value="-XDcompilePolicy=simple"/>
1471            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1472          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1473                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1474                              -Xep:BoxedPrimitiveConstructor:OFF                              ${errorprone.jsr166.test.flags}"/>
                             -Xep:HashtableContains:OFF  
                             -Xep:ModifyingCollectionWithItself:OFF  
                             -Xep:MissingOverride:OFF  
                             -Xep:MissingFail:OFF  
                             -Xep:JdkObsolete:OFF  
                             -Xep:MixedArrayDimensions:ERROR  
                             -Xep:RemoveUnusedImports:ERROR  
                             -Xep:ClassName:ERROR  
                             -Xep:MultipleTopLevelClasses:ERROR  
                             -Xep:EmptyIf:ERROR  
                             -Xep:LongLiteralLowerCaseSuffix:ERROR  
                             -Xep:RedundantThrows:ERROR  
                             -Xep:MethodCanBeStatic:WARN"/>  
1475          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1476        </javac-elements>        </javac-elements>
1477      </run-tck-tests>      </run-tck-tests>
1478    </target>    </target>
1479    
1480    <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->    <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1481      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1482    <target name="errorprone-jtreg"    <target name="errorprone-jtreg"
1483            depends="jar"            depends="jar"
1484            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1485    
1486      <run-jtreg-tests      <run-jtreg-tests
1487         target="${build.main.java.version}"         target="${java.runtime.target}"
1488         workdir="${build.dir}"         workdir="${build.dir}"
1489         classes="${product.jar}"         classes="${product.jar}"
1490         verbose="all">         verbose="all">
1491        <jtreg-elements>        <jtreg-elements>
1492            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1493          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1494          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
1495          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1496                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1497                              -Xep:BoxedPrimitiveConstructor:OFF                              ${errorprone.jsr166.test.flags}
1498                              -Xep:HashtableContains:OFF                              -Xep:MultipleTopLevelClasses:WARN
1499                              -Xep:ModifyingCollectionWithItself:OFF                              -Xep:NonAtomicVolatileUpdate:OFF"/>
                             -Xep:MissingOverride:OFF  
                             -Xep:JdkObsolete:OFF  
                             -Xep:NonAtomicVolatileUpdate:OFF  
                             -Xep:MixedArrayDimensions:ERROR  
                             -Xep:RemoveUnusedImports:ERROR  
                             -Xep:ClassName:ERROR  
                             -Xep:MultipleTopLevelClasses:ERROR  
                             -Xep:EmptyIf:ERROR  
                             -Xep:LongLiteralLowerCaseSuffix:ERROR  
                             -Xep:RedundantThrows:ERROR  
                             -Xep:MethodCanBeStatic:WARN"/>  
1500        </jtreg-elements>        </jtreg-elements>
1501      </run-jtreg-tests>      </run-jtreg-tests>
1502    </target>    </target>
Legend:
Removed from v.1.259  
changed lines
  Added in v.1.293
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27