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

Diff of /jsr166/build.xml

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

revision 1.256, Sun Oct 22 03:57:51 2017 UTC revision 1.290, Sun Dec 2 22:46:53 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    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
28    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
31      $HOME/jdk/src/jdk11
32      $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
35    
# Line 50  Line 55 
55    
56    
57    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
58    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
59    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
60    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 101  Line 105 
105      <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"
106        unless:set="have.java.base"/>        unless:set="have.java.base"/>
107      <local name="modules"/>      <local name="modules"/>
108      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
110      <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"/>
111      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 132  Line 136 
136    <defjdklocations v="8"/>    <defjdklocations v="8"/>
137    <defjdklocations v="9"/>    <defjdklocations v="9"/>
138    <defjdklocations v="10"/>    <defjdklocations v="10"/>
139      <defjdklocations v="11"/>
140      <defjdklocations v="12"/>
141    
142    <!-- Source locations -->    <!-- Source locations -->
143    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142  Line 148 
148    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
151      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
154    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
155    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181  Line 189 
189    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
190    
191    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
192    <property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
193    <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"/>
194    <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"/>
195    <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"/>
196    <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197    <!-- The location of jdk9 early access docs -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198      <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199      <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200      <!-- The location of jdk early access docs (RIP) -->
201    <!-- <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"/> -->
202    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203    <property name="java.docroot.url"   value="${java9.docroot.url}"/>    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204      <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205      <!-- Default jdk doc location (latest stable LTS release seems best) -->
206      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
207    
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197  Line 211 
211    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
218    
219    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 229  Line 246 
246    
247      <local name="modules"/>      <local name="modules"/>
248      <condition property="modules">      <condition property="modules">
249        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250      </condition>      </condition>
251    
252      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 296  Line 313 
313    </macrodef>    </macrodef>
314    
315    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
316    <fileset dir="${jtreg10.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
317      <patternset id="jdk10.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
318        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
319      </patternset>    <macrodef name="defjtregtests">
320    </fileset>      <attribute name="v"/>
321        <sequential>
322    <fileset dir="${jtreg9.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
323      <patternset id="jdk9.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
324        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
     </patternset>  
   </fileset>  
   
   <fileset dir="${jtreg8.src.dir}">  
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
325      </patternset>      </patternset>
326    </fileset>    </fileset>
327        </sequential>
328      </macrodef>
329    
330    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="12"/>
331      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="11"/>
332        <include name="**/*.java"/>    <defjtregtests v="10"/>
333      </patternset>    <defjtregtests v="9"/>
334    </fileset>    <defjtregtests v="8"/>
335      <defjtregtests v="7"/>
336    
337    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
338    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
# Line 339  Line 353 
353    
354      <local name="modules"/>      <local name="modules"/>
355      <condition property="modules">      <condition property="modules">
356        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357      </condition>      </condition>
358    
359      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 374  Line 388 
388    
389    <!-- Main targets -->    <!-- Main targets -->
390    
391    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
392    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
393    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
394      <attribute name="v"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395      <sequential>      o override-methods=summary
396        <property name="build.main.java"    value="${java@{v}}"/>      o {@systemProperty ...}
397        <property name="build.main.javac"   value="${javac@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398        <property name="build.main.javadoc" value="${javadoc@{v}}"/>      o 8202628: javadoc generates bad links in TestModules.java
399      </sequential>      -->
400    </macrodef>    <property name="java.runtime.target" value="11"/>
401    <define-build-main-properties v="${build.main.java.version}"/>    <property name="build.main.java" value="${java11}"/>
402      <property name="build.main.javac" value="${javac9}"/>
403      <property name="build.main.javadoc" value="${javadoc12}"/>
404      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405    
406    <target name="dists"    <target name="dists"
407            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
408            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
409            <!--            <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
410    
411    <target name="compile"    <target name="compile"
412            depends="configure-compiler"            depends="configure-compiler"
# Line 418  Line 433 
433        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
434        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
435        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
436        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
437        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
438        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
439        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
# Line 460  Line 475 
475  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
477               packagenames="none"               packagenames="none"
478               link="${java9.api.url}"               link="${java.api.url}"
479               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"               access="${build.javadoc.access}"
481               sourcepath="${src.dir}"               sourcepath="${src.dir}"
482               classpath=""               classpath=""
483               source="9"               source="${build.main.javadoc.source}"
484               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
485        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
486          <include name="**/*.java"/>          <include name="**/*.java"/>
487        </fileset>        </fileset>
488        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
491        <arg value="-html5"/>        <arg value="-html5"/>
492        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
493        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
494        <arg value="${javadoc.jls.option}"/>        <arg value="--frames"/>
495  <!-- @apiNote currently unused -->        <arg value="--override-methods=summary"/>
496  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
497  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
498        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
499        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
500  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
501  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
502  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
503      </javadoc>      </javadoc>
504    </target>    </target>
505    
# Line 498  Line 509 
509            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
510    
511    
   <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>  
   
   
512    <target name="clean"    <target name="clean"
513            description="Removes all build products">            description="Removes all build products">
514      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 548  Line 537 
537            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
538    
539      <run-tck-tests      <run-tck-tests
540        target="${build.main.java.version}"        target="${java.runtime.target}"
541        workdir="${build.dir}"        workdir="${build.dir}"
542        classes="${product.jar}">        classes="${product.jar}">
543        <javac-elements>        <javac-elements>
# Line 582  Line 571 
571            depends="jar"            depends="jar"
572            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests      <run-jtreg-tests
574         target="${build.main.java.version}"         target="${java.runtime.target}"
575         workdir="${build.dir}"         workdir="${build.dir}"
576         classes="${product.jar}"/>         classes="${product.jar}"/>
577    </target>    </target>
# Line 591  Line 580 
580            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
581            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
582    
583  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
584              depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
585  <!--     <antcall target="jtreg"> -->    </target>
 <!--       <param name="build.main.java.version" value="8"/> -->  
 <!--       <param name="build.main.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
   
 <!--   </target> -->  
586    
587    <target name="test910"    <target name="test9">
588            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall target="clean"/>
589        <antcall>
590          <param name="java.runtime.target" value="9"/>
591          <param name="build.main.javac" value="${javac9}"/>
592          <param name="build.main.javadoc" value="${javadoc12}"/>
593          <param name="build.main.javadoc.source" value="9"/>
594          <target name="test"/>
595          <target name="docs"/>
596        </antcall>
597      </target>
598    
599      <target name="test10">
600      <antcall target="clean"/>      <antcall target="clean"/>
601      <antcall target="test">      <antcall>
602        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="10"/>
603          <param name="build.main.javac" value="${javac10}"/>
604          <param name="build.main.javadoc" value="${javadoc12}"/>
605          <param name="build.main.javadoc.source" value="10"/>
606          <target name="test"/>
607          <target name="docs"/>
608      </antcall>      </antcall>
609      </target>
610    
611      <target name="test11">
612      <antcall target="clean"/>      <antcall target="clean"/>
613      <antcall target="test">      <antcall>
614        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="11"/>
615          <param name="build.main.javac" value="${javac11}"/>
616          <param name="build.main.javadoc" value="${javadoc12}"/>
617          <param name="build.main.javadoc.source" value="11"/>
618          <target name="test"/>
619          <target name="docs"/>
620      </antcall>      </antcall>
621      </target>
622    
623      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test12">
624      <antcall target="clean"/>      <antcall target="clean"/>
625        <antcall>
626          <param name="java.runtime.target" value="12"/>
627          <param name="build.main.javac" value="${javac12}"/>
628          <param name="build.main.javadoc" value="${javadoc12}"/>
629          <param name="build.main.javadoc.source" value="12"/>
630          <target name="test"/>
631          <target name="docs"/>
632        </antcall>
633      </target>
634    
635      <target name="test9-11">
636        <antcall target="clean"/>
637        <antcall>
638          <param name="java.runtime.target" value="11"/>
639          <param name="build.main.javac" value="${javac9}"/>
640          <param name="build.main.javadoc" value="${javadoc12}"/>
641          <param name="build.main.javadoc.source" value="9"/>
642          <target name="test"/>
643          <target name="docs"/>
644        </antcall>
645    </target>    </target>
646    
647      <target name="test9-12">
648        <antcall target="clean"/>
649        <antcall>
650          <param name="java.runtime.target" value="12"/>
651          <param name="build.main.javac" value="${javac9}"/>
652          <param name="build.main.javadoc" value="${javadoc12}"/>
653          <param name="build.main.javadoc.source" value="9"/>
654          <target name="test"/>
655          <target name="docs"/>
656        </antcall>
657      </target>
658    
659    
660    <target name="configure-compiler">    <target name="configure-compiler">
# Line 640  Line 677 
677    </target>    </target>
678    
679    
   
   <!-- 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>  
   
   
680    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
681            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
682    
# Line 825  Line 831 
831        </fileset>        </fileset>
832        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
833        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
834        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
835        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
836  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
837  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
838  <!--       <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;"/>  
839      </javadoc>      </javadoc>
840    </target>    </target>
841    
# Line 1363  Line 1365 
1365    
1366  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1367    
1368    <target name="lint">  <!--   <target name="lint"> -->
1369      <antcall target="dists">  <!--     <antcall target="dists"> -->
1370        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1371      </antcall>  <!--     </antcall> -->
1372    </target>  <!--   </target> -->
1373    
1374  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1375    <target name="lint-private">    <target name="doclint-private">
1376      <antcall target="dist">      <antcall target="dist">
1377        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1378      </antcall>      </antcall>
# Line 1378  Line 1380 
1380    
1381    
1382  <!-- ==============================================================  <!-- ==============================================================
1383    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1384      https://errorprone.info
1385      https://errorprone.info/docs/installation
1386      https://github.com/google/error-prone/issues/1143
1387  =================================================================== -->  =================================================================== -->
1388    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>    <path id="errorprone.processorpath.path">
1389        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1390        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1391        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1392        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1393      </path>
1394      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1395      <property name="errorprone.jsr166.user.flags" value=""/>
1396      <property name="errorprone.jsr166.flags"
1397                value="-Xep:HashtableContains:OFF
1398                       -Xep:JdkObsolete:OFF
1399                       -Xep:MissingOverride:OFF
1400                       -Xep:MissingFail:OFF
1401                       -Xep:ThreadPriorityCheck:OFF
1402                       -Xep:MixedArrayDimensions:ERROR
1403                       -Xep:RemoveUnusedImports:ERROR
1404                       -Xep:EmptyIf:ERROR
1405                       -Xep:MultipleTopLevelClasses:ERROR
1406                       -Xep:ClassName:ERROR
1407                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1408                       -Xep:RedundantThrows:ERROR
1409                       -Xep:IdentityBinaryExpression:WARN
1410                       -Xep:ConstructorInvokesOverridable:WARN
1411                       -Xep:MethodCanBeStatic:WARN
1412                       ${errorprone.jsr166.user.flags}"/>
1413      <!-- -Xep:WildcardImport:ERROR -->
1414      <property name="errorprone.jsr166.test.flags"
1415                value="-Xep:StringSplitter:OFF
1416                       -Xep:BoxedPrimitiveConstructor:OFF
1417                       -Xep:ModifyingCollectionWithItself:OFF"/>
1418      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1419    <target name="errorprone"    <target name="errorprone"
1420            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1421            description="Run errorprone over jsr166 source code (experimental)">            description="Run errorprone over jsr166 source code (experimental)">
# Line 1402  Line 1437 
1437             fork="true">             fork="true">
1438    
1439        <include name="**/*.java"/>        <include name="**/*.java"/>
1440        <compilerarg line="-processorpath ${errorprone.jar}"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1441          <compilerarg value="-J--illegal-access=permit"/>
1442          <compilerarg value="-XDcompilePolicy=simple"/>
1443          <compilerarg value="-processorpath"/>
1444          <compilerarg pathref="errorprone.processorpath.path"/>
1445        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1446                            -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"/>  
1447        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1448        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1449        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1428  Line 1458 
1458      </jar>      </jar>
1459    
1460      <run-tck-tests      <run-tck-tests
1461        target="${build.main.java.version}"        target="${java.runtime.target}"
1462        workdir="${build.dir}"        workdir="${build.dir}"
1463        classes="${product.jar}">        classes="${product.jar}">
1464        <javac-elements>        <javac-elements>
1465          <compilerarg line="-processorpath ${errorprone.jar}"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466            <compilerarg value="-J--illegal-access=permit"/>
1467            <compilerarg value="-XDcompilePolicy=simple"/>
1468            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1469          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1470                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1471                              -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"/>  
1472          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1473        </javac-elements>        </javac-elements>
1474      </run-tck-tests>      </run-tck-tests>
1475    </target>    </target>
1476    
1477    <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->    <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1478      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1479    <target name="errorprone-jtreg"    <target name="errorprone-jtreg"
1480            depends="jar"            depends="jar"
1481            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1482    
1483      <run-jtreg-tests      <run-jtreg-tests
1484         target="${build.main.java.version}"         target="${java.runtime.target}"
1485         workdir="${build.dir}"         workdir="${build.dir}"
1486         classes="${product.jar}"         classes="${product.jar}"
1487         verbose="all">         verbose="all">
1488        <jtreg-elements>        <jtreg-elements>
1489            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1490          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1491          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
1492          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1493                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1494                              -Xep:BoxedPrimitiveConstructor:OFF                              ${errorprone.jsr166.test.flags}
1495                              -Xep:HashtableContains:OFF                              -Xep:MultipleTopLevelClasses:WARN
1496                              -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"/>  
1497        </jtreg-elements>        </jtreg-elements>
1498      </run-jtreg-tests>      </run-jtreg-tests>
1499    </target>    </target>

Legend:
Removed from v.1.256  
changed lines
  Added in v.1.290

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8