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

Diff of /jsr166/build.xml

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

revision 1.193 by jsr166, Fri Dec 11 23:58:52 2015 UTC revision 1.228 by jsr166, Sat Dec 17 22:28:20 2016 UTC
# Line 7  Line 7 
7    
8    Usage: ant [target]    Usage: ant [target]
9    
10      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11      more details.
12    
13    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
15    
# Line 27  Line 30 
30    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
31    
32    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
33    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
35    
36    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"
37    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.  
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 62  Line 63 
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <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"/>  
66    
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69    <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"/>
70    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71    
72      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76    
77    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 85  Line 90 
90    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
91      <attribute name="v"/>      <attribute name="v"/>
92      <sequential>      <sequential>
93      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
94      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
95      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
96      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
97        <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98      <local name="have.java.base"/>      <local name="have.java.base"/>
99      <available property="have.java.base"      <available property="have.java.base"
100        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"/>
101      <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"
102        if:set="have.java.base"/>        if:set="have.java.base"/>
103      <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"
104        unless:set="have.java.base"/>        unless:set="have.java.base"/>
105      <local name="modules"/>      <local name="modules"/>
106      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 134  Line 140 
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149  Line 156 
156    <!-- Javadoc locations -->    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156  Line 164 
164    
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164  Line 173 
173    <!-- Jar locations -->    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 175  Line 185 
185    <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"/>
186    <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"/>
187    <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"/>
188    <!-- The expected canonical location does not yet exist as of 2015-11 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <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"/> -->
190    <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"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193    
# Line 209  Line 219 
219      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>      <attribute name="workdir"/>
221      <attribute name="classes"/>      <attribute name="classes"/>
222      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <!--
223            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224        -->
225            <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
227    
228      <sequential>      <sequential>
# Line 231  Line 244 
244             classpath="${junit.jar}"             classpath="${junit.jar}"
245             includeAntRuntime="false"             includeAntRuntime="false"
246             includeJavaRuntime="false"             includeJavaRuntime="false"
247               encoding="ASCII"
248             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
249             fork="true">             fork="true">
250    
# Line 238  Line 252 
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 249  Line 263 
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266          <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>          <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
272            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
274    
275          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
277            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
279              <propertyref name="test.timeout.factor"/>
280          </syspropertyset>          </syspropertyset>
281    
282          <classpath>          <classpath>
# Line 277  Line 298 
298    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
299      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
301      </patternset>      </patternset>
302    </fileset>    </fileset>
303    
# Line 289  Line 307 
307      </patternset>      </patternset>
308    </fileset>    </fileset>
309    
310      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
311      <property name="jtreg.flags" value=""/>
312    
313    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
314      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
# Line 308  Line 329 
329      </condition>      </condition>
330    
331      <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"/>  
332      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
333             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
334             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
335        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
336        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
337        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
338          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339        <arg value="-agentvm"/>        <arg value="-agentvm"/>
340          <arg value="-noreport"/>
341        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
342        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
343        <arg value="-automatic"/>        <arg value="-automatic"/>
344        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
345        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
346          <arg line="${jtreg.flags}"/>
347      </jtreg>      </jtreg>
348      </sequential>      </sequential>
349    </macrodef>    </macrodef>
# Line 345  Line 363 
363    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
364    
365    <target name="dists"    <target name="dists"
366            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
368    
369    <target name="compile"    <target name="compile"
# Line 374  Line 392 
392             classpath=""             classpath=""
393             includeAntRuntime="false"             includeAntRuntime="false"
394             includeJavaRuntime="false"             includeJavaRuntime="false"
395               encoding="ASCII"
396             executable="${build.main.javac}"             executable="${build.main.javac}"
397             fork="true">             fork="true">
398    
# Line 393  Line 412 
412    
413    <target name="jar"    <target name="jar"
414            depends="compile"            depends="compile"
415            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
416        <local name="subdir"/>
417        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
419        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
420        <manifest>        <manifest>
421          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
422          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 414  Line 434 
434      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
435      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
436    
437    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
440    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
441    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
442      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
443               packagenames="none"               packagenames="none"
444               link="${java9.api.url}"               link="${java9.api.url}"
445               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
446               access="${build.javadoc.access}"               access="${build.javadoc.access}"
447               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
448               classpath=""               classpath=""
449               executable="${javadoc9}">               executable="${javadoc9}">
450        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 428  Line 453 
453        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
454        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
455        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
456  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
457        <arg value="-tag"/>        <arg value="-tag"/>
458        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
459    <!-- @apiNote currently unused -->
460    <!--       <arg value="-tag"/> -->
461    <!--       <arg value="apiNote:a:API Note:"/> -->
462        <arg value="-tag"/>        <arg value="-tag"/>
463        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
464        <arg value="-tag"/>        <arg value="-tag"/>
465        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
466        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
467        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
468    <!--       <arg value="revised:X"/> -->
469    <!--       <arg value="-tag"/> -->
470    <!--       <arg value="spec:X"/> -->
471      </javadoc>      </javadoc>
472    </target>    </target>
473    
# Line 497  Line 528 
528    
529    <target name="tck"    <target name="tck"
530            depends="jar"            depends="jar"
531            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
532    
533      <run-tck-tests      <run-tck-tests
534        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 506  Line 537 
537    </target>    </target>
538    
539    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
540            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
541      <antcall target="tck">      <antcall target="tck">
542        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
543      </antcall>      </antcall>
544    </target>    </target>
545    
546    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
547            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
548      <antcall target="tck">      <antcall target="tck">
549        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
550      </antcall>      </antcall>
551    </target>    </target>
552    
553      <target name="tck-security-manager"
554              description="Runs tck with a security manager">
555        <antcall target="tck">
556          <param name="jsr166.useSecurityManager" value="true"/>
557        </antcall>
558      </target>
559    
560    <target name="jtreg"    <target name="jtreg"
561            depends="jar"            depends="jar"
562            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
563      <run-jtreg-tests      <run-jtreg-tests
564         target="${build.main.java.version}"         target="${build.main.java.version}"
565         workdir="${build.dir}"         workdir="${build.dir}"
# Line 529  Line 567 
567    </target>    </target>
568    
569    <target name="test"    <target name="test"
570            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
571            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
572    </target>    </target>
573    
574    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
575    
576      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
577        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
578        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
579      </antcall>  <!--     </antcall> -->
580    
581    </target>  <!--   </target> -->
582    
583    <target name="test89"  <!--   <target name="test89" -->
584            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"> -->
585    
586      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
587      <antcall target="test">  <!--     <antcall target="test"> -->
588        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
589        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
590      </antcall>  <!--     </antcall> -->
591    
592      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
593      <antcall target="test">  <!--     <antcall target="test"> -->
594        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
595        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
596      </antcall>  <!--     </antcall> -->
597    
598    </target>  <!--   </target> -->
599    
600    
601    
# Line 587  Line 625 
625    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
626    
627    
628    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
629            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
630    
631      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
632    
# Line 599  Line 637 
637        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
638             source="${build.sourcelevel}"             source="${build.sourcelevel}"
639             target="${build.sourcelevel}"             target="${build.sourcelevel}"
640             encoding="ASCII"
641               fork="true">               fork="true">
642    
643        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 626  Line 665 
665             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
666             includeAntRuntime="false"             includeAntRuntime="false"
667             includeJavaRuntime="false"             includeJavaRuntime="false"
668               encoding="ASCII"
669             executable="${javac9}"             executable="${javac9}"
670             fork="true">             fork="true">
671    
# Line 640  Line 680 
680    </target>    </target>
681    
682    
683      <!-- jsr166 4jdk8 -->
684    
685      <target name="4jdk8compile"
686              depends="configure-compiler"
687              description="Compiles src/jdk8 sources, targeting jdk8">
688    
689        <mkdir dir="${build.4jdk8.classes.dir}"/>
690    
691        <javac srcdir="${4jdk8src.dir}"
692               destdir="${build.4jdk8.classes.dir}"
693               debug="${build.debug}"
694               debuglevel="${build.debuglevel}"
695               deprecation="${build.deprecation}"
696               source="8"
697               target="8"
698               classpath=""
699               bootclasspath="${bootclasspath8}"
700               includeAntRuntime="false"
701               includeJavaRuntime="false"
702               encoding="ASCII"
703               executable="${javac8}"
704               fork="true">
705    
706          <include name="**/*.java"/>
707          <compilerarg value="-Xprefer:source"/>
708          <compilerarg value="-XDignore.symbol.file=true"/>
709          <compilerarg value="-Xlint:all"/>
710          <compilerarg value="-Werror"/>
711          <compilerarg line="${build.args}"/>
712    
713        </javac>
714      </target>
715    
716      <target name="4jdk8doclint"
717              depends="configure-compiler"
718              description="Finds doclint warnings">
719    
720        <mkdir dir="${build.4jdk8.classes.dir}"/>
721    
722        <javac srcdir="${4jdk8src.dir}"
723               destdir="${build.4jdk8.classes.dir}"
724               debug="${build.debug}"
725               debuglevel="${build.debuglevel}"
726               deprecation="${build.deprecation}"
727               source="8"
728               target="8"
729               classpath=""
730               bootclasspath="${bootclasspath8}"
731               includeAntRuntime="false"
732               includeJavaRuntime="false"
733               encoding="ASCII"
734               executable="${javac8}"
735               fork="true">
736    
737          <include name="**/*.java"/>
738          <compilerarg value="-Xprefer:source"/>
739          <compilerarg value="-XDignore.symbol.file=true"/>
740          <compilerarg value="-Xlint:all"/>
741          <compilerarg value="-Xdoclint:all/protected"/>
742          <compilerarg line="${build.args}"/>
743    
744        </javac>
745      </target>
746    
747    
748      <target name="4jdk8jar"
749              depends="4jdk8compile"
750              description="Builds library jar from compiled sources">
751    
752        <jar destfile="${4jdk8product.jar}">
753          <fileset dir="${build.4jdk8.classes.dir}"/>
754          <manifest>
755            <attribute name="Built-By" value="${user.name}"/>
756            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
757          </manifest>
758        </jar>
759    
760      </target>
761    
762    
763      <target name="4jdk8-tck"
764              depends="4jdk8jar"
765              description="Runs tck tests for jsr166-4jdk8 directly">
766    
767        <run-tck-tests
768          target="8"
769          workdir="${build.4jdk8.dir}"
770          classes="${4jdk8product.jar}">
771          <javac-elements>
772            <!-- JDK9+ test classes -->
773            <exclude name="*9Test.java"/>
774            <exclude name="*10Test.java"/>
775          </javac-elements>
776        </run-tck-tests>
777      </target>
778    
779    
780      <target name="4jdk8-jtreg"
781              depends="4jdk8jar"
782              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
783        <run-jtreg-tests
784           target="8"
785           workdir="${build.4jdk8.dir}"
786           classes="${4jdk8product.jar}"/>
787      </target>
788    
789    
790      <target name="4jdk8-test"
791              depends="4jdk8-tck, 4jdk8-jtreg"
792              description="Runs tck and jtreg tests for jsr166-4jdk8">
793      </target>
794    
795    
796      <target name="4jdk8docs"
797              description="Builds javadocs for src/jdk8 to dist dir">
798    
799        <delete dir="${4jdk8docs.dir}"/>
800        <mkdir dir="${4jdk8docs.dir}"/>
801    
802        <javadoc destdir="${4jdk8docs.dir}"
803                 packagenames="none"
804                 link="${java8.api.url}"
805                 overview="${4jdk8src.dir}/intro.html"
806                 access="${build.javadoc.access}"
807                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
808                 classpath=""
809                 executable="${javadoc8}"
810                 failonerror = "true">
811          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
812            <include name="**/*.java"/>
813          </fileset>
814          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
815          <arg value="-XDignore.symbol.file=true"/>
816          <arg value="-tag"/>
817          <arg value="${javadoc.jls.option}"/>
818    <!-- @apiNote currently unused -->
819    <!--       <arg value="-tag"/> -->
820    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
821          <arg value="-tag"/>
822          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
823          <arg value="-tag"/>
824          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
825        </javadoc>
826      </target>
827    
828    
829      <target name="4jdk8dist"
830              depends="4jdk8dist-jar, 4jdk8dist-docs"
831              description="Puts all distributable products in single hierarchy"/>
832    
833    
834      <target name="4jdk8clean"
835              description="Removes all 4jdk8 build products">
836    
837        <delete dir="${build.4jdk8.dir}"/>
838    
839      </target>
840    
841    
842      <target name="4jdk8dist-jar"
843              depends="4jdk8clean, 4jdk8jar">
844        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
845      </target>
846    
847    
848      <target name="4jdk8dist-docs"
849              depends="4jdk8clean, 4jdk8docs">
850        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
851      </target>
852    
853    
854    
855    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
856    
857    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 659  Line 871 
871             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
872             includeAntRuntime="false"             includeAntRuntime="false"
873             includeJavaRuntime="false"             includeJavaRuntime="false"
874               encoding="ASCII"
875             executable="${javac7}"             executable="${javac7}"
876             fork="true">             fork="true">
877    
# Line 689  Line 902 
902             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
903             includeAntRuntime="false"             includeAntRuntime="false"
904             includeJavaRuntime="false"             includeJavaRuntime="false"
905               encoding="ASCII"
906             executable="${javac8}"             executable="${javac8}"
907             fork="true">             fork="true">
908    
# Line 744  Line 958 
958    </target>    </target>
959    
960    
961      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
962    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
963            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
964    
965      <junit printsummary="true"      <junit printsummary="true"
966             showoutput="true"             showoutput="true"
# Line 799  Line 1013 
1013               link="${java7.api.url}"               link="${java7.api.url}"
1014               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1015               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1016               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1017               classpath=""               classpath=""
1018               executable="${javadoc7}">               executable="${javadoc7}"
1019                 failonerror = "true">
1020        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1021          <include name="**/*.java"/>          <include name="**/*.java"/>
1022        </fileset>        </fileset>
# Line 855  Line 1070 
1070             target="5"             target="5"
1071             includeAntRuntime="false"             includeAntRuntime="false"
1072             includeJavaRuntime="false"             includeJavaRuntime="false"
1073               encoding="ASCII"
1074             executable="${javac7}"             executable="${javac7}"
1075             fork="true">             fork="true">
1076    
# Line 893  Line 1109 
1109               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1110               link="${java.api.url}"               link="${java.api.url}"
1111               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1112               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1113               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1114               source="5"               source="5"
1115               executable="${javadoc7}">               executable="${javadoc7}"
1116                 failonerror = "true">
1117        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1118        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1119    
# Line 947  Line 1164 
1164             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1165             includeAntRuntime="false"             includeAntRuntime="false"
1166             includeJavaRuntime="false"             includeJavaRuntime="false"
1167               encoding="ASCII"
1168             executable="${javac7}"             executable="${javac7}"
1169             fork="true">             fork="true">
1170    
# Line 985  Line 1203 
1203               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1204               link="${java.api.url}"               link="${java.api.url}"
1205               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1206               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1207               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1208               source="6"               source="6"
1209               executable="${javadoc7}">               executable="${javadoc7}"
1210                 failonerror = "true">
1211        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1212        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1213    
# Line 1040  Line 1259 
1259             target="6"             target="6"
1260             includeAntRuntime="false"             includeAntRuntime="false"
1261             includeJavaRuntime="false"             includeJavaRuntime="false"
1262               encoding="ASCII"
1263             executable="${javac7}"             executable="${javac7}"
1264             fork="true">             fork="true">
1265    
# Line 1078  Line 1298 
1298               packagenames="extra166y.*"               packagenames="extra166y.*"
1299               link="${java.api.url}"               link="${java.api.url}"
1300               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1301               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1302               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1303               source="6"               source="6"
1304               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1199  Line 1419 
1419               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1420               link="${java.api.url}"               link="${java.api.url}"
1421               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1422               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1423               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1424               executable="${javadoc7}">               executable="${javadoc7}"
1425                 failonerror = "true">
1426        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1427        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1428    

Legend:
Removed from v.1.193  
changed lines
  Added in v.1.228

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