[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.197, Fri Mar 4 21:00:45 2016 UTC revision 1.229, Tue Dec 20 04:18:46 2016 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" xmlns:unless="ant:unless"
3      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 7  Line 8 
8    
9    Usage: ant [target]    Usage: ant [target]
10    
11      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12      more details.
13    
14    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
15    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
16    
# Line 27  Line 31 
31    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
32    
33    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
35    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
36    
37    As of 2015-09, there is incomplete hacky support for jigsaw    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
38    Build for jigsaw using something like:    target is currently broken.
   ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist  
   "docs" target is still broken.  
39  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
40    </description>    </description>
41    
42    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
43    <target name="usage">    <target name="usage">
44      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
45        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 62  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"/>
70    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72    
73      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77    
78    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 89  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98        <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99      <local name="have.java.base"/>      <local name="have.java.base"/>
100      <available property="have.java.base"      <available property="have.java.base"
101        file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>        file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103        if:set="have.java.base"/>        if:set="have.java.base"/>
104      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105        unless:set="have.java.base"/>        unless:set="have.java.base"/>
106      <local name="modules"/>      <local name="modules"/>
107      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 134  Line 141 
141    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
148    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
149    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
150    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149  Line 157 
157    <!-- Javadoc locations -->    <!-- Javadoc locations -->
158    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
159    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156  Line 165 
165    
166    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164  Line 174 
174    <!-- Jar locations -->    <!-- Jar locations -->
175    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 175  Line 186 
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189    <!-- The expected canonical location does not yet exist as of 2015-11 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# Line 209  Line 220 
220      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="classes"/>      <attribute name="classes"/>
223        <!--
224            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225        -->
226      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
228    
# Line 231  Line 245 
245             classpath="${junit.jar}"             classpath="${junit.jar}"
246             includeAntRuntime="false"             includeAntRuntime="false"
247             includeJavaRuntime="false"             includeJavaRuntime="false"
248               encoding="ASCII"
249             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
250             fork="true">             fork="true">
251    
# Line 238  Line 253 
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256        <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 249  Line 264 
264            jvm="${java@{target}}"            jvm="${java@{target}}"
265            fork="true">            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267          <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
271            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
272          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
273            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
274            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
275    
276          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
277          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
# Line 278  Line 299 
299    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
300      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
301        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
302      </patternset>      </patternset>
303    </fileset>    </fileset>
304    
# Line 312  Line 330 
330      </condition>      </condition>
331    
332      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->  
     <mkdir dir="@{workdir}/JTreport/html"/>  
     <mkdir dir="@{workdir}/JTreport/text"/>  
333      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
334             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
335             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
336        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341          <arg value="-noreport"/>
342        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
344        <arg value="-automatic"/>        <arg value="-automatic"/>
# Line 350  Line 364 
364    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
365    
366    <target name="dists"    <target name="dists"
367            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
369    
370    <target name="compile"    <target name="compile"
# Line 379  Line 393 
393             classpath=""             classpath=""
394             includeAntRuntime="false"             includeAntRuntime="false"
395             includeJavaRuntime="false"             includeJavaRuntime="false"
396               encoding="ASCII"
397             executable="${build.main.javac}"             executable="${build.main.javac}"
398             fork="true">             fork="true">
399    
# Line 393  Line 408 
408        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
409    
410      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
411    </target>    </target>
412    
413    
414    <target name="jar"    <target name="jar"
415            depends="compile"            depends="compile"
416            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
417        <local name="subdir"/>
418        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
420        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
421        <manifest>        <manifest>
422          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
423          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 422  Line 435 
435      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
436      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
437    
438    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
444               packagenames="none"               packagenames="none"
445               link="${java9.api.url}"               link="${java9.api.url}"
446               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
447               access="${build.javadoc.access}"               access="${build.javadoc.access}"
448               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
449               classpath=""               classpath=""
450               executable="${javadoc9}">               executable="${javadoc9}">
451        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 436  Line 454 
454        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
455        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
456        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
457  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
460    <!-- @apiNote currently unused -->
461    <!--       <arg value="-tag"/> -->
462    <!--       <arg value="apiNote:a:API Note:"/> -->
463        <arg value="-tag"/>        <arg value="-tag"/>
464        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
465        <arg value="-tag"/>        <arg value="-tag"/>
466        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
467    <!-- tags added in jdk9: currently unused -->
468    <!--       <arg value="-tag"/> -->
469    <!--       <arg value="revised:X"/> -->
470    <!--       <arg value="-tag"/> -->
471    <!--       <arg value="spec:X"/> -->
472      </javadoc>      </javadoc>
473    </target>    </target>
474    
# Line 505  Line 529 
529    
530    <target name="tck"    <target name="tck"
531            depends="jar"            depends="jar"
532            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
533    
534      <run-tck-tests      <run-tck-tests
535        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 514  Line 538 
538    </target>    </target>
539    
540    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
541            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
542      <antcall target="tck">      <antcall target="tck">
543        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
544      </antcall>      </antcall>
545    </target>    </target>
546    
547    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
548            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
549      <antcall target="tck">      <antcall target="tck">
550        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
551      </antcall>      </antcall>
552    </target>    </target>
553    
554      <target name="tck-security-manager"
555              description="Runs tck with a security manager">
556        <antcall target="tck">
557          <param name="jsr166.useSecurityManager" value="true"/>
558        </antcall>
559      </target>
560    
561    <target name="jtreg"    <target name="jtreg"
562            depends="jar"            depends="jar"
563            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
564      <run-jtreg-tests      <run-jtreg-tests
565         target="${build.main.java.version}"         target="${build.main.java.version}"
566         workdir="${build.dir}"         workdir="${build.dir}"
# Line 537  Line 568 
568    </target>    </target>
569    
570    <target name="test"    <target name="test"
571            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
572            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
573    </target>    </target>
574    
575    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
576    
577      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
578        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
579        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
580      </antcall>  <!--     </antcall> -->
581    
582    </target>  <!--   </target> -->
583    
584    <target name="test89"  <!--   <target name="test89" -->
585            description="Runs tck and jtreg tests for main for multiple java versions">  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
586    
587      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
588      <antcall target="test">  <!--     <antcall target="test"> -->
589        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
590        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
591      </antcall>  <!--     </antcall> -->
592    
593      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
594      <antcall target="test">  <!--     <antcall target="test"> -->
595        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
596        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
597      </antcall>  <!--     </antcall> -->
598    
599    </target>  <!--   </target> -->
600    
601    
602    
# Line 595  Line 626 
626    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
627    
628    
629    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
630            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
631    
632      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
633    
# Line 607  Line 638 
638        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
639             source="${build.sourcelevel}"             source="${build.sourcelevel}"
640             target="${build.sourcelevel}"             target="${build.sourcelevel}"
641             encoding="ASCII"
642               fork="true">               fork="true">
643    
644        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 634  Line 666 
666             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
667             includeAntRuntime="false"             includeAntRuntime="false"
668             includeJavaRuntime="false"             includeJavaRuntime="false"
669               encoding="ASCII"
670             executable="${javac9}"             executable="${javac9}"
671             fork="true">             fork="true">
672    
# Line 648  Line 681 
681    </target>    </target>
682    
683    
684      <!-- jsr166 4jdk8 -->
685    
686      <target name="4jdk8compile"
687              depends="configure-compiler"
688              description="Compiles src/jdk8 sources, targeting jdk8">
689    
690        <mkdir dir="${build.4jdk8.classes.dir}"/>
691    
692        <javac srcdir="${4jdk8src.dir}"
693               destdir="${build.4jdk8.classes.dir}"
694               debug="${build.debug}"
695               debuglevel="${build.debuglevel}"
696               deprecation="${build.deprecation}"
697               source="8"
698               target="8"
699               classpath=""
700               bootclasspath="${bootclasspath8}"
701               includeAntRuntime="false"
702               includeJavaRuntime="false"
703               encoding="ASCII"
704               executable="${javac8}"
705               fork="true">
706    
707          <include name="**/*.java"/>
708          <compilerarg value="-Xprefer:source"/>
709          <compilerarg value="-XDignore.symbol.file=true"/>
710          <compilerarg value="-Xlint:all"/>
711          <compilerarg value="-Werror"/>
712          <compilerarg line="${build.args}"/>
713    
714        </javac>
715      </target>
716    
717      <target name="4jdk8doclint"
718              depends="configure-compiler"
719              description="Finds doclint warnings">
720    
721        <mkdir dir="${build.4jdk8.classes.dir}"/>
722    
723        <javac srcdir="${4jdk8src.dir}"
724               destdir="${build.4jdk8.classes.dir}"
725               debug="${build.debug}"
726               debuglevel="${build.debuglevel}"
727               deprecation="${build.deprecation}"
728               source="8"
729               target="8"
730               classpath=""
731               bootclasspath="${bootclasspath8}"
732               includeAntRuntime="false"
733               includeJavaRuntime="false"
734               encoding="ASCII"
735               executable="${javac8}"
736               fork="true">
737    
738          <include name="**/*.java"/>
739          <compilerarg value="-Xprefer:source"/>
740          <compilerarg value="-XDignore.symbol.file=true"/>
741          <compilerarg value="-Xlint:all"/>
742          <compilerarg value="-Xdoclint:all/protected"/>
743          <compilerarg line="${build.args}"/>
744    
745        </javac>
746      </target>
747    
748    
749      <target name="4jdk8jar"
750              depends="4jdk8compile"
751              description="Builds library jar from compiled sources">
752    
753        <jar destfile="${4jdk8product.jar}">
754          <fileset dir="${build.4jdk8.classes.dir}"/>
755          <manifest>
756            <attribute name="Built-By" value="${user.name}"/>
757            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
758          </manifest>
759        </jar>
760    
761      </target>
762    
763    
764      <target name="4jdk8-tck"
765              depends="4jdk8jar"
766              description="Runs tck tests for jsr166-4jdk8 directly">
767    
768        <run-tck-tests
769          target="8"
770          workdir="${build.4jdk8.dir}"
771          classes="${4jdk8product.jar}">
772          <javac-elements>
773            <!-- JDK9+ test classes -->
774            <exclude name="*9Test.java"/>
775            <exclude name="*10Test.java"/>
776          </javac-elements>
777        </run-tck-tests>
778      </target>
779    
780    
781      <target name="4jdk8-jtreg"
782              depends="4jdk8jar"
783              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
784        <run-jtreg-tests
785           target="8"
786           workdir="${build.4jdk8.dir}"
787           classes="${4jdk8product.jar}"/>
788      </target>
789    
790    
791      <target name="4jdk8-test"
792              depends="4jdk8-tck, 4jdk8-jtreg"
793              description="Runs tck and jtreg tests for jsr166-4jdk8">
794      </target>
795    
796    
797      <target name="4jdk8docs"
798              description="Builds javadocs for src/jdk8 to dist dir">
799    
800        <delete dir="${4jdk8docs.dir}"/>
801        <mkdir dir="${4jdk8docs.dir}"/>
802    
803        <javadoc destdir="${4jdk8docs.dir}"
804                 packagenames="none"
805                 link="${java8.api.url}"
806                 overview="${4jdk8src.dir}/intro.html"
807                 access="${build.javadoc.access}"
808                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809                 classpath=""
810                 executable="${javadoc8}"
811                 failonerror = "true">
812          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
813            <include name="**/*.java"/>
814          </fileset>
815          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
816          <arg value="-XDignore.symbol.file=true"/>
817          <arg value="-tag"/>
818          <arg value="${javadoc.jls.option}"/>
819    <!-- @apiNote currently unused -->
820    <!--       <arg value="-tag"/> -->
821    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822          <arg value="-tag"/>
823          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824          <arg value="-tag"/>
825          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
826        </javadoc>
827      </target>
828    
829    
830      <target name="4jdk8dist"
831              depends="4jdk8dist-jar, 4jdk8dist-docs"
832              description="Puts all distributable products in single hierarchy"/>
833    
834    
835      <target name="4jdk8clean"
836              description="Removes all 4jdk8 build products">
837    
838        <delete dir="${build.4jdk8.dir}"/>
839    
840      </target>
841    
842    
843      <target name="4jdk8dist-jar"
844              depends="4jdk8clean, 4jdk8jar">
845        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
846      </target>
847    
848    
849      <target name="4jdk8dist-docs"
850              depends="4jdk8clean, 4jdk8docs">
851        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
852      </target>
853    
854    
855    
856    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
857    
858    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 667  Line 872 
872             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
873             includeAntRuntime="false"             includeAntRuntime="false"
874             includeJavaRuntime="false"             includeJavaRuntime="false"
875               encoding="ASCII"
876             executable="${javac7}"             executable="${javac7}"
877             fork="true">             fork="true">
878    
# Line 697  Line 903 
903             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
904             includeAntRuntime="false"             includeAntRuntime="false"
905             includeJavaRuntime="false"             includeJavaRuntime="false"
906               encoding="ASCII"
907             executable="${javac8}"             executable="${javac8}"
908             fork="true">             fork="true">
909    
# Line 752  Line 959 
959    </target>    </target>
960    
961    
962      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
963    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
964            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
965    
966      <junit printsummary="true"      <junit printsummary="true"
967             showoutput="true"             showoutput="true"
# Line 807  Line 1014 
1014               link="${java7.api.url}"               link="${java7.api.url}"
1015               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1016               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1017               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018               classpath=""               classpath=""
1019               executable="${javadoc7}">               executable="${javadoc7}"
1020                 failonerror = "true">
1021        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022          <include name="**/*.java"/>          <include name="**/*.java"/>
1023        </fileset>        </fileset>
# Line 863  Line 1071 
1071             target="5"             target="5"
1072             includeAntRuntime="false"             includeAntRuntime="false"
1073             includeJavaRuntime="false"             includeJavaRuntime="false"
1074               encoding="ASCII"
1075             executable="${javac7}"             executable="${javac7}"
1076             fork="true">             fork="true">
1077    
# Line 901  Line 1110 
1110               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1111               link="${java.api.url}"               link="${java.api.url}"
1112               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1113               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1114               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1115               source="5"               source="5"
1116               executable="${javadoc7}">               executable="${javadoc7}"
1117                 failonerror = "true">
1118        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1120    
# Line 955  Line 1165 
1165             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1166             includeAntRuntime="false"             includeAntRuntime="false"
1167             includeJavaRuntime="false"             includeJavaRuntime="false"
1168               encoding="ASCII"
1169             executable="${javac7}"             executable="${javac7}"
1170             fork="true">             fork="true">
1171    
# Line 993  Line 1204 
1204               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1205               link="${java.api.url}"               link="${java.api.url}"
1206               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1207               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1208               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1209               source="6"               source="6"
1210               executable="${javadoc7}">               executable="${javadoc7}"
1211                 failonerror = "true">
1212        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1214    
# Line 1048  Line 1260 
1260             target="6"             target="6"
1261             includeAntRuntime="false"             includeAntRuntime="false"
1262             includeJavaRuntime="false"             includeJavaRuntime="false"
1263               encoding="ASCII"
1264             executable="${javac7}"             executable="${javac7}"
1265             fork="true">             fork="true">
1266    
# Line 1086  Line 1299 
1299               packagenames="extra166y.*"               packagenames="extra166y.*"
1300               link="${java.api.url}"               link="${java.api.url}"
1301               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1302               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1303               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1304               source="6"               source="6"
1305               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1207  Line 1420 
1420               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1421               link="${java.api.url}"               link="${java.api.url}"
1422               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1423               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1424               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1425               executable="${javadoc7}">               executable="${javadoc7}"
1426                 failonerror = "true">
1427        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1428        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1429    
# Line 1294  Line 1508 
1508      </antcall>      </antcall>
1509    </target>    </target>
1510    
1511    <!-- ==============================================================
1512      Running guava tests against jsr166 code
1513    =================================================================== -->
1514    
1515    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1516    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0-rc1"/> -->
1517    <!-- <property name="guava.version" value="20.0"/> -->
1518    
1519    <!-- HOWTO debug print a path id -->
1520    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1521    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1522    
1523    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1524    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1525    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1526    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1527    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1528    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1529    
1530    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1531    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1532    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1533    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1534    
1535    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1536    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1537    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1538    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1539    
1540    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1541    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1542    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1543    
1544      <target name="init-ivy">
1545        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1546             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1547        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1548                 classpath="${build.dir}/ivy.jar"/>
1549      </target>
1550    
1551      <target name="guava-tests" depends="jar, init-ivy"
1552              description="Guava tests run against jsr166 collections">
1553        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1554        <mkdir dir="${guava.dir}"/>
1555        <ivy:retrieve pathid="guava.testlib.classpath"
1556          type="jar,bundle" inline="true" conf="default,master"
1557          pattern="${guava.dir}/[artifact].[ext]"
1558          organisation="com.google.guava" module="guava-testlib"/>
1559        <property name="guava.version" value="21.0-rc1"/>
1560        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1561             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1562        <junit printsummary="true" showoutput="true" haltonfailure="true"
1563               jvm="${java9}" fork="true">
1564          <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1565          <formatter type="brief"/>
1566          <classpath>
1567            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1568            <path refid="guava.testlib.classpath"/>
1569          </classpath>
1570    
1571          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1572          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1573        </junit>
1574      </target>
1575    
1576  </project>  </project>

Legend:
Removed from v.1.197  
changed lines
  Added in v.1.229

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8