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

Diff of /jsr166/build.xml

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

revision 1.282 by jsr166, Tue Oct 9 01:34:19 2018 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:if="ant:if"
3    xmlns:unless="ant:unless"    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
# Line 24  Line 24 
24    $HOME/jdk/jdk10    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12    $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    $HOME/jdk/src/jdk11
34    $HOME/jdk/src/jdk12    $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 55  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 139  Line 142 
142    <defjdklocations v="10"/>    <defjdklocations v="10"/>
143    <defjdklocations v="11"/>    <defjdklocations v="11"/>
144    <defjdklocations v="12"/>    <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 151  Line 156 
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"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <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 198  Line 205 
205    <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"/>
206    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
209    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
210    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->    <!-- <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"/> -->    <!-- <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"/>  <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
214    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
215    <!-- But pin to jdk 10 until fix for -->    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216    <!-- 8211194: javadoc -link doesn't take module path into consideration -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
217    <property name="java.docroot.url"   value="${java10.docroot.url}"/>    <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 217  Line 225 
225    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
226    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <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 330  Line 340 
340      </sequential>      </sequential>
341    </macrodef>    </macrodef>
342    
343      <defjtregtests v="14"/>
344      <defjtregtests v="13"/>
345    <defjtregtests v="12"/>    <defjtregtests v="12"/>
346    <defjtregtests v="11"/>    <defjtregtests v="11"/>
347    <defjtregtests v="10"/>    <defjtregtests v="10"/>
# Line 341  Line 353 
353    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
354    
355    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
356      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
357      <attribute name="target"/>      <attribute name="target"/>
358      <attribute name="workdir"/>      <attribute name="workdir"/>
359      <attribute name="classes"/>      <attribute name="classes"/>
# Line 391  Line 403 
403    
404    <!-- Main targets -->    <!-- Main targets -->
405    
406    <property name="build.main.java.version" value="11"/>    <!-- Default values: may seem strange ... -->
407    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
408    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
409      <attribute name="v"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
410      <sequential>      o override-methods=summary
411        <property name="build.main.java"    value="${java@{v}}"/>      o {@systemProperty ...}
412        <property name="build.main.javac"   value="${javac@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
413        <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->      o 8202628: javadoc generates bad links in TestModules.java
414        <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->      -->
415        <condition property="build.main.javadoc"    <property name="java.runtime.target" value="11"/>
416                   value="${javadoc12}"    <property name="build.main.java" value="${java11}"/>
417                   else="${javadoc@{v}}">    <property name="build.main.javac" value="${javac9}"/>
418          <matches pattern="^(9|10|11)$" string="@{v}"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
419        </condition>    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
     </sequential>  
   </macrodef>  
   <define-build-main-properties v="${build.main.java.version}"/>  
420    
421    <target name="dists"    <target name="dists"
422            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
# Line 439  Line 448 
448        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <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 line="--doclint-format html5"/>        <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"/>        <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}"/>
# Line 481  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="${java11.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               source="11"               source="${build.main.javadoc.source}"
500               executable="${build.main.javadoc}">               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 ${java10.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"/>        <arg value="-html5"/>
509        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
510    <!-- old school frames via docs/index.html?overview-summary.html -->
511    <!-- TODO: - -frames no longer a supported option in jdk13+ -->
512        <arg value="--frames"/>        <arg value="--frames"/>
513        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
514        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 514  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 564  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 598  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 607  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  <!--     <antcall target="jtreg"> -->    </target>
 <!--       <param name="build.main.java.version" value="8"/> -->  
 <!--       <param name="build.main.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
   
 <!--   </target> -->  
   
   <target name="test9101112"  
           description="Runs tck and jtreg tests for src/main for multiple java versions">  
604    
605      <target name="test9">
606      <antcall target="clean"/>      <antcall target="clean"/>
607      <antcall target="test">      <antcall>
608        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="9"/>
       <param name="build.main.java" value="${java9}"/>  
609        <param name="build.main.javac" value="${javac9}"/>        <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>      </antcall>
615      </target>
616    
617      <target name="test10">
618      <antcall target="clean"/>      <antcall target="clean"/>
619      <antcall target="test">      <antcall>
620        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="10"/>
       <param name="build.main.java" value="${java10}"/>  
621        <param name="build.main.javac" value="${javac10}"/>        <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>      </antcall>
627      </target>
628    
629      <target name="test11">
630      <antcall target="clean"/>      <antcall target="clean"/>
631      <antcall target="test">      <antcall>
632        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
633        <param name="build.main.javac" value="${javac11}"/>        <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>      </antcall>
639      </target>
640    
641      <target name="test12">
642      <antcall target="clean"/>      <antcall target="clean"/>
643      <antcall target="test">      <antcall>
644        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
645        <param name="build.main.javac" value="${javac12}"/>        <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>      </antcall>
651      <antcall target="docs">    </target>
652        <param name="build.main.java.version" value="12"/>  
653        <param name="build.main.java" value="${java12}"/>    <target name="test13">
654        <param name="build.main.javac" value="${javac12}"/>      <antcall target="clean"/>
655        <antcall>
656          <param name="java.runtime.target" value="13"/>
657          <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 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}"/>        <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>      </antcall>
687      </target>
688    
689      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test9-12">
690      <antcall target="clean"/>      <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>    </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 680  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 1414  Line 1446 
1446    
1447    
1448  <!-- ==============================================================  <!-- ==============================================================
1449    Experimental errorprone support - https://errorprone.info    Experimental errorprone support
1450      https://errorprone.info
1451      https://errorprone.info/docs/installation
1452      https://github.com/google/error-prone/issues/1143
1453  =================================================================== -->  =================================================================== -->
1454    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <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=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
1462    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1463              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
1464                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
1465                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
1466                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
1467                       -Xep:ThreadPriorityCheck:OFF
1468                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
1469                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
1470                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1431  Line 1473 
1473                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1474                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
1475                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
1476                       -Xep:ConstructorInvokesOverridable:WARN
1477                     -Xep:MethodCanBeStatic:WARN                     -Xep:MethodCanBeStatic:WARN
1478                     ${errorprone.jsr166.user.flags}"/>                     ${errorprone.jsr166.user.flags}"/>
1479    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
# Line 1463  Line 1506 
1506        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1507        <compilerarg value="-J--illegal-access=permit"/>        <compilerarg value="-J--illegal-access=permit"/>
1508        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1509        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg value="-processorpath"/>
1510          <compilerarg pathref="errorprone.processorpath.path"/>
1511        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1512                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
1513        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1480  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          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1532          <compilerarg value="-J--illegal-access=permit"/>          <compilerarg value="-J--illegal-access=permit"/>
1533          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1534          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1535          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1536                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1537                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1503  Line 1547 
1547            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1548    
1549      <run-jtreg-tests      <run-jtreg-tests
1550         target="${build.main.java.version}"         target="${java.runtime.target}"
1551         workdir="${build.dir}"         workdir="${build.dir}"
1552         classes="${product.jar}"         classes="${product.jar}"
1553         verbose="all">         verbose="all">
1554        <jtreg-elements>        <jtreg-elements>
1555          <arg value="-javacoption:-XDcompilePolicy=simple"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1556          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1557          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
1558          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1559                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1560                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}

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

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