[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.221, Sat Oct 8 21:39:24 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 69  Line 70 
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=${build.classes.dir}/java.base" 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=${build.classes.dir}/java.base" if:set="modules"/>
268          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
269            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
271    
272          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
# Line 313  Line 330 
330    
331      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332      <delete dir="@{workdir}/JTreport" 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"
336             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
337        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
338        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
342        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 350  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 379  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 407 
407        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
408    
409      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
410    </target>    </target>
411    
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 422  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      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
440               packagenames="none"               packagenames="none"
441               link="${java9.api.url}"               link="${java9.api.url}"
442               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
443               access="${build.javadoc.access}"               access="${build.javadoc.access}"
444               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
445               classpath=""               classpath=""
446               executable="${javadoc9}">               executable="${javadoc9}">
447        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 436  Line 450 
450        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
451        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
452        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
453  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
454        <arg value="-tag"/>        <arg value="-tag"/>
455        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
456    <!-- @apiNote currently unused -->
457    <!--       <arg value="-tag"/> -->
458    <!--       <arg value="apiNote:a:API Note:"/> -->
459        <arg value="-tag"/>        <arg value="-tag"/>
460        <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;"/>  
461        <arg value="-tag"/>        <arg value="-tag"/>
462        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
463    <!-- tags added in jdk9: currently unused -->
464    <!--       <arg value="-tag"/> -->
465    <!--       <arg value="revised:X"/> -->
466    <!--       <arg value="-tag"/> -->
467    <!--       <arg value="spec:X"/> -->
468      </javadoc>      </javadoc>
469    </target>    </target>
470    
# Line 505  Line 525 
525    
526    <target name="tck"    <target name="tck"
527            depends="jar"            depends="jar"
528            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
529    
530      <run-tck-tests      <run-tck-tests
531        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 514  Line 534 
534    </target>    </target>
535    
536    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
537            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
538      <antcall target="tck">      <antcall target="tck">
539        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
540      </antcall>      </antcall>
541    </target>    </target>
542    
543    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
544            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
545      <antcall target="tck">      <antcall target="tck">
546        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
547      </antcall>      </antcall>
548    </target>    </target>
549    
550      <target name="tck-security-manager"
551              description="Runs tck with a security manager">
552        <antcall target="tck">
553          <param name="jsr166.useSecurityManager" value="true"/>
554        </antcall>
555      </target>
556    
557    <target name="jtreg"    <target name="jtreg"
558            depends="jar"            depends="jar"
559            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
560      <run-jtreg-tests      <run-jtreg-tests
561         target="${build.main.java.version}"         target="${build.main.java.version}"
562         workdir="${build.dir}"         workdir="${build.dir}"
# Line 537  Line 564 
564    </target>    </target>
565    
566    <target name="test"    <target name="test"
567            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
568            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
569    </target>    </target>
570    
571    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
572    
573      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
574        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
575        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
576      </antcall>  <!--     </antcall> -->
577    
578    </target>  <!--   </target> -->
579    
580    <target name="test89"  <!--   <target name="test89" -->
581            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"> -->
582    
583      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
584      <antcall target="test">  <!--     <antcall target="test"> -->
585        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
586        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
587      </antcall>  <!--     </antcall> -->
588    
589      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
590      <antcall target="test">  <!--     <antcall target="test"> -->
591        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
592        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
593      </antcall>  <!--     </antcall> -->
594    
595    </target>  <!--   </target> -->
596    
597    
598    
# Line 595  Line 622 
622    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
623    
624    
625    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
626            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
627    
628      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
629    
# Line 607  Line 634 
634        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
635             source="${build.sourcelevel}"             source="${build.sourcelevel}"
636             target="${build.sourcelevel}"             target="${build.sourcelevel}"
637             encoding="ASCII"
638               fork="true">               fork="true">
639    
640        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 634  Line 662 
662             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
663             includeAntRuntime="false"             includeAntRuntime="false"
664             includeJavaRuntime="false"             includeJavaRuntime="false"
665               encoding="ASCII"
666             executable="${javac9}"             executable="${javac9}"
667             fork="true">             fork="true">
668    
# Line 648  Line 677 
677    </target>    </target>
678    
679    
680      <!-- jsr166 4jdk8 -->
681    
682      <target name="4jdk8compile"
683              depends="configure-compiler"
684              description="Compiles src/jdk8 sources, targeting jdk8">
685    
686        <mkdir dir="${build.4jdk8.classes.dir}"/>
687    
688        <javac srcdir="${4jdk8src.dir}"
689               destdir="${build.4jdk8.classes.dir}"
690               debug="${build.debug}"
691               debuglevel="${build.debuglevel}"
692               deprecation="${build.deprecation}"
693               source="8"
694               target="8"
695               classpath=""
696               bootclasspath="${bootclasspath8}"
697               includeAntRuntime="false"
698               includeJavaRuntime="false"
699               encoding="ASCII"
700               executable="${javac8}"
701               fork="true">
702    
703          <include name="**/*.java"/>
704          <compilerarg value="-Xprefer:source"/>
705          <compilerarg value="-XDignore.symbol.file=true"/>
706          <compilerarg value="-Xlint:all"/>
707          <compilerarg value="-Werror"/>
708          <compilerarg line="${build.args}"/>
709    
710        </javac>
711      </target>
712    
713      <target name="4jdk8doclint"
714              depends="configure-compiler"
715              description="Finds doclint warnings">
716    
717        <mkdir dir="${build.4jdk8.classes.dir}"/>
718    
719        <javac srcdir="${4jdk8src.dir}"
720               destdir="${build.4jdk8.classes.dir}"
721               debug="${build.debug}"
722               debuglevel="${build.debuglevel}"
723               deprecation="${build.deprecation}"
724               source="8"
725               target="8"
726               classpath=""
727               bootclasspath="${bootclasspath8}"
728               includeAntRuntime="false"
729               includeJavaRuntime="false"
730               encoding="ASCII"
731               executable="${javac8}"
732               fork="true">
733    
734          <include name="**/*.java"/>
735          <compilerarg value="-Xprefer:source"/>
736          <compilerarg value="-XDignore.symbol.file=true"/>
737          <compilerarg value="-Xlint:all"/>
738          <compilerarg value="-Xdoclint:all/protected"/>
739          <compilerarg line="${build.args}"/>
740    
741        </javac>
742      </target>
743    
744    
745      <target name="4jdk8jar"
746              depends="4jdk8compile"
747              description="Builds library jar from compiled sources">
748    
749        <jar destfile="${4jdk8product.jar}">
750          <fileset dir="${build.4jdk8.classes.dir}"/>
751          <manifest>
752            <attribute name="Built-By" value="${user.name}"/>
753            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
754          </manifest>
755        </jar>
756    
757      </target>
758    
759    
760      <target name="4jdk8-tck"
761              depends="4jdk8jar"
762              description="Runs tck tests for jsr166-4jdk8 directly">
763    
764        <run-tck-tests
765          target="8"
766          workdir="${build.4jdk8.dir}"
767          classes="${4jdk8product.jar}">
768          <javac-elements>
769            <!-- JDK9+ test classes -->
770            <exclude name="*9Test.java"/>
771            <exclude name="*10Test.java"/>
772          </javac-elements>
773        </run-tck-tests>
774      </target>
775    
776    
777      <target name="4jdk8-jtreg"
778              depends="4jdk8jar"
779              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
780        <run-jtreg-tests
781           target="8"
782           workdir="${build.4jdk8.dir}"
783           classes="${4jdk8product.jar}"/>
784      </target>
785    
786    
787      <target name="4jdk8-test"
788              depends="4jdk8-tck, 4jdk8-jtreg"
789              description="Runs tck and jtreg tests for jsr166-4jdk8">
790      </target>
791    
792    
793      <target name="4jdk8docs"
794              description="Builds javadocs for src/jdk8 to dist dir">
795    
796        <delete dir="${4jdk8docs.dir}"/>
797        <mkdir dir="${4jdk8docs.dir}"/>
798    
799        <javadoc destdir="${4jdk8docs.dir}"
800                 packagenames="none"
801                 link="${java8.api.url}"
802                 overview="${4jdk8src.dir}/intro.html"
803                 access="${build.javadoc.access}"
804                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
805                 classpath=""
806                 executable="${javadoc8}"
807                 failonerror = "true">
808          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
809            <include name="**/*.java"/>
810          </fileset>
811          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
812          <arg value="-XDignore.symbol.file=true"/>
813          <arg value="-tag"/>
814          <arg value="${javadoc.jls.option}"/>
815    <!-- @apiNote currently unused -->
816    <!--       <arg value="-tag"/> -->
817    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
818          <arg value="-tag"/>
819          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
820          <arg value="-tag"/>
821          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
822        </javadoc>
823      </target>
824    
825    
826      <target name="4jdk8dist"
827              depends="4jdk8dist-jar, 4jdk8dist-docs"
828              description="Puts all distributable products in single hierarchy"/>
829    
830    
831      <target name="4jdk8clean"
832              description="Removes all 4jdk8 build products">
833    
834        <delete dir="${build.4jdk8.dir}"/>
835    
836      </target>
837    
838    
839      <target name="4jdk8dist-jar"
840              depends="4jdk8clean, 4jdk8jar">
841        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
842      </target>
843    
844    
845      <target name="4jdk8dist-docs"
846              depends="4jdk8clean, 4jdk8docs">
847        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
848      </target>
849    
850    
851    
852    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
853    
854    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 667  Line 868 
868             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
869             includeAntRuntime="false"             includeAntRuntime="false"
870             includeJavaRuntime="false"             includeJavaRuntime="false"
871               encoding="ASCII"
872             executable="${javac7}"             executable="${javac7}"
873             fork="true">             fork="true">
874    
# Line 697  Line 899 
899             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
900             includeAntRuntime="false"             includeAntRuntime="false"
901             includeJavaRuntime="false"             includeJavaRuntime="false"
902               encoding="ASCII"
903             executable="${javac8}"             executable="${javac8}"
904             fork="true">             fork="true">
905    
# Line 752  Line 955 
955    </target>    </target>
956    
957    
958      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
959    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
960            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
961    
962      <junit printsummary="true"      <junit printsummary="true"
963             showoutput="true"             showoutput="true"
# Line 807  Line 1010 
1010               link="${java7.api.url}"               link="${java7.api.url}"
1011               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1012               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1013               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1014               classpath=""               classpath=""
1015               executable="${javadoc7}">               executable="${javadoc7}"
1016                 failonerror = "true">
1017        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1018          <include name="**/*.java"/>          <include name="**/*.java"/>
1019        </fileset>        </fileset>
# Line 863  Line 1067 
1067             target="5"             target="5"
1068             includeAntRuntime="false"             includeAntRuntime="false"
1069             includeJavaRuntime="false"             includeJavaRuntime="false"
1070               encoding="ASCII"
1071             executable="${javac7}"             executable="${javac7}"
1072             fork="true">             fork="true">
1073    
# Line 901  Line 1106 
1106               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1107               link="${java.api.url}"               link="${java.api.url}"
1108               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1109               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1110               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1111               source="5"               source="5"
1112               executable="${javadoc7}">               executable="${javadoc7}"
1113                 failonerror = "true">
1114        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1115        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1116    
# Line 955  Line 1161 
1161             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1162             includeAntRuntime="false"             includeAntRuntime="false"
1163             includeJavaRuntime="false"             includeJavaRuntime="false"
1164               encoding="ASCII"
1165             executable="${javac7}"             executable="${javac7}"
1166             fork="true">             fork="true">
1167    
# Line 993  Line 1200 
1200               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1201               link="${java.api.url}"               link="${java.api.url}"
1202               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1203               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1204               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1205               source="6"               source="6"
1206               executable="${javadoc7}">               executable="${javadoc7}"
1207                 failonerror = "true">
1208        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1209        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1210    
# Line 1048  Line 1256 
1256             target="6"             target="6"
1257             includeAntRuntime="false"             includeAntRuntime="false"
1258             includeJavaRuntime="false"             includeJavaRuntime="false"
1259               encoding="ASCII"
1260             executable="${javac7}"             executable="${javac7}"
1261             fork="true">             fork="true">
1262    
# Line 1086  Line 1295 
1295               packagenames="extra166y.*"               packagenames="extra166y.*"
1296               link="${java.api.url}"               link="${java.api.url}"
1297               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1298               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1299               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1300               source="6"               source="6"
1301               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1207  Line 1416 
1416               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1417               link="${java.api.url}"               link="${java.api.url}"
1418               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1419               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1420               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1421               executable="${javadoc7}">               executable="${javadoc7}"
1422                 failonerror = "true">
1423        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1424        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1425    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8