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.149 by jsr166, Sat Jul 20 20:40:24 2013 UTC vs.
Revision 1.169 by jsr166, Wed Sep 2 03:45: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  
# Line 45 | 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"/>
53  <!-- Allow running an individual tck test class -->
54  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63  
64    <!-- Build locations -->
# Line 115 | 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 155 | 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 184 | 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 198 | Line 213 | As of 2013-02, the very latest lambda 8
213             source="@{compile-target}"
214             target="@{compile-target}"
215             classpath="${junit.jar}"
201           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"
# Line 207 | 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 218 | 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 251 | As of 2013-02, the very latest lambda 8
251      </sequential>
252    </macrodef>
253  
254 +  <!-- Define jtreg test sets for different jdk versions -->
255 +  <fileset dir="${jtreg.src.dir}">
256 +    <patternset id="jdk9.jtreg.tests">
257 +      <include name="**/*.java"/>
258 +    </patternset>
259 +  </fileset>
260 +
261 +  <fileset dir="${jtreg.src.dir}">
262 +    <patternset id="jdk8.jtreg.tests">
263 +      <include name="**/*.java"/>
264 +      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266 +      <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267 +    </patternset>
268 +  </fileset>
269 +
270 +  <fileset dir="${jtreg.src.dir}">
271 +    <patternset id="jdk7.jtreg.tests">
272 +      <include name="**/*.java"/>
273 +      <exclude name="util/Collection/CollectionDefaults.java"/>
274 +      <exclude name="util/List/ListDefaults.java"/>
275 +      <exclude name="util/Spliterator/**/*.java"/>
276 +      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
277 +      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278 +      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279 +      <exclude name="util/concurrent/atomic/Serial.java"/>
280 +    </patternset>
281 +  </fileset>
282 +
283    <macrodef name="run-jtreg-tests">
284 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
285      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
286      <attribute name="source" default="7"/>
287      <attribute name="target"/>
# Line 246 | Line 297 | As of 2013-02, the very latest lambda 8
297             jdk="${jdk@{target}.home}"
298             workDir="@{workdir}/JTwork"
299             reportDir="@{workdir}/JTreport">
300 <
300 >      <patternset refid="jdk@{target}.jtreg.tests"/>
301        <arg value="-Xbootclasspath/p:@{classes}"/>
302        <arg value="-agentvm"/>
303        <arg value="-v:nopass,fail"/>
# Line 269 | Line 320 | As of 2013-02, the very latest lambda 8
320  
321    <!-- Main targets -->
322  
323 +  <property name="build.main.java.version" value="9"/>
324 +  <property name="build.main.javac" value="${javac9}"/>
325 +
326    <target name="dists"
327            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
328            description="Builds all public jars and docs"/>
# Line 287 | Line 341 | As of 2013-02, the very latest lambda 8
341             classpath=""
342             includeAntRuntime="false"
343             includeJavaRuntime="false"
344 <           executable="${javac8}"
344 >           executable="${build.main.javac}"
345             fork="true">
346  
347        <include name="**/*.java"/>
348        <compilerarg value="-Xprefer:source"/>
349        <compilerarg value="-XDignore.symbol.file=true"/>
350        <compilerarg value="-Xlint:all"/>
351 +      <compilerarg value="-Werror"/>
352        <compilerarg value="-Xdoclint:all/protected"/>
353        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
354        <compilerarg line="${build.args}"/>
# Line 323 | Line 378 | As of 2013-02, the very latest lambda 8
378  
379      <javadoc destdir="${docs.dir}"
380               packagenames="none"
381 <             link="${jdkapi8docs.url}"
381 >             link="${java9.api.url}"
382               overview="${src.dir}/intro.html"
383               access="${build.javadoc.access}"
384 <             sourcepath="${src.dir}:${jdk8src.dir}"
384 >             sourcepath="${src.dir}:${jdk9src.dir}"
385               classpath=""
386 <             executable="${javadoc8}">
386 >             executable="${javadoc9}">
387        <fileset dir="${src.dir}" defaultexcludes="yes">
388          <include name="**/*.java"/>
389        </fileset>
390 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
391        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
392        <arg value="-XDignore.symbol.file=true"/>
393        <arg value="-tag"/>
# Line 396 | Line 452 | As of 2013-02, the very latest lambda 8
452      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
453    </target>
454  
455 <
455 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
456    <target name="test-tck"
457            depends="jar"
458            description="Runs tck tests for main directly">
459  
460      <run-tck-tests
461 <      target="8"
461 >      target="${build.main.java.version}"
462        workdir="${build.dir}"
463        classes="${product.jar}"/>
464    </target>
465  
466 +  <target name="test-tck-parallelism-1"
467 +          description="Runs test-tck with given common pool parallelism">
468 +    <antcall target="test-tck">
469 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
470 +    </antcall>
471 +  </target>
472 +
473 +  <target name="test-tck-parallelism-0"
474 +          description="Runs test-tck with given common pool parallelism">
475 +    <antcall target="test-tck">
476 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
477 +    </antcall>
478 +  </target>
479 +
480 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
481    <target name="test-jtreg"
482            depends="jar"
483            description="Runs jtreg tests for main using the jtreg ant task">
484      <run-jtreg-tests
485 <       target="8"
485 >       target="${build.main.java.version}"
486         workdir="${build.dir}"
487         classes="${product.jar}"/>
488    </target>
489  
490    <target name="test"
491 <          depends="test-tck, test-jtreg"
491 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
492            description="Runs tck and jtreg tests for main">
493    </target>
494  
495 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
496 +
497 +    <antcall target="jtreg">
498 +      <param name="build.main.java.version" value="8"/>
499 +      <param name="build.main.javac" value="${javac8}"/>
500 +    </antcall>
501 +
502 +  </target>
503 +
504 +  <target name="test89"
505 +          description="Runs tck and jtreg tests for main for multiple java versions">
506 +
507 +    <antcall target="clean"/>
508 +    <antcall target="test">
509 +      <param name="build.main.java.version" value="8"/>
510 +      <param name="build.main.javac" value="${javac8}"/>
511 +    </antcall>
512 +
513 +    <antcall target="clean"/>
514 +    <antcall target="test">
515 +      <param name="build.main.java.version" value="9"/>
516 +      <param name="build.main.javac" value="${javac9}"/>
517 +    </antcall>
518 +
519 +  </target>
520 +
521  
522  
523    <target name="configure-compiler">
# Line 470 | Line 567 | As of 2013-02, the very latest lambda 8
567    </target>
568  
569  
570 +  <target name="compile-test-loops" depends="jar"
571 +          description="compile all the perf tests in src/test/loops">
572 +
573 +    <mkdir dir="${build.dir}/test/loops"/>
574 +
575 +    <javac srcdir="${basedir}/src/test/loops"
576 +           destdir="${build.dir}/test/loops"
577 +           debug="${build.debug}"
578 +           debuglevel="${build.debuglevel}"
579 +           deprecation="${build.deprecation}"
580 +           includeAntRuntime="false"
581 +           includeJavaRuntime="false"
582 +           executable="${javac9}"
583 +           fork="true">
584 +
585 +      <include name="*.java"/>
586 +      <compilerarg value="-XDignore.symbol.file=true"/>
587 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
588 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
589 +      <compilerarg line="${build.args}"/>
590 +
591 +    </javac>
592 +
593 +  </target>
594 +
595 +
596    <!-- jsr166 4jdk7 -->
597  
598    <target name="4jdk7compile"
# Line 495 | Line 618 | As of 2013-02, the very latest lambda 8
618        <compilerarg value="-Xprefer:source"/>
619        <compilerarg value="-XDignore.symbol.file=true"/>
620        <compilerarg value="-Xlint:all"/>
621 +      <compilerarg value="-Werror"/>
622        <compilerarg line="${build.args}"/>
623  
624      </javac>
# Line 552 | Line 676 | As of 2013-02, the very latest lambda 8
676        <javac-elements>
677          <!-- JDK8+ test classes -->
678          <exclude name="*8Test.java"/>
679 +        <exclude name="*9Test.java"/>
680          <exclude name="DoubleAccumulatorTest.java"/>
681          <exclude name="DoubleAdderTest.java"/>
682          <exclude name="LongAccumulatorTest.java"/>
# Line 598 | Line 723 | As of 2013-02, the very latest lambda 8
723      <run-jtreg-tests
724         target="7"
725         workdir="${build.4jdk7.dir}"
726 <       classes="${4jdk7product.jar}"
602 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
726 >       classes="${4jdk7product.jar}"/>
727    </target>
728  
729  
# Line 617 | Line 741 | As of 2013-02, the very latest lambda 8
741  
742      <javadoc destdir="${4jdk7docs.dir}"
743               packagenames="none"
744 <             link="${jdkapi7docs.url}"
744 >             link="${java7.api.url}"
745               overview="${4jdk7src.dir}/intro.html"
746               access="${build.javadoc.access}"
747               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 626 | Line 750 | As of 2013-02, the very latest lambda 8
750        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
751          <include name="**/*.java"/>
752        </fileset>
753 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
754        <arg value="-XDignore.symbol.file=true"/>
755      </javadoc>
756    </target>
# Line 680 | Line 805 | As of 2013-02, the very latest lambda 8
805        <include name="jsr166x/**/*.java"/>
806        <compilerarg value="-XDignore.symbol.file=true"/>
807        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
808 +      <compilerarg value="-Werror"/>
809        <compilerarg line="${build.args}"/>
810  
811      </javac>
# Line 705 | Line 831 | As of 2013-02, the very latest lambda 8
831  
832      <javadoc destdir="${jsr166xdocs.dir}"
833               packagenames="jsr166x.*"
834 <             link="${jdkapidocs.url}"
834 >             link="${java.api.url}"
835               access="${build.javadoc.access}"
836               sourcepath="${topsrc.dir}:${jdk6src.dir}"
837               bootclasspath="${bootclasspath6}"
838               source="5"
839               executable="${javadoc7}">
840 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
841        <arg value="-XDignore.symbol.file=true"/>
842  
843      </javadoc>
# Line 765 | Line 892 | As of 2013-02, the very latest lambda 8
892        <include name="jsr166y/**/*.java"/>
893        <compilerarg value="-XDignore.symbol.file=true"/>
894        <compilerarg value="-Xlint:all"/>
895 +      <compilerarg value="-Werror"/>
896        <compilerarg line="${build.args}"/>
897  
898      </javac>
# Line 790 | Line 918 | As of 2013-02, the very latest lambda 8
918  
919      <javadoc destdir="${jsr166ydocs.dir}"
920               packagenames="jsr166y.*"
921 <             link="${jdkapidocs.url}"
921 >             link="${java.api.url}"
922               access="${build.javadoc.access}"
923               sourcepath="${topsrc.dir}:${jdk6src.dir}"
924               bootclasspath="${bootclasspath6}"
925               source="6"
926               executable="${javadoc7}">
927 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
928        <arg value="-XDignore.symbol.file=true"/>
929  
930      </javadoc>
# Line 851 | Line 980 | As of 2013-02, the very latest lambda 8
980        <include name="extra166y/**/*.java"/>
981        <compilerarg value="-XDignore.symbol.file=true"/>
982        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
983 +      <compilerarg value="-Werror"/>
984        <compilerarg line="${build.args}"/>
985  
986      </javac>
# Line 876 | Line 1006 | As of 2013-02, the very latest lambda 8
1006  
1007      <javadoc destdir="${extra166ydocs.dir}"
1008               packagenames="extra166y.*"
1009 <             link="${jdkapidocs.url}"
1009 >             link="${java.api.url}"
1010               access="${build.javadoc.access}"
1011               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1012               bootclasspath="${bootclasspath6}"
1013               source="6"
1014               executable="${javadoc7}">
1015 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1016        <arg value="-XDignore.symbol.file=true"/>
1017  
1018      </javadoc>
# Line 937 | Line 1068 | As of 2013-02, the very latest lambda 8
1068        <include name="jsr166e/**/*.java"/>
1069        <compilerarg value="-XDignore.symbol.file=true"/>
1070        <compilerarg value="-Xlint:all"/>
1071 +      <compilerarg value="-Werror"/>
1072        <compilerarg line="${build.args}"/>
1073  
1074      </javac>
1075    </target>
1076  
1077 +  <!-- jsr166e: find doclint errors -->
1078 +  <target name="jsr166edoclint">
1079 +
1080 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1081 +
1082 +    <javac srcdir="${topsrc.dir}"
1083 +           destdir="${build.jsr166e.classes.dir}"
1084 +           debug="${build.debug}"
1085 +           debuglevel="${build.debuglevel}"
1086 +           deprecation="${build.deprecation}"
1087 +           source="${build.jsr166e.java.version}"
1088 +           classpath=""
1089 +           bootclasspath="${bootclasspath7}"
1090 +           includeAntRuntime="false"
1091 +           includeJavaRuntime="false"
1092 +           executable="${javac8}"
1093 +           fork="true">
1094 +
1095 +      <include name="jsr166e/**/*.java"/>
1096 +      <compilerarg value="-XDignore.symbol.file=true"/>
1097 +      <compilerarg value="-Xlint:all"/>
1098 +      <compilerarg value="-Werror"/>
1099 +      <compilerarg value="-Xdoclint:all/protected"/>
1100 +
1101 +    </javac>
1102 +  </target>
1103 +
1104  
1105    <target name="jsr166ejar"
1106            depends="jsr166ecompile"
# Line 962 | Line 1121 | As of 2013-02, the very latest lambda 8
1121  
1122      <javadoc destdir="${jsr166edocs.dir}"
1123               packagenames="jsr166e.*"
1124 <             link="${jdkapidocs.url}"
1124 >             link="${java.api.url}"
1125               access="${build.javadoc.access}"
1126               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1127               source="${build.jsr166e.java.version}"
1128               executable="${javadoc7}">
1129 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1130        <arg value="-XDignore.symbol.file=true"/>
1131  
1132      </javadoc>
# Line 1039 | Line 1199 | As of 2013-02, the very latest lambda 8
1199  
1200    <target name="lint">
1201      <antcall target="dists">
1202 +      <param name="build.javadoc.access" value="public"/>
1203 +    </antcall>
1204 +  </target>
1205 +
1206 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1207 +  <target name="lint-private">
1208 +    <antcall target="dist">
1209        <param name="build.javadoc.access" value="private"/>
1210      </antcall>
1211    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines