[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.212, Sat May 21 00:35:58 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://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 value="-Xpatch: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 value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268    
269          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
# Line 313  Line 327 
327    
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <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"/>  
330      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
331             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
332             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
333             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
334        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337        <arg value="-agentvm"/>        <arg value="-agentvm"/>
338        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
339        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 350  Line 360 
360    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
361    
362    <target name="dists"    <target name="dists"
363            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
364            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
365    
366    <target name="compile"    <target name="compile"
# Line 393  Line 403 
403        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
404    
405      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
406    </target>    </target>
407    
408    
409    <target name="jar"    <target name="jar"
410            depends="compile"            depends="compile"
411            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
412        <local name="subdir"/>
413        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
414      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
415        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
416        <manifest>        <manifest>
417          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
418          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 427  Line 435 
435               link="${java9.api.url}"               link="${java9.api.url}"
436               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
437               access="${build.javadoc.access}"               access="${build.javadoc.access}"
438               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
439               classpath=""               classpath=""
440               executable="${javadoc9}">               executable="${javadoc9}">
441        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 445  Line 453 
453        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
454        <arg value="-tag"/>        <arg value="-tag"/>
455        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
456    <!-- tags added in jdk9 -->
457          <arg value="-tag"/>
458          <arg value="revised:X"/>
459          <arg value="-tag"/>
460          <arg value="spec:X"/>
461      </javadoc>      </javadoc>
462    </target>    </target>
463    
# Line 505  Line 518 
518    
519    <target name="tck"    <target name="tck"
520            depends="jar"            depends="jar"
521            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
522    
523      <run-tck-tests      <run-tck-tests
524        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 514  Line 527 
527    </target>    </target>
528    
529    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
530            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
531      <antcall target="tck">      <antcall target="tck">
532        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
533      </antcall>      </antcall>
534    </target>    </target>
535    
536    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
537            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
538      <antcall target="tck">      <antcall target="tck">
539        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
540      </antcall>      </antcall>
# Line 529  Line 542 
542    
543    <target name="jtreg"    <target name="jtreg"
544            depends="jar"            depends="jar"
545            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
546      <run-jtreg-tests      <run-jtreg-tests
547         target="${build.main.java.version}"         target="${build.main.java.version}"
548         workdir="${build.dir}"         workdir="${build.dir}"
# Line 537  Line 550 
550    </target>    </target>
551    
552    <target name="test"    <target name="test"
553            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
554            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
555    </target>    </target>
556    
557    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
558    
559      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
560        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
561        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
562      </antcall>  <!--     </antcall> -->
563    
564    </target>  <!--   </target> -->
565    
566    <target name="test89"  <!--   <target name="test89" -->
567            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"> -->
568    
569      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
570      <antcall target="test">  <!--     <antcall target="test"> -->
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      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
576      <antcall target="test">  <!--     <antcall target="test"> -->
577        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
578        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
579      </antcall>  <!--     </antcall> -->
580    
581    </target>  <!--   </target> -->
582    
583    
584    
# Line 595  Line 608 
608    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
609    
610    
611    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
612            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
613    
614      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
615    
# Line 648  Line 661 
661    </target>    </target>
662    
663    
664      <!-- jsr166 4jdk8 -->
665    
666      <target name="4jdk8compile"
667              depends="configure-compiler"
668              description="Compiles src/jdk8 sources, targeting jdk8">
669    
670        <mkdir dir="${build.4jdk8.classes.dir}"/>
671    
672        <javac srcdir="${4jdk8src.dir}"
673               destdir="${build.4jdk8.classes.dir}"
674               debug="${build.debug}"
675               debuglevel="${build.debuglevel}"
676               deprecation="${build.deprecation}"
677               source="8"
678               target="8"
679               classpath=""
680               bootclasspath="${bootclasspath8}"
681               includeAntRuntime="false"
682               includeJavaRuntime="false"
683               executable="${javac8}"
684               fork="true">
685    
686          <include name="**/*.java"/>
687          <compilerarg value="-Xprefer:source"/>
688          <compilerarg value="-XDignore.symbol.file=true"/>
689          <compilerarg value="-Xlint:all"/>
690          <compilerarg value="-Werror"/>
691          <compilerarg line="${build.args}"/>
692    
693        </javac>
694      </target>
695    
696      <target name="4jdk8doclint"
697              depends="configure-compiler"
698              description="Finds doclint warnings">
699    
700        <mkdir dir="${build.4jdk8.classes.dir}"/>
701    
702        <javac srcdir="${4jdk8src.dir}"
703               destdir="${build.4jdk8.classes.dir}"
704               debug="${build.debug}"
705               debuglevel="${build.debuglevel}"
706               deprecation="${build.deprecation}"
707               source="8"
708               target="8"
709               classpath=""
710               bootclasspath="${bootclasspath8}"
711               includeAntRuntime="false"
712               includeJavaRuntime="false"
713               executable="${javac8}"
714               fork="true">
715    
716          <include name="**/*.java"/>
717          <compilerarg value="-Xprefer:source"/>
718          <compilerarg value="-XDignore.symbol.file=true"/>
719          <compilerarg value="-Xlint:all"/>
720          <compilerarg value="-Xdoclint:all/protected"/>
721          <compilerarg line="${build.args}"/>
722    
723        </javac>
724      </target>
725    
726    
727      <target name="4jdk8jar"
728              depends="4jdk8compile"
729              description="Builds library jar from compiled sources">
730    
731        <jar destfile="${4jdk8product.jar}">
732          <fileset dir="${build.4jdk8.classes.dir}"/>
733          <manifest>
734            <attribute name="Built-By" value="${user.name}"/>
735            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
736          </manifest>
737        </jar>
738    
739      </target>
740    
741    
742      <target name="4jdk8-tck"
743              depends="4jdk8jar"
744              description="Runs tck tests for jsr166-4jdk8 directly">
745    
746        <run-tck-tests
747          target="8"
748          workdir="${build.4jdk8.dir}"
749          classes="${4jdk8product.jar}">
750          <javac-elements>
751            <!-- JDK9+ test classes -->
752            <exclude name="*9Test.java"/>
753            <exclude name="*10Test.java"/>
754          </javac-elements>
755        </run-tck-tests>
756      </target>
757    
758    
759      <target name="4jdk8-jtreg"
760              depends="4jdk8jar"
761              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
762        <run-jtreg-tests
763           target="8"
764           workdir="${build.4jdk8.dir}"
765           classes="${4jdk8product.jar}"/>
766      </target>
767    
768    
769      <target name="4jdk8-test"
770              depends="4jdk8-tck, 4jdk8-jtreg"
771              description="Runs tck and jtreg tests for jsr166-4jdk8">
772      </target>
773    
774    
775      <target name="4jdk8docs"
776              description="Builds javadocs for src/jdk8 to dist dir">
777    
778        <delete dir="${4jdk8docs.dir}"/>
779        <mkdir dir="${4jdk8docs.dir}"/>
780    
781        <javadoc destdir="${4jdk8docs.dir}"
782                 packagenames="none"
783                 link="${java8.api.url}"
784                 overview="${4jdk8src.dir}/intro.html"
785                 access="${build.javadoc.access}"
786                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
787                 classpath=""
788                 executable="${javadoc8}"
789                 failonerror = "true">
790          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
791            <include name="**/*.java"/>
792          </fileset>
793          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
794          <arg value="-XDignore.symbol.file=true"/>
795          <arg value="-tag"/>
796          <arg value="${javadoc.jls.option}"/>
797          <arg value="-tag"/>
798          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
799          <arg value="-tag"/>
800          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
801          <arg value="-tag"/>
802          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
803        </javadoc>
804      </target>
805    
806    
807      <target name="4jdk8dist"
808              depends="4jdk8dist-jar, 4jdk8dist-docs"
809              description="Puts all distributable products in single hierarchy"/>
810    
811    
812      <target name="4jdk8clean"
813              description="Removes all 4jdk8 build products">
814    
815        <delete dir="${build.4jdk8.dir}"/>
816    
817      </target>
818    
819    
820      <target name="4jdk8dist-jar"
821              depends="4jdk8clean, 4jdk8jar">
822        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
823      </target>
824    
825    
826      <target name="4jdk8dist-docs"
827              depends="4jdk8clean, 4jdk8docs">
828        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
829      </target>
830    
831    
832    
833    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
834    
835    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 752  Line 934 
934    </target>    </target>
935    
936    
937      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
938    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
939            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
940    
941      <junit printsummary="true"      <junit printsummary="true"
942             showoutput="true"             showoutput="true"
# Line 807  Line 989 
989               link="${java7.api.url}"               link="${java7.api.url}"
990               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
991               access="${build.javadoc.access}"               access="${build.javadoc.access}"
992               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
993               classpath=""               classpath=""
994               executable="${javadoc7}">               executable="${javadoc7}"
995                 failonerror = "true">
996        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997          <include name="**/*.java"/>          <include name="**/*.java"/>
998        </fileset>        </fileset>
# Line 901  Line 1084 
1084               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1085               link="${java.api.url}"               link="${java.api.url}"
1086               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1087               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1088               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1089               source="5"               source="5"
1090               executable="${javadoc7}">               executable="${javadoc7}"
1091                 failonerror = "true">
1092        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1093        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1094    
# Line 993  Line 1177 
1177               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1178               link="${java.api.url}"               link="${java.api.url}"
1179               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1180               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1182               source="6"               source="6"
1183               executable="${javadoc7}">               executable="${javadoc7}"
1184                 failonerror = "true">
1185        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1187    
# Line 1086  Line 1271 
1271               packagenames="extra166y.*"               packagenames="extra166y.*"
1272               link="${java.api.url}"               link="${java.api.url}"
1273               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1274               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1275               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1276               source="6"               source="6"
1277               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1207  Line 1392 
1392               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1393               link="${java.api.url}"               link="${java.api.url}"
1394               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1395               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1396               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1397               executable="${javadoc7}">               executable="${javadoc7}"
1398                 failonerror = "true">
1399        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1400        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1401    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8