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.150 by jsr166, Mon Jul 22 17:50:12 2013 UTC vs.
Revision 1.166 by jsr166, Mon Aug 10 06:32:23 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 +    </patternset>
266 +  </fileset>
267 +
268 +  <fileset dir="${jtreg.src.dir}">
269 +    <patternset id="jdk7.jtreg.tests">
270 +      <include name="**/*.java"/>
271 +      <exclude name="util/Collection/CollectionDefaults.java"/>
272 +      <exclude name="util/List/ListDefaults.java"/>
273 +      <exclude name="util/Spliterator/**/*.java"/>
274 +      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275 +      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276 +      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277 +    </patternset>
278 +  </fileset>
279 +
280    <macrodef name="run-jtreg-tests">
281 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
283      <attribute name="source" default="7"/>
284      <attribute name="target"/>
# Line 246 | Line 294 | As of 2013-02, the very latest lambda 8
294             jdk="${jdk@{target}.home}"
295             workDir="@{workdir}/JTwork"
296             reportDir="@{workdir}/JTreport">
297 <
297 >      <patternset refid="jdk@{target}.jtreg.tests"/>
298        <arg value="-Xbootclasspath/p:@{classes}"/>
299        <arg value="-agentvm"/>
300        <arg value="-v:nopass,fail"/>
# Line 269 | Line 317 | As of 2013-02, the very latest lambda 8
317  
318    <!-- Main targets -->
319  
320 +  <property name="build.main.java.version" value="9"/>
321 +  <property name="build.main.javac" value="${javac9}"/>
322 +
323    <target name="dists"
324            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
325            description="Builds all public jars and docs"/>
# Line 287 | Line 338 | As of 2013-02, the very latest lambda 8
338             classpath=""
339             includeAntRuntime="false"
340             includeJavaRuntime="false"
341 <           executable="${javac8}"
341 >           executable="${build.main.javac}"
342             fork="true">
343  
344        <include name="**/*.java"/>
345        <compilerarg value="-Xprefer:source"/>
346        <compilerarg value="-XDignore.symbol.file=true"/>
347        <compilerarg value="-Xlint:all"/>
348 +      <compilerarg value="-Werror"/>
349        <compilerarg value="-Xdoclint:all/protected"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
# Line 323 | Line 375 | As of 2013-02, the very latest lambda 8
375  
376      <javadoc destdir="${docs.dir}"
377               packagenames="none"
378 <             link="${jdkapi8docs.url}"
378 >             link="${java9.api.url}"
379               overview="${src.dir}/intro.html"
380               access="${build.javadoc.access}"
381 <             sourcepath="${src.dir}:${jdk8src.dir}"
381 >             sourcepath="${src.dir}:${jdk9src.dir}"
382               classpath=""
383 <             executable="${javadoc8}">
383 >             executable="${javadoc9}">
384        <fileset dir="${src.dir}" defaultexcludes="yes">
385          <include name="**/*.java"/>
386        </fileset>
387 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
388        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
389        <arg value="-XDignore.symbol.file=true"/>
390        <arg value="-tag"/>
# Line 396 | Line 449 | As of 2013-02, the very latest lambda 8
449      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>
451  
452 <
452 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
453    <target name="test-tck"
454            depends="jar"
455            description="Runs tck tests for main directly">
456  
457      <run-tck-tests
458 <      target="8"
458 >      target="${build.main.java.version}"
459        workdir="${build.dir}"
460        classes="${product.jar}"/>
461    </target>
462  
463 +  <target name="test-tck-parallelism-1"
464 +          description="Runs test-tck with given common pool parallelism">
465 +    <antcall target="test-tck">
466 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
467 +    </antcall>
468 +  </target>
469 +
470 +  <target name="test-tck-parallelism-0"
471 +          description="Runs test-tck with given common pool parallelism">
472 +    <antcall target="test-tck">
473 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474 +    </antcall>
475 +  </target>
476 +
477 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478    <target name="test-jtreg"
479            depends="jar"
480            description="Runs jtreg tests for main using the jtreg ant task">
481      <run-jtreg-tests
482 <       target="8"
482 >       target="${build.main.java.version}"
483         workdir="${build.dir}"
484         classes="${product.jar}"/>
485    </target>
486  
487    <target name="test"
488 <          depends="test-tck, test-jtreg"
488 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
489            description="Runs tck and jtreg tests for main">
490    </target>
491  
492 +  <target name="test89"
493 +          description="Runs tck and jtreg tests for main for multiple java versions">
494 +
495 +    <antcall target="clean"/>
496 +    <antcall target="test">
497 +      <param name="build.main.java.version" value="8"/>
498 +      <param name="build.main.javac" value="${javac8}"/>
499 +      <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500 +    </antcall>
501 +
502 +    <antcall target="clean"/>
503 +    <antcall target="test">
504 +      <param name="build.main.java.version" value="9"/>
505 +      <param name="build.main.javac" value="${javac9}"/>
506 +    </antcall>
507 +
508 +  </target>
509 +
510  
511  
512    <target name="configure-compiler">
# Line 470 | Line 556 | As of 2013-02, the very latest lambda 8
556    </target>
557  
558  
559 +  <target name="compile-test-loops" depends="jar"
560 +          description="compile all the perf tests in src/test/loops">
561 +
562 +    <mkdir dir="${build.dir}/test/loops"/>
563 +
564 +    <javac srcdir="${basedir}/src/test/loops"
565 +           destdir="${build.dir}/test/loops"
566 +           debug="${build.debug}"
567 +           debuglevel="${build.debuglevel}"
568 +           deprecation="${build.deprecation}"
569 +           includeAntRuntime="false"
570 +           includeJavaRuntime="false"
571 +           executable="${javac9}"
572 +           fork="true">
573 +
574 +      <include name="*.java"/>
575 +      <compilerarg value="-XDignore.symbol.file=true"/>
576 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
578 +      <compilerarg line="${build.args}"/>
579 +
580 +    </javac>
581 +
582 +  </target>
583 +
584 +
585    <!-- jsr166 4jdk7 -->
586  
587    <target name="4jdk7compile"
# Line 495 | Line 607 | As of 2013-02, the very latest lambda 8
607        <compilerarg value="-Xprefer:source"/>
608        <compilerarg value="-XDignore.symbol.file=true"/>
609        <compilerarg value="-Xlint:all"/>
610 +      <compilerarg value="-Werror"/>
611        <compilerarg line="${build.args}"/>
612  
613      </javac>
# Line 552 | Line 665 | As of 2013-02, the very latest lambda 8
665        <javac-elements>
666          <!-- JDK8+ test classes -->
667          <exclude name="*8Test.java"/>
668 +        <exclude name="*9Test.java"/>
669          <exclude name="DoubleAccumulatorTest.java"/>
670          <exclude name="DoubleAdderTest.java"/>
671          <exclude name="LongAccumulatorTest.java"/>
# Line 598 | Line 712 | As of 2013-02, the very latest lambda 8
712      <run-jtreg-tests
713         target="7"
714         workdir="${build.4jdk7.dir}"
715 <       classes="${4jdk7product.jar}"
602 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
715 >       classes="${4jdk7product.jar}"/>
716    </target>
717  
718  
# Line 617 | Line 730 | As of 2013-02, the very latest lambda 8
730  
731      <javadoc destdir="${4jdk7docs.dir}"
732               packagenames="none"
733 <             link="${jdkapi7docs.url}"
733 >             link="${java7.api.url}"
734               overview="${4jdk7src.dir}/intro.html"
735               access="${build.javadoc.access}"
736               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 626 | Line 739 | As of 2013-02, the very latest lambda 8
739        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
740          <include name="**/*.java"/>
741        </fileset>
742 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
743        <arg value="-XDignore.symbol.file=true"/>
744      </javadoc>
745    </target>
# Line 680 | Line 794 | As of 2013-02, the very latest lambda 8
794        <include name="jsr166x/**/*.java"/>
795        <compilerarg value="-XDignore.symbol.file=true"/>
796        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
797 +      <compilerarg value="-Werror"/>
798        <compilerarg line="${build.args}"/>
799  
800      </javac>
# Line 705 | Line 820 | As of 2013-02, the very latest lambda 8
820  
821      <javadoc destdir="${jsr166xdocs.dir}"
822               packagenames="jsr166x.*"
823 <             link="${jdkapidocs.url}"
823 >             link="${java.api.url}"
824               access="${build.javadoc.access}"
825               sourcepath="${topsrc.dir}:${jdk6src.dir}"
826               bootclasspath="${bootclasspath6}"
827               source="5"
828               executable="${javadoc7}">
829 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
830        <arg value="-XDignore.symbol.file=true"/>
831  
832      </javadoc>
# Line 765 | Line 881 | As of 2013-02, the very latest lambda 8
881        <include name="jsr166y/**/*.java"/>
882        <compilerarg value="-XDignore.symbol.file=true"/>
883        <compilerarg value="-Xlint:all"/>
884 +      <compilerarg value="-Werror"/>
885        <compilerarg line="${build.args}"/>
886  
887      </javac>
# Line 790 | Line 907 | As of 2013-02, the very latest lambda 8
907  
908      <javadoc destdir="${jsr166ydocs.dir}"
909               packagenames="jsr166y.*"
910 <             link="${jdkapidocs.url}"
910 >             link="${java.api.url}"
911               access="${build.javadoc.access}"
912               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               bootclasspath="${bootclasspath6}"
914               source="6"
915               executable="${javadoc7}">
916 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
917        <arg value="-XDignore.symbol.file=true"/>
918  
919      </javadoc>
# Line 851 | Line 969 | As of 2013-02, the very latest lambda 8
969        <include name="extra166y/**/*.java"/>
970        <compilerarg value="-XDignore.symbol.file=true"/>
971        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
972 +      <compilerarg value="-Werror"/>
973        <compilerarg line="${build.args}"/>
974  
975      </javac>
# Line 876 | Line 995 | As of 2013-02, the very latest lambda 8
995  
996      <javadoc destdir="${extra166ydocs.dir}"
997               packagenames="extra166y.*"
998 <             link="${jdkapidocs.url}"
998 >             link="${java.api.url}"
999               access="${build.javadoc.access}"
1000               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1001               bootclasspath="${bootclasspath6}"
1002               source="6"
1003               executable="${javadoc7}">
1004 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1005        <arg value="-XDignore.symbol.file=true"/>
1006  
1007      </javadoc>
# Line 937 | Line 1057 | As of 2013-02, the very latest lambda 8
1057        <include name="jsr166e/**/*.java"/>
1058        <compilerarg value="-XDignore.symbol.file=true"/>
1059        <compilerarg value="-Xlint:all"/>
1060 +      <compilerarg value="-Werror"/>
1061        <compilerarg line="${build.args}"/>
1062  
1063      </javac>
# Line 963 | Line 1084 | As of 2013-02, the very latest lambda 8
1084        <include name="jsr166e/**/*.java"/>
1085        <compilerarg value="-XDignore.symbol.file=true"/>
1086        <compilerarg value="-Xlint:all"/>
1087 +      <compilerarg value="-Werror"/>
1088        <compilerarg value="-Xdoclint:all/protected"/>
1089  
1090      </javac>
# Line 988 | Line 1110 | As of 2013-02, the very latest lambda 8
1110  
1111      <javadoc destdir="${jsr166edocs.dir}"
1112               packagenames="jsr166e.*"
1113 <             link="${jdkapidocs.url}"
1113 >             link="${java.api.url}"
1114               access="${build.javadoc.access}"
1115               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1116               source="${build.jsr166e.java.version}"
1117               executable="${javadoc7}">
1118 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119        <arg value="-XDignore.symbol.file=true"/>
1120  
1121      </javadoc>
# Line 1065 | Line 1188 | As of 2013-02, the very latest lambda 8
1188  
1189    <target name="lint">
1190      <antcall target="dists">
1191 +      <param name="build.javadoc.access" value="public"/>
1192 +    </antcall>
1193 +  </target>
1194 +
1195 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1196 +  <target name="lint-private">
1197 +    <antcall target="dist">
1198        <param name="build.javadoc.access" value="private"/>
1199      </antcall>
1200    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines