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

Diff of /jsr166/build.xml

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

revision 1.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC revision 1.292 by jsr166, Thu Dec 13 01:12:01 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    <!-- The expected canonical location does not yet exist as of 2016-04 -->    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <!-- The location of jdk early access docs (RIP) -->
201      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203      <!-- <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}"/>
325      </patternset>          </patternset>
326    </fileset>        </fileset>
327        </sequential>
328    <fileset dir="${jtreg8.src.dir}">    </macrodef>
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
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=""/>
339    
340    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
341      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
342      <attribute name="target"/>      <attribute name="target"/>
343      <attribute name="workdir"/>      <attribute name="workdir"/>
344      <attribute name="classes"/>      <attribute name="classes"/>
345        <attribute name="verbose" default="${jtreg.verbose}"/>
346      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
347        <element name="jtreg-elements" optional="true"/>
348    
349      <sequential>      <sequential>
350    
# Line 337  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 346  Line 362 
362             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
363        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
364        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
365        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
366        <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367        <arg value="-agentvm"/>        <arg value="-agentvm"/>
368        <arg value="-noreport"/>        <arg value="-noreport"/>
369        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:@{verbose}"/>
370        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
371        <arg value="-automatic"/>        <arg value="-automatic"/>
372        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
373        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
374        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
375          <jtreg-elements/>
376      </jtreg>      </jtreg>
377      </sequential>      </sequential>
378    </macrodef>    </macrodef>
# Line 371  Line 388 
388    
389    <!-- Main targets -->    <!-- Main targets -->
390    
391    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
392      <!-- At runtime, target latest LTS, i.e. jdk11 -->
393      <!-- But at build time, target jdk9, for maximal binary portability -->
394      <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395        o override-methods=summary
396        o {@systemProperty ...}
397        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398        o 8202628: javadoc generates bad links in TestModules.java
399        -->
400      <property name="java.runtime.target" value="11"/>
401      <property name="build.main.java" value="${java11}"/>
402    <property name="build.main.javac" value="${javac9}"/>    <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"
413            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
414    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
415      <local name="destdir"/>      <local name="destdir"/>
416      <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>  
417    
418      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
419    
# Line 412  Line 430 
430             fork="true">             fork="true">
431    
432        <include name="**/*.java"/>        <include name="**/*.java"/>
433        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>        <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 457  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="${javadoc9}">               executable="${build.main.javadoc}">
485    <!-- TODO: JDK-8214571 failonerror = "true" -->
486        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
487          <include name="**/*.java"/>          <include name="**/*.java"/>
488        </fileset>        </fileset>
489        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
490        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
491        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
492        <arg value="-html5"/>        <arg value="-html5"/>
493        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
494        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
495        <arg value="${javadoc.jls.option}"/>        <arg value="--frames"/>
496  <!-- @apiNote currently unused -->        <arg value="--override-methods=summary"/>
497  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
498  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
499        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
500        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
501  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
502  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
503  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
504      </javadoc>      </javadoc>
505    </target>    </target>
506    
# Line 495  Line 510 
510            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
511    
512    
   <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>  
   
   
513    <target name="clean"    <target name="clean"
514            description="Removes all build products">            description="Removes all build products">
515      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 545  Line 538 
538            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
539    
540      <run-tck-tests      <run-tck-tests
541        target="${build.main.java.version}"        target="${java.runtime.target}"
542        workdir="${build.dir}"        workdir="${build.dir}"
543        classes="${product.jar}">        classes="${product.jar}">
544        <javac-elements>        <javac-elements>
# Line 579  Line 572 
572            depends="jar"            depends="jar"
573            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
574      <run-jtreg-tests      <run-jtreg-tests
575         target="${build.main.java.version}"         target="${java.runtime.target}"
576         workdir="${build.dir}"         workdir="${build.dir}"
577         classes="${product.jar}"/>         classes="${product.jar}"/>
578    </target>    </target>
# Line 588  Line 581 
581            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
582            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
583    
584  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
585              depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
586  <!--     <antcall target="jtreg"> -->    </target>
 <!--       <param name="build.main.java.version" value="8"/> -->  
 <!--       <param name="build.main.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
587    
588  <!--   </target> -->    <target name="test9">
589        <antcall target="clean"/>
590        <antcall>
591          <param name="java.runtime.target" value="9"/>
592          <param name="build.main.javac" value="${javac9}"/>
593          <param name="build.main.javadoc" value="${javadoc12}"/>
594          <param name="build.main.javadoc.source" value="9"/>
595          <target name="test"/>
596          <target name="docs"/>
597        </antcall>
598      </target>
599    
600  <!--   <target name="test89" -->    <target name="test10">
601  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->      <antcall target="clean"/>
602        <antcall>
603          <param name="java.runtime.target" value="10"/>
604          <param name="build.main.javac" value="${javac10}"/>
605          <param name="build.main.javadoc" value="${javadoc12}"/>
606          <param name="build.main.javadoc.source" value="10"/>
607          <target name="test"/>
608          <target name="docs"/>
609        </antcall>
610      </target>
611    
612  <!--     <antcall target="clean"/> -->    <target name="test11">
613  <!--     <antcall target="test"> -->      <antcall target="clean"/>
614  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall>
615  <!--       <param name="build.main.javac" value="${javac8}"/> -->        <param name="java.runtime.target" value="11"/>
616  <!--     </antcall> -->        <param name="build.main.javac" value="${javac11}"/>
617          <param name="build.main.javadoc" value="${javadoc12}"/>
618          <param name="build.main.javadoc.source" value="11"/>
619          <target name="test"/>
620          <target name="docs"/>
621        </antcall>
622      </target>
623    
624  <!--     <antcall target="clean"/> -->    <target name="test12">
625  <!--     <antcall target="test"> -->      <antcall target="clean"/>
626  <!--       <param name="build.main.java.version" value="9"/> -->      <antcall>
627  <!--       <param name="build.main.javac" value="${javac9}"/> -->        <param name="java.runtime.target" value="12"/>
628  <!--     </antcall> -->        <param name="build.main.javac" value="${javac12}"/>
629          <param name="build.main.javadoc" value="${javadoc12}"/>
630          <param name="build.main.javadoc.source" value="12"/>
631          <target name="test"/>
632          <target name="docs"/>
633        </antcall>
634      </target>
635    
636  <!--   </target> -->    <target name="test9-11">
637        <antcall target="clean"/>
638        <antcall>
639          <param name="java.runtime.target" value="11"/>
640          <param name="build.main.javac" value="${javac9}"/>
641          <param name="build.main.javadoc" value="${javadoc12}"/>
642          <param name="build.main.javadoc.source" value="9"/>
643          <target name="test"/>
644          <target name="docs"/>
645        </antcall>
646      </target>
647    
648      <target name="test9-12">
649        <antcall target="clean"/>
650        <antcall>
651          <param name="java.runtime.target" value="12"/>
652          <param name="build.main.javac" value="${javac9}"/>
653          <param name="build.main.javadoc" value="${javadoc12}"/>
654          <param name="build.main.javadoc.source" value="9"/>
655          <target name="test"/>
656          <target name="docs"/>
657        </antcall>
658      </target>
659    
660    
661    <target name="configure-compiler">    <target name="configure-compiler">
# Line 636  Line 678 
678    </target>    </target>
679    
680    
   
   <!-- 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>  
   
   
681    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
682            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
683    
# Line 680  Line 691 
691             includeAntRuntime="false"             includeAntRuntime="false"
692             includeJavaRuntime="false"             includeJavaRuntime="false"
693             encoding="ASCII"             encoding="ASCII"
694             executable="${javac9}"             executable="${build.main.javac}"
695             fork="true">             fork="true">
696    
697        <include name="*.java"/>        <include name="*.java"/>
# Line 821  Line 832 
832        </fileset>        </fileset>
833        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
834        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
835        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
836        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
837  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
838  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
839  <!--       <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;"/>  
840      </javadoc>      </javadoc>
841    </target>    </target>
842    
# Line 1359  Line 1366 
1366    
1367  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1368    
1369    <target name="lint">  <!--   <target name="lint"> -->
1370      <antcall target="dists">  <!--     <antcall target="dists"> -->
1371        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1372      </antcall>  <!--     </antcall> -->
1373    </target>  <!--   </target> -->
1374    
1375  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1376    <target name="lint-private">    <target name="doclint-private">
1377      <antcall target="dist">      <antcall target="dist">
1378        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1379      </antcall>      </antcall>
# Line 1374  Line 1381 
1381    
1382    
1383  <!-- ==============================================================  <!-- ==============================================================
1384    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1385    You may need to bring your own errorprone jar.    https://errorprone.info
1386      https://errorprone.info/docs/installation
1387      https://github.com/google/error-prone/issues/1143
1388  =================================================================== -->  =================================================================== -->
1389      <path id="errorprone.processorpath.path">
1390        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1391        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1392        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1393        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1394      </path>
1395      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1396      <property name="errorprone.jsr166.user.flags" value=""/>
1397      <property name="errorprone.jsr166.flags"
1398                value="-Xep:HashtableContains:OFF
1399                       -Xep:JdkObsolete:OFF
1400                       -Xep:MissingOverride:OFF
1401                       -Xep:MissingFail:OFF
1402                       -Xep:ThreadPriorityCheck:OFF
1403                       -Xep:MixedArrayDimensions:ERROR
1404                       -Xep:RemoveUnusedImports:ERROR
1405                       -Xep:EmptyIf:ERROR
1406                       -Xep:MultipleTopLevelClasses:ERROR
1407                       -Xep:ClassName:ERROR
1408                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1409                       -Xep:RedundantThrows:ERROR
1410                       -Xep:IdentityBinaryExpression:WARN
1411                       -Xep:ConstructorInvokesOverridable:WARN
1412                       -Xep:MethodCanBeStatic:WARN
1413                       ${errorprone.jsr166.user.flags}"/>
1414      <!-- -Xep:WildcardImport:ERROR -->
1415      <property name="errorprone.jsr166.test.flags"
1416                value="-Xep:StringSplitter:OFF
1417                       -Xep:BoxedPrimitiveConstructor:OFF
1418                       -Xep:ModifyingCollectionWithItself:OFF"/>
1419      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1420    <target name="errorprone"    <target name="errorprone"
1421            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1422            description="Run errorprone over jsr166 source code (experimental)">            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398  Line 1438 
1438             fork="true">             fork="true">
1439    
1440        <include name="**/*.java"/>        <include name="**/*.java"/>
1441        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1442        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>        <compilerarg value="-J--illegal-access=permit"/>
1443        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1444        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>        <compilerarg value="-processorpath"/>
1445        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>        <compilerarg pathref="errorprone.processorpath.path"/>
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
       <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>  
1446        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1447                            -Xep:IdentityBinaryExpression:WARN                            ${errorprone.jsr166.flags}"/>
                           -Xep:MissingOverride:OFF  
                           -Xep:MixedArrayDimensions:WARN  
                           -Xep:RemoveUnusedImports:ERROR  
                           -Xep:ClassName:ERROR  
                           -Xep:MultipleTopLevelClasses:ERROR  
                           -Xep:EmptyIf:ERROR  
                           -Xep:LongLiteralLowerCaseSuffix:ERROR  
                           -Xep:ArgumentParameterSwap:ERROR  
                           -Xep:RedundantThrows:ERROR  
                           -Xep:MethodCanBeStatic:WARN"/>  
1448        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1449        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1450        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1434  Line 1459 
1459      </jar>      </jar>
1460    
1461      <run-tck-tests      <run-tck-tests
1462        target="${build.main.java.version}"        target="${java.runtime.target}"
1463        workdir="${build.dir}"        workdir="${build.dir}"
1464        classes="${product.jar}">        classes="${product.jar}">
1465        <javac-elements>        <javac-elements>
1466          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1467          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>          <compilerarg value="-J--illegal-access=permit"/>
1468          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1469          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
         <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>  
1470          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1471                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1472                              -Xep:BoxedPrimitiveConstructor:OFF                              ${errorprone.jsr166.test.flags}"/>
                             -Xep:HashtableContains:OFF  
                             -Xep:ModifyingCollectionWithItself:OFF  
                             -Xep:MissingOverride:OFF  
                             -Xep:MixedArrayDimensions:WARN  
                             -Xep:RemoveUnusedImports:ERROR  
                             -Xep:ClassName:ERROR  
                             -Xep:MultipleTopLevelClasses:ERROR  
                             -Xep:EmptyIf:ERROR  
                             -Xep:LongLiteralLowerCaseSuffix:ERROR  
                             -Xep:ArgumentParameterSwap:ERROR  
                             -Xep:RedundantThrows:ERROR  
                             -Xep:MethodCanBeStatic:WARN"/>  
1473          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1474        </javac-elements>        </javac-elements>
1475      </run-tck-tests>      </run-tck-tests>
1476    </target>    </target>
1477    
1478      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1479      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1480      <target name="errorprone-jtreg"
1481              depends="jar"
1482              description="Run errorprone over jtreg tests (experimental)">
1483    
1484        <run-jtreg-tests
1485           target="${java.runtime.target}"
1486           workdir="${build.dir}"
1487           classes="${product.jar}"
1488           verbose="all">
1489          <jtreg-elements>
1490            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1491            <arg value="-javacoption:-processorpath"/>
1492            <arg value="-javacoption:${errorprone.processorpath}"/>
1493            <arg value="-javacoption:-Xplugin:ErrorProne
1494                                ${errorprone.jsr166.flags}
1495                                ${errorprone.jsr166.test.flags}
1496                                -Xep:MultipleTopLevelClasses:WARN
1497                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1498          </jtreg-elements>
1499        </run-jtreg-tests>
1500      </target>
1501    
1502    
1503  <!-- ==============================================================  <!-- ==============================================================
1504    Running guava tests against jsr166 code    Running guava tests against jsr166 code
# Line 1521  Line 1552 
1552      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1553           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1554      <junit printsummary="true" showoutput="true" haltonfailure="true"      <junit printsummary="true" showoutput="true" haltonfailure="true"
1555             jvm="${java9}" fork="true">             jvm="${build.main.java}" fork="true">
1556        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>        <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1557        <formatter type="brief"/>        <formatter type="brief"/>
1558        <classpath>        <classpath>
1559          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Legend:
Removed from v.1.246  
changed lines
  Added in v.1.292

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