[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.218, Sat Sep 10 04:06:10 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 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="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" 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="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
270    
271          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
# Line 313  Line 329 
329    
330      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
331      <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"/>  
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"
335             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
336        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
339        <arg value="-agentvm"/>        <arg value="-agentvm"/>
340        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
341        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 350  Line 362 
362    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
363    
364    <target name="dists"    <target name="dists"
365            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
367    
368    <target name="compile"    <target name="compile"
# Line 393  Line 405 
405        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
406    
407      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
408    </target>    </target>
409    
410    
411    <target name="jar"    <target name="jar"
412            depends="compile"            depends="compile"
413            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
414        <local name="subdir"/>
415        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
416      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
417        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
418        <manifest>        <manifest>
419          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
420          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 422  Line 432 
432      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
433      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
434    
435    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
436    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
437      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
438               packagenames="none"               packagenames="none"
439               link="${java9.api.url}"               link="${java9.api.url}"
440               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
441               access="${build.javadoc.access}"               access="${build.javadoc.access}"
442               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
443               classpath=""               classpath=""
444               executable="${javadoc9}">               executable="${javadoc9}">
445        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 436  Line 448 
448        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
449        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
451  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
452        <arg value="-tag"/>        <arg value="-tag"/>
453        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
454        <arg value="-tag"/>        <arg value="-tag"/>
# Line 445  Line 457 
457        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
460    <!-- tags added in jdk9 -->
461          <arg value="-tag"/>
462          <arg value="revised:X"/>
463          <arg value="-tag"/>
464          <arg value="spec:X"/>
465      </javadoc>      </javadoc>
466    </target>    </target>
467    
# Line 505  Line 522 
522    
523    <target name="tck"    <target name="tck"
524            depends="jar"            depends="jar"
525            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
526    
527      <run-tck-tests      <run-tck-tests
528        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 514  Line 531 
531    </target>    </target>
532    
533    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
534            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
535      <antcall target="tck">      <antcall target="tck">
536        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
537      </antcall>      </antcall>
538    </target>    </target>
539    
540    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
541            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
542      <antcall target="tck">      <antcall target="tck">
543        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
544      </antcall>      </antcall>
545    </target>    </target>
546    
547      <target name="tck-security-manager"
548              description="Runs tck with a security manager">
549        <antcall target="tck">
550          <param name="jsr166.useSecurityManager" value="true"/>
551        </antcall>
552      </target>
553    
554    <target name="jtreg"    <target name="jtreg"
555            depends="jar"            depends="jar"
556            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
557      <run-jtreg-tests      <run-jtreg-tests
558         target="${build.main.java.version}"         target="${build.main.java.version}"
559         workdir="${build.dir}"         workdir="${build.dir}"
# Line 537  Line 561 
561    </target>    </target>
562    
563    <target name="test"    <target name="test"
564            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
565            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
566    </target>    </target>
567    
568    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
569    
570      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
571        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
572        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
573      </antcall>  <!--     </antcall> -->
574    
575    </target>  <!--   </target> -->
576    
577    <target name="test89"  <!--   <target name="test89" -->
578            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"> -->
579    
580      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
581      <antcall target="test">  <!--     <antcall target="test"> -->
582        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
583        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
584      </antcall>  <!--     </antcall> -->
585    
586      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
587      <antcall target="test">  <!--     <antcall target="test"> -->
588        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
589        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
590      </antcall>  <!--     </antcall> -->
591    
592    </target>  <!--   </target> -->
593    
594    
595    
# Line 595  Line 619 
619    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
620    
621    
622    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
623            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
624    
625      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
626    
# Line 648  Line 672 
672    </target>    </target>
673    
674    
675      <!-- jsr166 4jdk8 -->
676    
677      <target name="4jdk8compile"
678              depends="configure-compiler"
679              description="Compiles src/jdk8 sources, targeting jdk8">
680    
681        <mkdir dir="${build.4jdk8.classes.dir}"/>
682    
683        <javac srcdir="${4jdk8src.dir}"
684               destdir="${build.4jdk8.classes.dir}"
685               debug="${build.debug}"
686               debuglevel="${build.debuglevel}"
687               deprecation="${build.deprecation}"
688               source="8"
689               target="8"
690               classpath=""
691               bootclasspath="${bootclasspath8}"
692               includeAntRuntime="false"
693               includeJavaRuntime="false"
694               executable="${javac8}"
695               fork="true">
696    
697          <include name="**/*.java"/>
698          <compilerarg value="-Xprefer:source"/>
699          <compilerarg value="-XDignore.symbol.file=true"/>
700          <compilerarg value="-Xlint:all"/>
701          <compilerarg value="-Werror"/>
702          <compilerarg line="${build.args}"/>
703    
704        </javac>
705      </target>
706    
707      <target name="4jdk8doclint"
708              depends="configure-compiler"
709              description="Finds doclint warnings">
710    
711        <mkdir dir="${build.4jdk8.classes.dir}"/>
712    
713        <javac srcdir="${4jdk8src.dir}"
714               destdir="${build.4jdk8.classes.dir}"
715               debug="${build.debug}"
716               debuglevel="${build.debuglevel}"
717               deprecation="${build.deprecation}"
718               source="8"
719               target="8"
720               classpath=""
721               bootclasspath="${bootclasspath8}"
722               includeAntRuntime="false"
723               includeJavaRuntime="false"
724               executable="${javac8}"
725               fork="true">
726    
727          <include name="**/*.java"/>
728          <compilerarg value="-Xprefer:source"/>
729          <compilerarg value="-XDignore.symbol.file=true"/>
730          <compilerarg value="-Xlint:all"/>
731          <compilerarg value="-Xdoclint:all/protected"/>
732          <compilerarg line="${build.args}"/>
733    
734        </javac>
735      </target>
736    
737    
738      <target name="4jdk8jar"
739              depends="4jdk8compile"
740              description="Builds library jar from compiled sources">
741    
742        <jar destfile="${4jdk8product.jar}">
743          <fileset dir="${build.4jdk8.classes.dir}"/>
744          <manifest>
745            <attribute name="Built-By" value="${user.name}"/>
746            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
747          </manifest>
748        </jar>
749    
750      </target>
751    
752    
753      <target name="4jdk8-tck"
754              depends="4jdk8jar"
755              description="Runs tck tests for jsr166-4jdk8 directly">
756    
757        <run-tck-tests
758          target="8"
759          workdir="${build.4jdk8.dir}"
760          classes="${4jdk8product.jar}">
761          <javac-elements>
762            <!-- JDK9+ test classes -->
763            <exclude name="*9Test.java"/>
764            <exclude name="*10Test.java"/>
765          </javac-elements>
766        </run-tck-tests>
767      </target>
768    
769    
770      <target name="4jdk8-jtreg"
771              depends="4jdk8jar"
772              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
773        <run-jtreg-tests
774           target="8"
775           workdir="${build.4jdk8.dir}"
776           classes="${4jdk8product.jar}"/>
777      </target>
778    
779    
780      <target name="4jdk8-test"
781              depends="4jdk8-tck, 4jdk8-jtreg"
782              description="Runs tck and jtreg tests for jsr166-4jdk8">
783      </target>
784    
785    
786      <target name="4jdk8docs"
787              description="Builds javadocs for src/jdk8 to dist dir">
788    
789        <delete dir="${4jdk8docs.dir}"/>
790        <mkdir dir="${4jdk8docs.dir}"/>
791    
792        <javadoc destdir="${4jdk8docs.dir}"
793                 packagenames="none"
794                 link="${java8.api.url}"
795                 overview="${4jdk8src.dir}/intro.html"
796                 access="${build.javadoc.access}"
797                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
798                 classpath=""
799                 executable="${javadoc8}"
800                 failonerror = "true">
801          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
802            <include name="**/*.java"/>
803          </fileset>
804          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
805          <arg value="-XDignore.symbol.file=true"/>
806          <arg value="-tag"/>
807          <arg value="${javadoc.jls.option}"/>
808          <arg value="-tag"/>
809          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
810          <arg value="-tag"/>
811          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
812          <arg value="-tag"/>
813          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
814        </javadoc>
815      </target>
816    
817    
818      <target name="4jdk8dist"
819              depends="4jdk8dist-jar, 4jdk8dist-docs"
820              description="Puts all distributable products in single hierarchy"/>
821    
822    
823      <target name="4jdk8clean"
824              description="Removes all 4jdk8 build products">
825    
826        <delete dir="${build.4jdk8.dir}"/>
827    
828      </target>
829    
830    
831      <target name="4jdk8dist-jar"
832              depends="4jdk8clean, 4jdk8jar">
833        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
834      </target>
835    
836    
837      <target name="4jdk8dist-docs"
838              depends="4jdk8clean, 4jdk8docs">
839        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
840      </target>
841    
842    
843    
844    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
845    
846    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 752  Line 945 
945    </target>    </target>
946    
947    
948      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
949    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
950            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
951    
952      <junit printsummary="true"      <junit printsummary="true"
953             showoutput="true"             showoutput="true"
# Line 807  Line 1000 
1000               link="${java7.api.url}"               link="${java7.api.url}"
1001               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1002               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1003               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1004               classpath=""               classpath=""
1005               executable="${javadoc7}">               executable="${javadoc7}"
1006                 failonerror = "true">
1007        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1008          <include name="**/*.java"/>          <include name="**/*.java"/>
1009        </fileset>        </fileset>
# Line 901  Line 1095 
1095               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1096               link="${java.api.url}"               link="${java.api.url}"
1097               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1098               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1099               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1100               source="5"               source="5"
1101               executable="${javadoc7}">               executable="${javadoc7}"
1102                 failonerror = "true">
1103        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1104        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1105    
# Line 993  Line 1188 
1188               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1189               link="${java.api.url}"               link="${java.api.url}"
1190               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1191               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1192               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1193               source="6"               source="6"
1194               executable="${javadoc7}">               executable="${javadoc7}"
1195                 failonerror = "true">
1196        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1197        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1198    
# Line 1086  Line 1282 
1282               packagenames="extra166y.*"               packagenames="extra166y.*"
1283               link="${java.api.url}"               link="${java.api.url}"
1284               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1285               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1286               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1287               source="6"               source="6"
1288               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1207  Line 1403 
1403               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1404               link="${java.api.url}"               link="${java.api.url}"
1405               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1406               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1407               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1408               executable="${javadoc7}">               executable="${javadoc7}"
1409                 failonerror = "true">
1410        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1411        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1412    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8