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

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8