ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.147 by jsr166, Sat Jul 20 17:21:45 2013 UTC vs.
Revision 1.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC

# Line 16 | Line 16
16    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8
19 +  $HOME/jdk/jdk9
20    where each of the above is a JDK or a symlink to same, and
21    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8
24 +  $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.
27 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27 >
28 >  Alternatively, define ant variables thus:
29 >  ant -Djdk$N.home=...
30 >  for $N in 6 7 8 9 ...
31   ------------------------------------------------------------------------------
32    </description>
33  
34 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
34 >  <!-- Display main targets by running 'ant -projecthelp' -->
35 >  <target name="usage">
36      <java classname="org.apache.tools.ant.Main">
37        <arg value="-projecthelp" />
38      </java>
# Line 44 | Line 50 | As of 2013-02, the very latest lambda 8
50    <property name="build.deprecation"    value="false"/>
51    <property name="build.javadoc.access" value="protected"/>
52  
53 <  <!-- Tck options; see JSR166TestCase.java -->
54 <  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
53 >  <!-- Tck options; see JSR166TestCase.java
54 >   To profile a single tck test class:
55 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56 >   To stress test a single tck test class:
57 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58 >  -->
59    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>
61    <property name="jsr166.runsPerTest"      value="1"/>
52  <!-- Allow running an individual tck test class -->
53  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63  
64    <!-- Build locations -->
# Line 114 | Line 122 | As of 2013-02, the very latest lambda 8
122    <defjdklocations v="6"/>
123    <defjdklocations v="7"/>
124    <defjdklocations v="8"/>
125 +  <defjdklocations v="9"/>
126  
127    <!-- Source locations -->
128    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 154 | Line 163 | As of 2013-02, the very latest lambda 8
163    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165  
166 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
167 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
168 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
169 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
170 <
171 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
172 <  <!-- The below does not yet exist as of 2013-01 -->
173 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
166 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
172 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174 >  <!-- Default jdk doc location (latest stable release seems best) -->
175 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176  
177 <  <!-- Default jdk api doc location (latest stable release seems best) -->
178 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
177 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
184  
185    <!-- Define the "jtreg" task -->
186    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 183 | Line 199 | As of 2013-02, the very latest lambda 8
199      <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>
201      <attribute name="classes"/>
202 <    <attribute name="jvmflags" default=""/>
202 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203      <element name="javac-elements" optional="true"/>
204      <sequential>
205  
# Line 197 | Line 213 | As of 2013-02, the very latest lambda 8
213             source="@{compile-target}"
214             target="@{compile-target}"
215             classpath="${junit.jar}"
200           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"
# Line 206 | Line 221 | As of 2013-02, the very latest lambda 8
221        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>
226        <javac-elements/>
227  
# Line 217 | Line 233 | As of 2013-02, the very latest lambda 8
233            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>
236 +
237 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240 +        </syspropertyset>
241 +
242          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 230 | Line 252 | As of 2013-02, the very latest lambda 8
252    </macrodef>
253  
254    <macrodef name="run-jtreg-tests">
255 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257      <attribute name="source" default="7"/>
258      <attribute name="target"/>
# Line 268 | Line 291 | As of 2013-02, the very latest lambda 8
291  
292    <!-- Main targets -->
293  
294 +  <property name="build.main.java.version" value="9"/>
295 +  <property name="build.main.javac" value="${javac9}"/>
296 +
297    <target name="dists"
298            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299            description="Builds all public jars and docs"/>
# Line 286 | Line 312 | As of 2013-02, the very latest lambda 8
312             classpath=""
313             includeAntRuntime="false"
314             includeJavaRuntime="false"
315 <           executable="${javac8}"
315 >           executable="${build.main.javac}"
316             fork="true">
317  
318        <include name="**/*.java"/>
# Line 322 | Line 348 | As of 2013-02, the very latest lambda 8
348  
349      <javadoc destdir="${docs.dir}"
350               packagenames="none"
351 <             link="${jdkapi8docs.url}"
351 >             link="${java9.api.url}"
352               overview="${src.dir}/intro.html"
353               access="${build.javadoc.access}"
354 <             sourcepath="${src.dir}:${jdk8src.dir}"
354 >             sourcepath="${src.dir}:${jdk9src.dir}"
355               classpath=""
356 <             executable="${javadoc8}">
356 >             executable="${javadoc9}">
357        <fileset dir="${src.dir}" defaultexcludes="yes">
358          <include name="**/*.java"/>
359        </fileset>
360 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
361        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362        <arg value="-XDignore.symbol.file=true"/>
363        <arg value="-tag"/>
# Line 379 | Line 406 | As of 2013-02, the very latest lambda 8
406    <target name="dist-clean"
407            description="Removes all build and distribution products">
408  
409 +    <delete dir="${build.dir}"/>
410      <delete dir="${dist.dir}"/>
411  
412    </target>
# Line 394 | Line 422 | As of 2013-02, the very latest lambda 8
422      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
423    </target>
424  
425 <
425 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
426    <target name="test-tck"
427            depends="jar"
428            description="Runs tck tests for main directly">
429  
430      <run-tck-tests
431 <      target="8"
431 >      target="${build.main.java.version}"
432        workdir="${build.dir}"
433        classes="${product.jar}"/>
434    </target>
435  
436 +  <target name="test-tck-parallelism-1"
437 +          description="Runs test-tck with given common pool parallelism">
438 +    <antcall target="test-tck">
439 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
440 +    </antcall>
441 +  </target>
442 +
443 +  <target name="test-tck-parallelism-0"
444 +          description="Runs test-tck with given common pool parallelism">
445 +    <antcall target="test-tck">
446 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
447 +    </antcall>
448 +  </target>
449 +
450 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
451    <target name="test-jtreg"
452            depends="jar"
453            description="Runs jtreg tests for main using the jtreg ant task">
454      <run-jtreg-tests
455 <       target="8"
455 >       target="${build.main.java.version}"
456         workdir="${build.dir}"
457         classes="${product.jar}"/>
458    </target>
459  
460    <target name="test"
461 <          depends="test-tck, test-jtreg"
461 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
462            description="Runs tck and jtreg tests for main">
463    </target>
464  
465 +  <target name="test89"
466 +          description="Runs tck and jtreg tests for main for multiple java versions">
467 +
468 +    <antcall target="clean"/>
469 +    <antcall target="test">
470 +      <param name="build.main.java.version" value="8"/>
471 +      <param name="build.main.javac" value="${javac8}"/>
472 +    </antcall>
473 +
474 +    <antcall target="clean"/>
475 +    <antcall target="test">
476 +      <param name="build.main.java.version" value="9"/>
477 +      <param name="build.main.javac" value="${javac9}"/>
478 +    </antcall>
479 +
480 +  </target>
481 +
482  
483  
484    <target name="configure-compiler">
# Line 498 | Line 558 | As of 2013-02, the very latest lambda 8
558      </javac>
559    </target>
560  
561 +  <target name="4jdk7doclint"
562 +          depends="configure-compiler"
563 +          description="Finds doclint warnings">
564 +
565 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
566 +
567 +    <javac srcdir="${4jdk7src.dir}"
568 +           destdir="${build.4jdk7.classes.dir}"
569 +           debug="${build.debug}"
570 +           debuglevel="${build.debuglevel}"
571 +           deprecation="${build.deprecation}"
572 +           source="6"
573 +           classpath=""
574 +           bootclasspath="${bootclasspath7}"
575 +           includeAntRuntime="false"
576 +           includeJavaRuntime="false"
577 +           executable="${javac8}"
578 +           fork="true">
579 +
580 +      <include name="**/*.java"/>
581 +      <compilerarg value="-Xprefer:source"/>
582 +      <compilerarg value="-XDignore.symbol.file=true"/>
583 +      <compilerarg value="-Xlint:all"/>
584 +      <compilerarg value="-Xdoclint:all/protected"/>
585 +      <compilerarg line="${build.args}"/>
586 +
587 +    </javac>
588 +  </target>
589 +
590  
591    <target name="4jdk7jar"
592            depends="4jdk7compile"
# Line 521 | Line 610 | As of 2013-02, the very latest lambda 8
610        <javac-elements>
611          <!-- JDK8+ test classes -->
612          <exclude name="*8Test.java"/>
613 +        <exclude name="*9Test.java"/>
614          <exclude name="DoubleAccumulatorTest.java"/>
615          <exclude name="DoubleAdderTest.java"/>
616          <exclude name="LongAccumulatorTest.java"/>
# Line 586 | Line 676 | As of 2013-02, the very latest lambda 8
676  
677      <javadoc destdir="${4jdk7docs.dir}"
678               packagenames="none"
679 <             link="${jdkapi7docs.url}"
679 >             link="${java7.api.url}"
680               overview="${4jdk7src.dir}/intro.html"
681               access="${build.javadoc.access}"
682               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 595 | Line 685 | As of 2013-02, the very latest lambda 8
685        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
686          <include name="**/*.java"/>
687        </fileset>
688 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
689        <arg value="-XDignore.symbol.file=true"/>
690      </javadoc>
691    </target>
# Line 613 | Line 704 | As of 2013-02, the very latest lambda 8
704    </target>
705  
706  
616  <target name="4jdk7dist-clean"
617          description="Removes all build and distribution products">
618
619  </target>
620
707    <target name="4jdk7dist-jar"
708            depends="4jdk7clean, 4jdk7jar">
709      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 679 | Line 765 | As of 2013-02, the very latest lambda 8
765  
766      <javadoc destdir="${jsr166xdocs.dir}"
767               packagenames="jsr166x.*"
768 <             link="${jdkapidocs.url}"
768 >             link="${java.api.url}"
769               access="${build.javadoc.access}"
770               sourcepath="${topsrc.dir}:${jdk6src.dir}"
771               bootclasspath="${bootclasspath6}"
772               source="5"
773               executable="${javadoc7}">
774 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
775        <arg value="-XDignore.symbol.file=true"/>
776  
777      </javadoc>
# Line 704 | Line 791 | As of 2013-02, the very latest lambda 8
791    </target>
792  
793  
707  <target name="jsr166xdist-clean"
708          description="Removes all build and distribution products">
709
710  </target>
711
712
794    <target name="jsr166xdist-jar"
795            depends="jsr166xclean, jsr166xjar">
796      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 770 | Line 851 | As of 2013-02, the very latest lambda 8
851  
852      <javadoc destdir="${jsr166ydocs.dir}"
853               packagenames="jsr166y.*"
854 <             link="${jdkapidocs.url}"
854 >             link="${java.api.url}"
855               access="${build.javadoc.access}"
856               sourcepath="${topsrc.dir}:${jdk6src.dir}"
857               bootclasspath="${bootclasspath6}"
858               source="6"
859               executable="${javadoc7}">
860 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
861        <arg value="-XDignore.symbol.file=true"/>
862  
863      </javadoc>
# Line 795 | Line 877 | As of 2013-02, the very latest lambda 8
877    </target>
878  
879  
798  <target name="jsr166ydist-clean"
799          description="Removes all build and distribution products">
800
801  </target>
802
880    <target name="jsr166ydist-jar"
881            depends="jsr166yclean, jsr166yjar">
882      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 861 | Line 938 | As of 2013-02, the very latest lambda 8
938  
939      <javadoc destdir="${extra166ydocs.dir}"
940               packagenames="extra166y.*"
941 <             link="${jdkapidocs.url}"
941 >             link="${java.api.url}"
942               access="${build.javadoc.access}"
943               sourcepath="${topsrc.dir}:${jdk6src.dir}"
944               bootclasspath="${bootclasspath6}"
945               source="6"
946               executable="${javadoc7}">
947 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
948        <arg value="-XDignore.symbol.file=true"/>
949  
950      </javadoc>
# Line 886 | Line 964 | As of 2013-02, the very latest lambda 8
964    </target>
965  
966  
889  <target name="extra166ydist-clean"
890          description="Removes all build and distribution products">
891
892  </target>
893
967    <target name="extra166ydist-jar"
968            depends="extra166yclean, extra166yjar">
969      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 932 | Line 1005 | As of 2013-02, the very latest lambda 8
1005      </javac>
1006    </target>
1007  
1008 +  <!-- jsr166e: find doclint errors -->
1009 +  <target name="jsr166edoclint">
1010 +
1011 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1012 +
1013 +    <javac srcdir="${topsrc.dir}"
1014 +           destdir="${build.jsr166e.classes.dir}"
1015 +           debug="${build.debug}"
1016 +           debuglevel="${build.debuglevel}"
1017 +           deprecation="${build.deprecation}"
1018 +           source="${build.jsr166e.java.version}"
1019 +           classpath=""
1020 +           bootclasspath="${bootclasspath7}"
1021 +           includeAntRuntime="false"
1022 +           includeJavaRuntime="false"
1023 +           executable="${javac8}"
1024 +           fork="true">
1025 +
1026 +      <include name="jsr166e/**/*.java"/>
1027 +      <compilerarg value="-XDignore.symbol.file=true"/>
1028 +      <compilerarg value="-Xlint:all"/>
1029 +      <compilerarg value="-Xdoclint:all/protected"/>
1030 +
1031 +    </javac>
1032 +  </target>
1033 +
1034  
1035    <target name="jsr166ejar"
1036            depends="jsr166ecompile"
# Line 952 | Line 1051 | As of 2013-02, the very latest lambda 8
1051  
1052      <javadoc destdir="${jsr166edocs.dir}"
1053               packagenames="jsr166e.*"
1054 <             link="${jdkapidocs.url}"
1054 >             link="${java.api.url}"
1055               access="${build.javadoc.access}"
1056               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1057               source="${build.jsr166e.java.version}"
1058               executable="${javadoc7}">
1059 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1060        <arg value="-XDignore.symbol.file=true"/>
1061  
1062      </javadoc>
# Line 964 | Line 1064 | As of 2013-02, the very latest lambda 8
1064  
1065  
1066    <target name="jsr166e-test-tck-one-java-version"
1067 <          depends="jsr166ejar"
968 <          description="Runs tck tests for jsr166e">
1067 >          depends="jsr166ejar">
1068  
1069      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1070  
# Line 1015 | Line 1114 | As of 2013-02, the very latest lambda 8
1114    </target>
1115  
1116  
1018  <target name="jsr166edist-clean"
1019          description="Removes all build and distribution products">
1020
1021  </target>
1022
1117    <target name="jsr166edist-jar"
1118            depends="jsr166eclean, jsr166ejar">
1119      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1035 | Line 1129 | As of 2013-02, the very latest lambda 8
1129  
1130    <target name="lint">
1131      <antcall target="dists">
1132 +      <param name="build.javadoc.access" value="public"/>
1133 +    </antcall>
1134 +  </target>
1135 +
1136 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1137 +  <target name="lint-private">
1138 +    <antcall target="dist">
1139        <param name="build.javadoc.access" value="private"/>
1140      </antcall>
1141    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines