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.154 by jsr166, Mon Jun 16 15:55:54 2014 UTC vs.
Revision 1.179 by jsr166, Sun Sep 13 03:22:29 2015 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless">
3  
4    <description>
5   ------------------------------------------------------------------------------
# Line 24 | Line 25
25    $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.
28 +
29 +  Alternatively, define ant variables thus:
30 +  ant -Djdk$N.home=...
31 +  for $N in 6 7 8 9 ...
32   ------------------------------------------------------------------------------
33    </description>
34  
# Line 34 | Line 39
39      </java>
40    </target>
41  
42 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43  
44    <!-- User-specific settings -->
45    <property file="user.properties"/>
# Line 46 | Line 52
52    <property name="build.deprecation"    value="false"/>
53    <property name="build.javadoc.access" value="protected"/>
54  
55 <  <!-- Tck options; see JSR166TestCase.java -->
56 <  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
55 >  <!-- Tck options; see JSR166TestCase.java
56 >   To profile a single tck test class:
57 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58 >   To stress test a single tck test class:
59 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60 >  -->
61    <property name="jsr166.profileTests"     value="false"/>
62    <property name="jsr166.profileThreshold" value="100"/>
63    <property name="jsr166.runsPerTest"      value="1"/>
54  <!-- Allow running an individual tck test class -->
55  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
64    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65  
66    <!-- Build locations -->
# Line 87 | Line 95
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
98 >    <available property="jdk@{v}.have.java.base"
99 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101 >      if:set="jdk@{v}.have.java.base"/>
102 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103 >      unless:set="jdk@{v}.have.java.base"/>
104      <local name="boot.jar.dir"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">
# Line 123 | Line 136
136    <property name="test.src.dir"         location="${basedir}/src/test"/>
137    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
138    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
139 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
140 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
141 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
142 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
143    <property name="lib.dir"              location="${basedir}/lib"/>
144    <property name="dist.dir"             location="${basedir}/dist"/>
145    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 161 | Line 177
177    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
178    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
179    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
180 <  <!-- The expected canonical location does not yet exist as of 2014-02 -->
181 <  <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166 <  <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167 <  <!-- No published jdk9 docs exist as of 2014-02 -->
180 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
181 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
182    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
183 <  <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
183 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
184    <!-- Default jdk doc location (latest stable release seems best) -->
185 <  <property name="java.docroot.url"       value="${java7.docroot.url}"/>
185 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
186  
187    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
188    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 195 | Line 209
209      <attribute name="compile-target" default="@{target}"/>
210      <attribute name="workdir"/>
211      <attribute name="classes"/>
212 <    <attribute name="jvmflags" default="-ea -esa"/>
212 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213      <element name="javac-elements" optional="true"/>
214      <sequential>
215  
# Line 209 | Line 223
223             source="@{compile-target}"
224             target="@{compile-target}"
225             classpath="${junit.jar}"
212           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
226             includeAntRuntime="false"
227             includeJavaRuntime="false"
228             executable="${javac@{compile-target}}"
# Line 218 | Line 231
231        <include name="*.java"/>
232        <compilerarg value="-XDignore.symbol.file=true"/>
233        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
234 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
235        <compilerarg line="${build.args}"/>
236        <javac-elements/>
237  
# Line 229 | Line 243
243            fork="true">
244          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245          <jvmarg line="@{jvmflags}"/>
246 +
247 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250 +        </syspropertyset>
251 +
252          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 241 | Line 261
261      </sequential>
262    </macrodef>
263  
264 +  <!-- Define jtreg test sets for different jdk versions -->
265 +  <fileset dir="${jtreg9.src.dir}">
266 +    <patternset id="jdk9.jtreg.tests">
267 +      <include name="**/*.java"/>
268 +    </patternset>
269 +  </fileset>
270 +
271 +  <fileset dir="${jtreg8.src.dir}">
272 +    <patternset id="jdk8.jtreg.tests">
273 +      <include name="**/*.java"/>
274 +      <exclude name="**/SpliteratorCharacteristics.java"/>
275 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276 +      <exclude name="**/GCDuringIteration.java"/>
277 +    </patternset>
278 +  </fileset>
279 +
280 +  <fileset dir="${jtreg7.src.dir}">
281 +    <patternset id="jdk7.jtreg.tests">
282 +      <include name="**/*.java"/>
283 +    </patternset>
284 +  </fileset>
285 +
286    <macrodef name="run-jtreg-tests">
287 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
287 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288      <attribute name="source" default="7"/>
289      <attribute name="target"/>
290      <attribute name="workdir"/>
# Line 254 | Line 295
295      <delete dir="@{workdir}/JTreport" quiet="true"/>
296      <mkdir dir="@{workdir}/JTwork/scratch"/>
297      <mkdir dir="@{workdir}/JTreport"/>
298 <    <jtreg dir="@{jtreg.src.dir}"
298 >    <jtreg dir="${jtreg@{target}.src.dir}"
299             jdk="${jdk@{target}.home}"
300             workDir="@{workdir}/JTwork"
301             reportDir="@{workdir}/JTreport">
302 <
302 >      <patternset refid="jdk@{target}.jtreg.tests"/>
303        <arg value="-Xbootclasspath/p:@{classes}"/>
304        <arg value="-agentvm"/>
305        <arg value="-v:nopass,fail"/>
# Line 309 | Line 350
350        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352        <compilerarg value="-Xlint:all"/>
353 +      <compilerarg value="-Werror"/>
354        <compilerarg value="-Xdoclint:all/protected"/>
355        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356        <compilerarg line="${build.args}"/>
# Line 323 | Line 365
365  
366      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>
368 +      <manifest>
369 +        <attribute name="Built-By" value="${user.name}"/>
370 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
371 +      </manifest>
372      </jar>
373    </target>
374  
# Line 381 | Line 427
427        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>
430 +      <manifest>
431 +        <attribute name="Built-By" value="${user.name}"/>
432 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
433 +      </manifest>
434      </jar>
435    </target>
436  
# Line 412 | Line 462
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>
464  
465 <
416 <  <target name="test-tck"
465 >  <target name="tck"
466            depends="jar"
467            description="Runs tck tests for main directly">
468  
# Line 423 | Line 472
472        classes="${product.jar}"/>
473    </target>
474  
475 <  <target name="test-jtreg"
475 >  <target name="tck-parallelism-1"
476 >          description="Runs tck with given common pool parallelism">
477 >    <antcall target="tck">
478 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479 >    </antcall>
480 >  </target>
481 >
482 >  <target name="tck-parallelism-0"
483 >          description="Runs tck with given common pool parallelism">
484 >    <antcall target="tck">
485 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486 >    </antcall>
487 >  </target>
488 >
489 >  <target name="jtreg"
490            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">
492      <run-jtreg-tests
# Line 433 | Line 496
496    </target>
497  
498    <target name="test"
499 <          depends="test-tck, test-jtreg"
499 >          depends="tck, tck-parallelism-1, jtreg"
500            description="Runs tck and jtreg tests for main">
501    </target>
502  
503 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
504 +
505 +    <antcall target="jtreg">
506 +      <param name="build.main.java.version" value="8"/>
507 +      <param name="build.main.javac" value="${javac8}"/>
508 +    </antcall>
509 +
510 +  </target>
511 +
512    <target name="test89"
513            description="Runs tck and jtreg tests for main for multiple java versions">
514  
# Line 503 | Line 575
575    </target>
576  
577  
578 +  <target name="compile-test-loops" depends="jar"
579 +          description="compile all the perf tests in src/test/loops">
580 +
581 +    <mkdir dir="${build.dir}/test/loops"/>
582 +
583 +    <javac srcdir="${basedir}/src/test/loops"
584 +           destdir="${build.dir}/test/loops"
585 +           debug="${build.debug}"
586 +           debuglevel="${build.debuglevel}"
587 +           deprecation="${build.deprecation}"
588 +           includeAntRuntime="false"
589 +           includeJavaRuntime="false"
590 +           executable="${javac9}"
591 +           fork="true">
592 +
593 +      <include name="*.java"/>
594 +      <compilerarg value="-XDignore.symbol.file=true"/>
595 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
596 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
597 +      <compilerarg line="${build.args}"/>
598 +
599 +    </javac>
600 +
601 +  </target>
602 +
603 +
604    <!-- jsr166 4jdk7 -->
605  
606    <target name="4jdk7compile"
# Line 528 | Line 626
626        <compilerarg value="-Xprefer:source"/>
627        <compilerarg value="-XDignore.symbol.file=true"/>
628        <compilerarg value="-Xlint:all"/>
629 +      <compilerarg value="-Werror"/>
630        <compilerarg line="${build.args}"/>
631  
632      </javac>
# Line 569 | Line 668
668  
669      <jar destfile="${4jdk7product.jar}">
670        <fileset dir="${build.4jdk7.classes.dir}"/>
671 +      <manifest>
672 +        <attribute name="Built-By" value="${user.name}"/>
673 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
674 +      </manifest>
675      </jar>
676  
677    </target>
678  
679  
680 <  <target name="4jdk7-test-tck"
680 >  <target name="4jdk7-tck"
681            depends="4jdk7jar"
682            description="Runs tck tests for jsr166-4jdk7 directly">
683  
# Line 586 | Line 689
689          <!-- JDK8+ test classes -->
690          <exclude name="*8Test.java"/>
691          <exclude name="*9Test.java"/>
692 +        <exclude name="*10Test.java"/>
693          <exclude name="DoubleAccumulatorTest.java"/>
694          <exclude name="DoubleAdderTest.java"/>
695          <exclude name="LongAccumulatorTest.java"/>
# Line 593 | Line 697
697          <exclude name="CompletableFutureTest.java"/>
698          <exclude name="SplittableRandomTest.java"/>
699          <exclude name="StampedLockTest.java"/>
700 +        <exclude name="SubmissionPublisherTest.java"/>
701        </javac-elements>
702      </run-tck-tests>
703    </target>
704  
705  
706 <  <target name="4jdk7-test-tck-junit"
706 >  <target name="4jdk7-tck-junit"
707            depends="4jdk7compile"
708            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
709  
# Line 626 | Line 731
731      </junit>
732    </target>
733  
734 <  <target name="4jdk7-test-jtreg"
734 >  <target name="4jdk7-jtreg"
735            depends="4jdk7jar"
736            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
737      <run-jtreg-tests
738         target="7"
739         workdir="${build.4jdk7.dir}"
740 <       classes="${4jdk7product.jar}"
636 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
740 >       classes="${4jdk7product.jar}"/>
741    </target>
742  
743  
744    <target name="4jdk7-test"
745 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
745 >          depends="4jdk7-tck, 4jdk7-jtreg"
746            description="Runs tck and jtreg tests for jsr166-4jdk7">
747    </target>
748  
# Line 715 | Line 819
819        <include name="jsr166x/**/*.java"/>
820        <compilerarg value="-XDignore.symbol.file=true"/>
821        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
822 +      <compilerarg value="-Werror"/>
823        <compilerarg line="${build.args}"/>
824  
825      </javac>
# Line 727 | Line 832
832  
833      <jar destfile="${jsr166x.jar}">
834        <fileset dir="${build.jsr166x.classes.dir}"/>
835 +      <manifest>
836 +        <attribute name="Built-By" value="${user.name}"/>
837 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
838 +      </manifest>
839      </jar>
840  
841    </target>
# Line 801 | Line 910
910        <include name="jsr166y/**/*.java"/>
911        <compilerarg value="-XDignore.symbol.file=true"/>
912        <compilerarg value="-Xlint:all"/>
913 +      <compilerarg value="-Werror"/>
914        <compilerarg line="${build.args}"/>
915  
916      </javac>
# Line 813 | Line 923
923  
924      <jar destfile="${jsr166y.jar}" index="true">
925        <fileset dir="${build.jsr166y.classes.dir}"/>
926 +      <manifest>
927 +        <attribute name="Built-By" value="${user.name}"/>
928 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929 +      </manifest>
930      </jar>
931  
932    </target>
# Line 888 | Line 1002
1002        <include name="extra166y/**/*.java"/>
1003        <compilerarg value="-XDignore.symbol.file=true"/>
1004        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1005 +      <compilerarg value="-Werror"/>
1006        <compilerarg line="${build.args}"/>
1007  
1008      </javac>
# Line 900 | Line 1015
1015  
1016      <jar destfile="${extra166y.jar}" index="true">
1017        <fileset dir="${build.extra166y.classes.dir}"/>
1018 +      <manifest>
1019 +        <attribute name="Built-By" value="${user.name}"/>
1020 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1021 +      </manifest>
1022      </jar>
1023  
1024    </target>
# Line 975 | Line 1094
1094        <include name="jsr166e/**/*.java"/>
1095        <compilerarg value="-XDignore.symbol.file=true"/>
1096        <compilerarg value="-Xlint:all"/>
1097 +      <compilerarg value="-Werror"/>
1098        <compilerarg line="${build.args}"/>
1099  
1100      </javac>
# Line 1001 | Line 1121
1121        <include name="jsr166e/**/*.java"/>
1122        <compilerarg value="-XDignore.symbol.file=true"/>
1123        <compilerarg value="-Xlint:all"/>
1124 +      <compilerarg value="-Werror"/>
1125        <compilerarg value="-Xdoclint:all/protected"/>
1126  
1127      </javac>
# Line 1013 | Line 1134
1134  
1135      <jar destfile="${jsr166e.jar}" index="true">
1136        <fileset dir="${build.jsr166e.classes.dir}"/>
1137 +      <manifest>
1138 +        <attribute name="Built-By" value="${user.name}"/>
1139 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1140 +      </manifest>
1141      </jar>
1142  
1143    </target>
# Line 1038 | Line 1163
1163    </target>
1164  
1165  
1166 <  <target name="jsr166e-test-tck-one-java-version"
1166 >  <target name="jsr166e-tck-one-java-version"
1167            depends="jsr166ejar">
1168  
1169      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1050 | Line 1175
1175        classes="${jsr166e.jar}"/>
1176    </target>
1177  
1178 <  <target name="jsr166e-test-tck"
1178 >  <target name="jsr166e-tck"
1179            description="Runs tck tests for jsr166e for multiple java versions">
1180  
1181   <!--     <antcall target="clean"/> -->
1182 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1182 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1183   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1184   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1185   <!--     </antcall> -->
1186  
1187      <antcall target="clean"/>
1188 <    <antcall target="jsr166e-test-tck-one-java-version">
1188 >    <antcall target="jsr166e-tck-one-java-version">
1189        <param name="build.jsr166e.java.version" value="7"/>
1190        <param name="build.jsr166e.javac" value="${javac7}"/>
1191      </antcall>
1192  
1193      <antcall target="clean"/>
1194 <    <antcall target="jsr166e-test-tck-one-java-version">
1194 >    <antcall target="jsr166e-tck-one-java-version">
1195        <param name="build.jsr166e.java.version" value="6"/>
1196        <param name="build.jsr166e.javac" value="${javac6}"/>
1197      </antcall>
# Line 1074 | Line 1199
1199  
1200  
1201    <target name="jsr166e-test"
1202 <          depends="jsr166e-test-tck"
1202 >          depends="jsr166e-tck"
1203            description="Runs all tests for jsr166e">
1204    </target>
1205  
# Line 1104 | Line 1229
1229  
1230    <target name="lint">
1231      <antcall target="dists">
1232 +      <param name="build.javadoc.access" value="public"/>
1233 +    </antcall>
1234 +  </target>
1235 +
1236 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1237 +  <target name="lint-private">
1238 +    <antcall target="dist">
1239        <param name="build.javadoc.access" value="private"/>
1240      </antcall>
1241    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines