[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.213, Sat Jun 4 23:49:29 2016 UTC revision 1.271, Tue May 15 22:36:42 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">
5    
6    <description>    <description>
7  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 17  Line 19 
19    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
   $HOME/jdk/jdk7  
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24      $HOME/jdk/jdk10
25      $HOME/jdk/jdk11
26    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
   $HOME/jdk/src/jdk6  
   $HOME/jdk/src/jdk7  
27    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
28    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
29      $HOME/jdk/src/jdk10
30      $HOME/jdk/src/jdk11
31    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
32    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
33    
34    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
35    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
36    for $N in 6 7 8 9 ...    for $N in 8 9 10 ...
37    
38    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"    As of 2016-03, the sources in src/main are for jdk9+ only.
   target is currently broken.  
39  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
40    </description>    </description>
41    
# Line 63  Line 64 
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
67    
68    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 134  Line 134 
134    <defjdklocations v="7"/>    <defjdklocations v="7"/>
135    <defjdklocations v="8"/>    <defjdklocations v="8"/>
136    <defjdklocations v="9"/>    <defjdklocations v="9"/>
137      <defjdklocations v="10"/>
138      <defjdklocations v="11"/>
139    
140    <!-- Source locations -->    <!-- Source locations -->
141    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143  Line 145 
145    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148      <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182  Line 186 
186    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
187    
188    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
189    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
190    <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"/>
191    <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"/>
192    <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"/>
193    <!-- 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"/>
194    <!-- <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"/>
195    <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
196      <!-- The location of jdk early access docs (RIP) -->
197      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
198      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
199      <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
201    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"   value="${java10.docroot.url}"/>
202    
203    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
204    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198  Line 206 
206    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
207    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
208    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
209      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
210      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
211    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
212    
213    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 233  Line 243 
243        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
244      </condition>      </condition>
245    
246        <local name="use-doclint"/>
247        <condition property="use-doclint">
248          <not> <equals arg1="@{target}" arg2="7"/> </not>
249        </condition>
250    
251      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
252    
253      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 245  Line 260 
260             classpath="${junit.jar}"             classpath="${junit.jar}"
261             includeAntRuntime="false"             includeAntRuntime="false"
262             includeJavaRuntime="false"             includeJavaRuntime="false"
263               encoding="ASCII"
264             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
265             fork="true">             fork="true">
266    
267        <include name="*.java"/>        <include name="*.java"/>
268        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
269        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
270          <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
271        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272        <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
273        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
274        <javac-elements/>        <javac-elements/>
275    
# Line 263  Line 280 
280            jvm="${java@{target}}"            jvm="${java@{target}}"
281            fork="true">            fork="true">
282          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
283          <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
284            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
285            <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
286            <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
287            <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
288            <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
289          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
290            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
291            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
292    
293          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
294          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
# Line 283  Line 307 
307    </macrodef>    </macrodef>
308    
309    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
310    <fileset dir="${jtreg9.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
311      <patternset id="jdk9.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
312        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
313      </patternset>    <macrodef name="defjtregtests">
314    </fileset>      <attribute name="v"/>
315        <sequential>
316    <fileset dir="${jtreg8.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
317      <patternset id="jdk8.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
318        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
319      </patternset>      </patternset>
320    </fileset>    </fileset>
321        </sequential>
322      </macrodef>
323    
324    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="11"/>
325      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="10"/>
326        <include name="**/*.java"/>    <defjtregtests v="9"/>
327      </patternset>    <defjtregtests v="8"/>
328    </fileset>    <defjtregtests v="7"/>
329    
330    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
332    
333    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
334      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>  
335      <attribute name="target"/>      <attribute name="target"/>
336      <attribute name="workdir"/>      <attribute name="workdir"/>
337      <attribute name="classes"/>      <attribute name="classes"/>
338        <attribute name="verbose" default="${jtreg.verbose}"/>
339      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
340        <element name="jtreg-elements" optional="true"/>
341    
342      <sequential>      <sequential>
343    
# Line 326  Line 350 
350      </condition>      </condition>
351    
352      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
353      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
354             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
355             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
356        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
357        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
358        <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359          <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
360        <arg value="-agentvm"/>        <arg value="-agentvm"/>
361        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-noreport"/>
362          <arg value="-verbose:@{verbose}"/>
363        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
364        <arg value="-automatic"/>        <arg value="-automatic"/>
365        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
366        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
367        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
368          <jtreg-elements/>
369      </jtreg>      </jtreg>
370      </sequential>      </sequential>
371    </macrodef>    </macrodef>
# Line 357  Line 382 
382    <!-- Main targets -->    <!-- Main targets -->
383    
384    <property name="build.main.java.version" value="9"/>    <property name="build.main.java.version" value="9"/>
385    <property name="build.main.javac" value="${javac9}"/>    <!-- Workaround "no nested properties in ant" -->
386      <macrodef name="define-build-main-properties">
387        <attribute name="v"/>
388        <sequential>
389          <property name="build.main.java"    value="${java@{v}}"/>
390          <property name="build.main.javac"   value="${javac@{v}}"/>
391          <!-- Force javadoc version to be at least 10,
392               so we can use override-methods=summary -->
393          <condition property="build.main.javadoc"
394                     value="${javadoc11}"
395                     else="${javadoc@{v}}">
396            <equals arg1="@{v}" arg2="9"/>
397          </condition>
398        </sequential>
399      </macrodef>
400      <define-build-main-properties v="${build.main.java.version}"/>
401    
402    <target name="dists"    <target name="dists"
403            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
404            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
405              <!--
406                  depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407              -->
408    
409    <target name="compile"    <target name="compile"
410            depends="configure-compiler"            depends="configure-compiler"
411            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
412    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
413      <local name="destdir"/>      <local name="destdir"/>
414      <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"/>  
415    
416      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
417    
# Line 389  Line 423 
423             classpath=""             classpath=""
424             includeAntRuntime="false"             includeAntRuntime="false"
425             includeJavaRuntime="false"             includeJavaRuntime="false"
426               encoding="ASCII"
427             executable="${build.main.javac}"             executable="${build.main.javac}"
428             fork="true">             fork="true">
429    
430        <include name="**/*.java"/>        <include name="**/*.java"/>
431        <compilerarg value="-Xmodule:java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
432        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
433        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
434        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
435          <compilerarg line="--doclint-format html5"/>
436          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
437        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>  
438        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
440    
# Line 430  Line 466 
466      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
467      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
468    
469    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
470    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
471    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
472    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
473    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
474      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
475               packagenames="none"               packagenames="none"
476               link="${java9.api.url}"               link="${java9.api.url}"
477               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
478               access="${build.javadoc.access}"               access="${build.javadoc.access}"
479               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
480               classpath=""               classpath=""
481               executable="${javadoc9}">               source="9"
482                 executable="${build.main.javadoc}">
483        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
484          <include name="**/*.java"/>          <include name="**/*.java"/>
485        </fileset>        </fileset>
486        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
487        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
488        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
489  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-html5"/>
490        <arg value="-tag"/>        <arg value="--patch-module=java.base=${src.dir}"/>
491        <arg value="${javadoc.jls.option}"/>        <arg value="--override-methods=summary"/>
492        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  <!-- @apiNote tag currently unused -->
496        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
497        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!-- tags added in jdk9: currently unused -->
498  <!-- tags added in jdk9 -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
499        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
       <arg value="revised:X"/>  
       <arg value="-tag"/>  
       <arg value="spec:X"/>  
500      </javadoc>      </javadoc>
501    </target>    </target>
502    
# Line 491  Line 530 
530    
531    <target name="clean"    <target name="clean"
532            description="Removes all build products">            description="Removes all build products">
   
533      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
534    </target>    </target>
535    
536    
537    <target name="dist-clean"    <target name="dist-clean"
538            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
539      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
540      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
541    </target>    </target>
542    
543    
# Line 523  Line 558 
558      <run-tck-tests      <run-tck-tests
559        target="${build.main.java.version}"        target="${build.main.java.version}"
560        workdir="${build.dir}"        workdir="${build.dir}"
561        classes="${product.jar}"/>        classes="${product.jar}">
562          <javac-elements>
563            <compilerarg value="-Werror"/>
564          </javac-elements>
565        </run-tck-tests>
566    </target>    </target>
567    
568    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
# Line 558  Line 597 
597    
598    <target name="test"    <target name="test"
599            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
600            description="Runs tck and jtreg tests for src/main">            description="Runs tck and jtreg tests for src/main"/>
   </target>  
601    
602  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
603    
# Line 570  Line 608 
608    
609  <!--   </target> -->  <!--   </target> -->
610    
611  <!--   <target name="test89" -->    <target name="test91011"
612  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->            description="Runs tck and jtreg tests for src/main for multiple java versions">
613    
614  <!--     <antcall target="clean"/> -->      <antcall target="clean"/>
615  <!--     <antcall target="test"> -->      <antcall target="test">
616  <!--       <param name="build.main.java.version" value="8"/> -->        <param name="build.main.java.version" value="9"/>
617  <!--       <param name="build.main.javac" value="${javac8}"/> -->      </antcall>
 <!--     </antcall> -->  
618    
619  <!--     <antcall target="clean"/> -->      <antcall target="clean"/>
620  <!--     <antcall target="test"> -->      <antcall target="test">
621  <!--       <param name="build.main.java.version" value="9"/> -->        <param name="build.main.java.version" value="10"/>
622  <!--       <param name="build.main.javac" value="${javac9}"/> -->      </antcall>
 <!--     </antcall> -->  
623    
624  <!--   </target> -->      <antcall target="clean"/>
625        <antcall target="test">
626          <param name="build.main.java.version" value="11"/>
627        </antcall>
628    
629        <!-- Clean up to avoid obscure wrong class file version bugs -->
630        <antcall target="clean"/>
631    
632      </target>
633    
634    
635    
636    <target name="configure-compiler">    <target name="configure-compiler">
637      <fail message="ant version too old">      <fail message="ant version too old">
638        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
639      </fail>      </fail>
640    
641      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 627  Line 669 
669        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
670             source="${build.sourcelevel}"             source="${build.sourcelevel}"
671             target="${build.sourcelevel}"             target="${build.sourcelevel}"
672             encoding="ASCII"
673               fork="true">               fork="true">
674    
675        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 638  Line 681 
681      <java classname="ALoops" fork="true">      <java classname="ALoops" fork="true">
682        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
683      </java>      </java>
   
684    </target>    </target>
685    
686    
687    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
688            description="compile all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
689    
690      <mkdir dir="${build.dir}/test/loops"/>      <mkdir dir="${build.dir}/test/loops"/>
691    
# Line 654  Line 696 
696             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
697             includeAntRuntime="false"             includeAntRuntime="false"
698             includeJavaRuntime="false"             includeJavaRuntime="false"
699             executable="${javac9}"             encoding="ASCII"
700               executable="${build.main.javac}"
701             fork="true">             fork="true">
702    
703        <include name="*.java"/>        <include name="*.java"/>
# Line 662  Line 705 
705        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
706        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
707        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
708      </javac>      </javac>
   
709    </target>    </target>
710    
711    
# Line 687  Line 728 
728             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
729             includeAntRuntime="false"             includeAntRuntime="false"
730             includeJavaRuntime="false"             includeJavaRuntime="false"
731               encoding="ASCII"
732             executable="${javac8}"             executable="${javac8}"
733             fork="true">             fork="true">
   
734        <include name="**/*.java"/>        <include name="**/*.java"/>
735        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
736        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
737        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
738        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
739        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
740      </javac>      </javac>
741    </target>    </target>
742    
# Line 717  Line 757 
757             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
758             includeAntRuntime="false"             includeAntRuntime="false"
759             includeJavaRuntime="false"             includeJavaRuntime="false"
760               encoding="ASCII"
761             executable="${javac8}"             executable="${javac8}"
762             fork="true">             fork="true">
   
763        <include name="**/*.java"/>        <include name="**/*.java"/>
764        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
765        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
766        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
767        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
768        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
769      </javac>      </javac>
770    </target>    </target>
771    
# Line 742  Line 781 
781          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
782        </manifest>        </manifest>
783      </jar>      </jar>
   
784    </target>    </target>
785    
786    
# Line 758  Line 796 
796          <!-- JDK9+ test classes -->          <!-- JDK9+ test classes -->
797          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
798          <exclude name="*10Test.java"/>          <exclude name="*10Test.java"/>
799            <compilerarg value="-Werror"/>
800        </javac-elements>        </javac-elements>
801      </run-tck-tests>      </run-tck-tests>
802    </target>    </target>
# Line 775  Line 814 
814    
815    <target name="4jdk8-test"    <target name="4jdk8-test"
816            depends="4jdk8-tck, 4jdk8-jtreg"            depends="4jdk8-tck, 4jdk8-jtreg"
817            description="Runs tck and jtreg tests for jsr166-4jdk8">            description="Runs tck and jtreg tests for jsr166-4jdk8"/>
   </target>  
818    
819    
820    <target name="4jdk8docs"    <target name="4jdk8docs"
# Line 792  Line 830 
830               access="${build.javadoc.access}"               access="${build.javadoc.access}"
831               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
832               classpath=""               classpath=""
833                 source="8"
834               executable="${javadoc8}"               executable="${javadoc8}"
835               failonerror = "true">               failonerror = "true">
836        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 799  Line 838 
838        </fileset>        </fileset>
839        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
840        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
841        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
842        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
843        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
844        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!-- @apiNote tag currently unused -->
845        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <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;"/>  
846      </javadoc>      </javadoc>
847    </target>    </target>
848    
# Line 818  Line 854 
854    
855    <target name="4jdk8clean"    <target name="4jdk8clean"
856            description="Removes all 4jdk8 build products">            description="Removes all 4jdk8 build products">
   
857      <delete dir="${build.4jdk8.dir}"/>      <delete dir="${build.4jdk8.dir}"/>
   
858    </target>    </target>
859    
860    
# Line 836  Line 870 
870    </target>    </target>
871    
872    
873      <!-- jsr166 4jdk7 (no longer maintained) -->
874    
875    <!-- jsr166 4jdk7 -->    <target name="4jdk7compile" depends="configure-compiler">
   
   <target name="4jdk7compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk7 sources, targeting jdk7">  
   
876      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
877    
878      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 856  Line 886 
886             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
887             includeAntRuntime="false"             includeAntRuntime="false"
888             includeJavaRuntime="false"             includeJavaRuntime="false"
889               encoding="ASCII"
890             executable="${javac7}"             executable="${javac7}"
891             fork="true">             fork="true">
892    
# Line 865  Line 896 
896        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
897        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
898        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
899      </javac>      </javac>
900    </target>    </target>
901    
902    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
903      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
904    
905      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 886  Line 913 
913             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
914             includeAntRuntime="false"             includeAntRuntime="false"
915             includeJavaRuntime="false"             includeJavaRuntime="false"
916               encoding="ASCII"
917             executable="${javac8}"             executable="${javac8}"
918             fork="true">             fork="true">
919    
# Line 895  Line 923 
923        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
924        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
925        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
926      </javac>      </javac>
927    </target>    </target>
928    
929      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
930      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
931        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
932        <manifest>        <manifest>
# Line 911  Line 934 
934          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935        </manifest>        </manifest>
936      </jar>      </jar>
   
937    </target>    </target>
938    
939      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
940      <run-tck-tests      <run-tck-tests
941        target="7"        target="7"
942        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 936  Line 954 
954          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
955          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
956          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
957            <compilerarg value="-Werror"/>
958        </javac-elements>        </javac-elements>
959      </run-tck-tests>      </run-tck-tests>
960    </target>    </target>
961    
   
962    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
963    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile">  
964    
965      <junit printsummary="true"      <junit printsummary="true"
966             showoutput="true"             showoutput="true"
# Line 965  Line 982 
982    
983        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
984        </test>        </test>
   
985      </junit>      </junit>
986    </target>    </target>
987    
988    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
989      <run-jtreg-tests      <run-jtreg-tests
990         target="7"         target="7"
991         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
992         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
993    </target>    </target>
994    
995      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
996    
997    <target name="4jdk7-test"    <target name="4jdk7docs">
           depends="4jdk7-tck, 4jdk7-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk7">  
   </target>  
   
   
   <target name="4jdk7docs"  
           description="Builds javadocs for src/jdk7 to dist dir">  
   
998      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
999      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
1000    
# Line 1008  Line 1015 
1015      </javadoc>      </javadoc>
1016    </target>    </target>
1017    
1018      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1019    
1020    <target name="4jdk7dist"    <target name="4jdk7clean">
           depends="4jdk7dist-jar, 4jdk7dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk7clean"  
           description="Removes all 4jdk7 build products">  
   
1021      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1022    </target>    </target>
1023    
1024      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1025      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1026    </target>    </target>
1027    
1028      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1029      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1030    </target>    </target>
1031    
1032    
1033    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1034    
1035      <target name="jsr166xcompile" depends="configure-compiler">
1036      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1037    
1038      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1053  Line 1046 
1046             target="5"             target="5"
1047             includeAntRuntime="false"             includeAntRuntime="false"
1048             includeJavaRuntime="false"             includeJavaRuntime="false"
1049               encoding="ASCII"
1050             executable="${javac7}"             executable="${javac7}"
1051             fork="true">             fork="true">
   
1052        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1053        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1054        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1055        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1056        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1057      </javac>      </javac>
1058    </target>    </target>
1059    
1060      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1061      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1062        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1063        <manifest>        <manifest>
# Line 1077  Line 1065 
1065          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1066        </manifest>        </manifest>
1067      </jar>      </jar>
   
1068    </target>    </target>
1069    
1070      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1071      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1072      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1073    
# Line 1098  Line 1082 
1082               failonerror = "true">               failonerror = "true">
1083        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1084        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1085      </javadoc>      </javadoc>
1086    </target>    </target>
1087    
1088      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1089    
1090    <target name="jsr166xdist"    <target name="jsr166xclean">
           depends="jsr166xdist-jar, jsr166xdist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166xclean"  
           description="Removes all jsr166x build products">  
   
1091      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1092    </target>    </target>
1093    
1094      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1095      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1096    </target>    </target>
1097    
1098    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1099      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1100    </target>    </target>
1101    
   <!-- jsr166y -->  
1102    
1103      <!-- jsr166y (no longer maintained) -->
1104    
1105    <target name="jsr166ycompile"    <target name="jsr166ycompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
   
1106      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1107    
1108      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1146  Line 1116 
1116             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1117             includeAntRuntime="false"             includeAntRuntime="false"
1118             includeJavaRuntime="false"             includeJavaRuntime="false"
1119               encoding="ASCII"
1120             executable="${javac7}"             executable="${javac7}"
1121             fork="true">             fork="true">
1122    
# Line 1154  Line 1125 
1125        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1126        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1127        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1128      </javac>      </javac>
1129    </target>    </target>
1130    
1131      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1132      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1133        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1134        <manifest>        <manifest>
# Line 1170  Line 1136 
1136          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1137        </manifest>        </manifest>
1138      </jar>      </jar>
   
1139    </target>    </target>
1140    
1141      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1142      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1143      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1144    
# Line 1191  Line 1153 
1153               failonerror = "true">               failonerror = "true">
1154        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1155        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1156      </javadoc>      </javadoc>
1157    </target>    </target>
1158    
1159      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1160    
1161    <target name="jsr166ydist"    <target name="jsr166yclean">
           depends="jsr166ydist-jar, jsr166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166yclean"  
           description="Removes all jsr166y build products">  
   
1162      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1163    </target>    </target>
1164    
1165      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1166      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1167    </target>    </target>
1168    
1169    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1170      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1171    </target>    </target>
1172    
1173    
1174    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1175    
1176      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1177      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1178    
1179      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1240  Line 1187 
1187             target="6"             target="6"
1188             includeAntRuntime="false"             includeAntRuntime="false"
1189             includeJavaRuntime="false"             includeJavaRuntime="false"
1190               encoding="ASCII"
1191             executable="${javac7}"             executable="${javac7}"
1192             fork="true">             fork="true">
1193    
# Line 1248  Line 1196 
1196        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1197        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1198        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1199      </javac>      </javac>
1200    </target>    </target>
1201    
1202      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1203      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1204        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1205        <manifest>        <manifest>
# Line 1264  Line 1207 
1207          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1208        </manifest>        </manifest>
1209      </jar>      </jar>
   
1210    </target>    </target>
1211    
1212      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1213      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1214      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1215    
# Line 1284  Line 1223 
1223               executable="${javadoc7}">               executable="${javadoc7}">
1224        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1225        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1226      </javadoc>      </javadoc>
1227    </target>    </target>
1228    
1229      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1230    
1231    <target name="extra166ydist"    <target name="extra166yclean">
           depends="extra166ydist-jar, extra166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="extra166yclean"  
           description="Removes all extra166y build products">  
   
1232      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1233    </target>    </target>
1234    
1235      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1236      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1237    </target>    </target>
1238    
1239    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1240      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1241    </target>    </target>
1242    
1243    <!-- jsr166e -->  
1244      <!-- jsr166e (no longer maintained) -->
1245    
1246    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1247    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1248    
1249    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1250      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1251    
1252      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1341  Line 1267 
1267        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1268        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1269        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1270      </javac>      </javac>
1271    </target>    </target>
1272    
   <!-- jsr166e: find doclint errors -->  
1273    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1274      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1275    
1276      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1369  Line 1292 
1292        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1293        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1294        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1295      </javac>      </javac>
1296    </target>    </target>
1297    
1298      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1299      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1300        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1301        <manifest>        <manifest>
# Line 1385  Line 1303 
1303          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1304        </manifest>        </manifest>
1305      </jar>      </jar>
   
1306    </target>    </target>
1307    
1308      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1309      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1310      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1311    
# Line 1405  Line 1319 
1319               failonerror = "true">               failonerror = "true">
1320        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1321        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1322      </javadoc>      </javadoc>
1323    </target>    </target>
1324    
1325      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1326      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1327      <run-tck-tests      <run-tck-tests
1328        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1329        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1422  Line 1331 
1331        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1332    </target>    </target>
1333    
1334    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1335    
1336  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1337  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1444  Line 1352 
1352      </antcall>      </antcall>
1353    </target>    </target>
1354    
1355      <target name="jsr166e-test" depends="jsr166e-tck"/>
1356    
1357    <target name="jsr166e-test"    <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
           depends="jsr166e-tck"  
           description="Runs all tests for jsr166e">  
   </target>  
   
   <target name="jsr166edist"  
           depends="jsr166edist-jar, jsr166edist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
1358    
1359    <target name="jsr166eclean"    <target name="jsr166eclean">
           description="Removes all jsr166e build products">  
1360      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1361    </target>    </target>
1362    
   
1363    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1364            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1365      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1366    </target>    </target>
1367    
1368    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1369      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1370    </target>    </target>
1371    
1372    
1373  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1374    
1375    <target name="lint">  <!--   <target name="lint"> -->
1376      <antcall target="dists">  <!--     <antcall target="dists"> -->
1377        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1378      </antcall>  <!--     </antcall> -->
1379    </target>  <!--   </target> -->
1380    
1381  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1382    <target name="lint-private">    <target name="doclint-private">
1383      <antcall target="dist">      <antcall target="dist">
1384        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1385      </antcall>      </antcall>
1386    </target>    </target>
1387    
1388    
1389    <!-- ==============================================================
1390      Experimental errorprone support - http://errorprone.info
1391    =================================================================== -->
1392      <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1393      <property name="errorprone.jsr166.user.flags" value=""/>
1394      <property name="errorprone.jsr166.flags"
1395                value="-Xep:HashtableContains:OFF
1396                       -Xep:JdkObsolete:OFF
1397                       -Xep:MissingOverride:OFF
1398                       -Xep:MissingFail:OFF
1399                       -Xep:MixedArrayDimensions:ERROR
1400                       -Xep:RemoveUnusedImports:ERROR
1401                       -Xep:EmptyIf:ERROR
1402                       -Xep:MultipleTopLevelClasses:ERROR
1403                       -Xep:ClassName:ERROR
1404                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1405                       -Xep:RedundantThrows:ERROR
1406                       -Xep:IdentityBinaryExpression:WARN
1407                       -Xep:MethodCanBeStatic:WARN
1408                       ${errorprone.jsr166.user.flags}"/>
1409      <!-- -Xep:WildcardImport:ERROR -->
1410      <property name="errorprone.jsr166.test.flags"
1411                value="-Xep:StringSplitter:OFF
1412                       -Xep:BoxedPrimitiveConstructor:OFF
1413                       -Xep:ModifyingCollectionWithItself:OFF"/>
1414      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1415      <target name="errorprone"
1416              depends="clean, configure-compiler"
1417              description="Run errorprone over jsr166 source code (experimental)">
1418    
1419        <local name="destdir"/>
1420        <property name="destdir" value="${build.classes.dir}/java.base"/>
1421        <mkdir dir="${destdir}"/>
1422    
1423        <javac srcdir="${src.dir}"
1424               destdir="${destdir}"
1425               debug="${build.debug}"
1426               debuglevel="${build.debuglevel}"
1427               deprecation="${build.deprecation}"
1428               classpath=""
1429               includeAntRuntime="false"
1430               includeJavaRuntime="false"
1431               encoding="ASCII"
1432               executable="${build.main.javac}"
1433               fork="true">
1434    
1435          <include name="**/*.java"/>
1436          <compilerarg value="-J--illegal-access=debug"/>
1437          <compilerarg value="-XDcompilePolicy=simple"/>
1438          <compilerarg line="-processorpath ${errorprone.jar}"/>
1439          <compilerarg value="-Xplugin:ErrorProne
1440                              ${errorprone.jsr166.flags}"/>
1441          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1442          <compilerarg value="-Xprefer:source"/>
1443          <compilerarg value="-XDignore.symbol.file=true"/>
1444          <compilerarg value="-Xlint:all"/>
1445          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1446          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1447          <compilerarg line="${build.args}"/>
1448        </javac>
1449    
1450        <jar destfile="${product.jar}">
1451          <fileset dir="${destdir}"/>
1452        </jar>
1453    
1454        <run-tck-tests
1455          target="${build.main.java.version}"
1456          workdir="${build.dir}"
1457          classes="${product.jar}">
1458          <javac-elements>
1459            <compilerarg value="-J--illegal-access=debug"/>
1460            <compilerarg value="-XDcompilePolicy=simple"/>
1461            <compilerarg line="-processorpath ${errorprone.jar}"/>
1462            <compilerarg value="-Xplugin:ErrorProne
1463                                ${errorprone.jsr166.flags}
1464                                ${errorprone.jsr166.test.flags}"/>
1465            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1466          </javac-elements>
1467        </run-tck-tests>
1468      </target>
1469    
1470      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1471      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1472      <target name="errorprone-jtreg"
1473              depends="jar"
1474              description="Run errorprone over jtreg tests (experimental)">
1475    
1476        <run-jtreg-tests
1477           target="${build.main.java.version}"
1478           workdir="${build.dir}"
1479           classes="${product.jar}"
1480           verbose="all">
1481          <jtreg-elements>
1482            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1483            <arg value="-javacoption:-processorpath"/>
1484            <arg value="-javacoption:${errorprone.jar}"/>
1485            <arg value="-javacoption:-Xplugin:ErrorProne
1486                                ${errorprone.jsr166.flags}
1487                                ${errorprone.jsr166.test.flags}
1488                                -Xep:MultipleTopLevelClasses:WARN
1489                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1490          </jtreg-elements>
1491        </run-jtreg-tests>
1492      </target>
1493    
1494    
1495    <!-- ==============================================================
1496      Running guava tests against jsr166 code
1497    =================================================================== -->
1498    
1499    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1500    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1501    <!-- <property name="guava.version" value="21.0"/> -->
1502    
1503    <!-- HOWTO debug print a path id -->
1504    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1505    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1506    
1507    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1508    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1509    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1510    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1511    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1512    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1513    
1514    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1515    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1516    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1517    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1518    
1519    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1520    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1521    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1522    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1523    
1524    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1525    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1526    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1527    
1528      <target name="init-ivy">
1529        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1530             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1531        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1532                 classpath="${build.dir}/ivy.jar"/>
1533      </target>
1534    
1535      <target name="guava-tests" depends="jar, init-ivy"
1536              description="Guava tests run against jsr166 collections">
1537        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1538        <mkdir dir="${guava.dir}"/>
1539        <ivy:retrieve pathid="guava.testlib.classpath"
1540          type="jar,bundle" inline="true" conf="default,master"
1541          pattern="${guava.dir}/[artifact].[ext]"
1542          organisation="com.google.guava" module="guava-testlib"/>
1543        <property name="guava.version" value="21.0"/>
1544        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1545             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1546        <junit printsummary="true" showoutput="true" haltonfailure="true"
1547               jvm="${build.main.java}" fork="true">
1548          <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1549          <formatter type="brief"/>
1550          <classpath>
1551            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1552            <path refid="guava.testlib.classpath"/>
1553          </classpath>
1554    
1555          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1556          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1557        </junit>
1558      </target>
1559    
1560  </project>  </project>

Legend:
Removed from v.1.213  
changed lines
  Added in v.1.271

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8