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.181 by jsr166, Sun Sep 13 05:26:02 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 >    <local name="have.java.base"/>
99 >    <available property="have.java.base"
100 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
102 >      if:set="have.java.base"/>
103 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
104 >      unless:set="have.java.base"/>
105      <local name="boot.jar.dir"/>
106      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
107      <path id="bootclasspath@{v}">
# Line 123 | Line 137
137    <property name="test.src.dir"         location="${basedir}/src/test"/>
138    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
139    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
140 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
140 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
141 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
142 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
143 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
144    <property name="lib.dir"              location="${basedir}/lib"/>
145    <property name="dist.dir"             location="${basedir}/dist"/>
146    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 161 | Line 178
178    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
179    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
180    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
181 <  <!-- The expected canonical location does not yet exist as of 2014-02 -->
182 <  <!-- <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 -->
181 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
182 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
183    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
184 <  <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
184 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
185    <!-- Default jdk doc location (latest stable release seems best) -->
186 <  <property name="java.docroot.url"       value="${java7.docroot.url}"/>
186 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
187  
188    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
189    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 195 | Line 210
210      <attribute name="compile-target" default="@{target}"/>
211      <attribute name="workdir"/>
212      <attribute name="classes"/>
213 <    <attribute name="jvmflags" default="-ea -esa"/>
213 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214      <element name="javac-elements" optional="true"/>
215      <sequential>
216  
# Line 209 | Line 224
224             source="@{compile-target}"
225             target="@{compile-target}"
226             classpath="${junit.jar}"
212           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
227             includeAntRuntime="false"
228             includeJavaRuntime="false"
229             executable="${javac@{compile-target}}"
# Line 218 | Line 232
232        <include name="*.java"/>
233        <compilerarg value="-XDignore.symbol.file=true"/>
234        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
235 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
236        <compilerarg line="${build.args}"/>
237        <javac-elements/>
238  
# Line 229 | Line 244
244            fork="true">
245          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
246          <jvmarg line="@{jvmflags}"/>
247 +
248 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
249 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
250 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
251 +        </syspropertyset>
252 +
253          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
254          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
255          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 241 | Line 262
262      </sequential>
263    </macrodef>
264  
265 +  <!-- Define jtreg test sets for different jdk versions -->
266 +  <fileset dir="${jtreg9.src.dir}">
267 +    <patternset id="jdk9.jtreg.tests">
268 +      <include name="**/*.java"/>
269 +    </patternset>
270 +  </fileset>
271 +
272 +  <fileset dir="${jtreg8.src.dir}">
273 +    <patternset id="jdk8.jtreg.tests">
274 +      <include name="**/*.java"/>
275 +      <exclude name="**/SpliteratorCharacteristics.java"/>
276 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
277 +      <exclude name="**/GCDuringIteration.java"/>
278 +    </patternset>
279 +  </fileset>
280 +
281 +  <fileset dir="${jtreg7.src.dir}">
282 +    <patternset id="jdk7.jtreg.tests">
283 +      <include name="**/*.java"/>
284 +    </patternset>
285 +  </fileset>
286 +
287    <macrodef name="run-jtreg-tests">
288 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
288 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
289      <attribute name="source" default="7"/>
290      <attribute name="target"/>
291      <attribute name="workdir"/>
# Line 254 | Line 296
296      <delete dir="@{workdir}/JTreport" quiet="true"/>
297      <mkdir dir="@{workdir}/JTwork/scratch"/>
298      <mkdir dir="@{workdir}/JTreport"/>
299 <    <jtreg dir="@{jtreg.src.dir}"
299 >    <jtreg dir="${jtreg@{target}.src.dir}"
300             jdk="${jdk@{target}.home}"
301             workDir="@{workdir}/JTwork"
302             reportDir="@{workdir}/JTreport">
303 <
303 >      <patternset refid="jdk@{target}.jtreg.tests"/>
304        <arg value="-Xbootclasspath/p:@{classes}"/>
305        <arg value="-agentvm"/>
306        <arg value="-v:nopass,fail"/>
# Line 309 | Line 351
351        <compilerarg value="-Xprefer:source"/>
352        <compilerarg value="-XDignore.symbol.file=true"/>
353        <compilerarg value="-Xlint:all"/>
354 +      <compilerarg value="-Werror"/>
355        <compilerarg value="-Xdoclint:all/protected"/>
356        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357        <compilerarg line="${build.args}"/>
# Line 323 | Line 366
366  
367      <jar destfile="${product.jar}">
368        <fileset dir="${build.classes.dir}"/>
369 +      <manifest>
370 +        <attribute name="Built-By" value="${user.name}"/>
371 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
372 +      </manifest>
373      </jar>
374    </target>
375  
# Line 381 | Line 428
428        <exclude name="src/emulation/**"/>
429        <exclude name="**/SyntaxTest.java"/>
430        <exclude name="**/SuperfluousAbstract.java"/>
431 +      <manifest>
432 +        <attribute name="Built-By" value="${user.name}"/>
433 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
434 +      </manifest>
435      </jar>
436    </target>
437  
# Line 412 | Line 463
463      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
464    </target>
465  
466 <
416 <  <target name="test-tck"
466 >  <target name="tck"
467            depends="jar"
468            description="Runs tck tests for main directly">
469  
# Line 423 | Line 473
473        classes="${product.jar}"/>
474    </target>
475  
476 <  <target name="test-jtreg"
476 >  <target name="tck-parallelism-1"
477 >          description="Runs tck with given common pool parallelism">
478 >    <antcall target="tck">
479 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
480 >    </antcall>
481 >  </target>
482 >
483 >  <target name="tck-parallelism-0"
484 >          description="Runs tck with given common pool parallelism">
485 >    <antcall target="tck">
486 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
487 >    </antcall>
488 >  </target>
489 >
490 >  <target name="jtreg"
491            depends="jar"
492            description="Runs jtreg tests for main using the jtreg ant task">
493      <run-jtreg-tests
# Line 433 | Line 497
497    </target>
498  
499    <target name="test"
500 <          depends="test-tck, test-jtreg"
500 >          depends="tck, tck-parallelism-1, jtreg"
501            description="Runs tck and jtreg tests for main">
502    </target>
503  
504 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
505 +
506 +    <antcall target="jtreg">
507 +      <param name="build.main.java.version" value="8"/>
508 +      <param name="build.main.javac" value="${javac8}"/>
509 +    </antcall>
510 +
511 +  </target>
512 +
513    <target name="test89"
514            description="Runs tck and jtreg tests for main for multiple java versions">
515  
# Line 457 | Line 530
530  
531  
532    <target name="configure-compiler">
533 +    <fail message="ant version too old">
534 +      <condition>
535 +        <not> <antversion atleast="1.9.1"/> </not>
536 +      </condition>
537 +    </fail>
538  
539      <property name="unchecked.option" value="-Xlint:unchecked"/>
540  
# Line 503 | Line 581
581    </target>
582  
583  
584 +  <target name="compile-test-loops" depends="jar"
585 +          description="compile all the perf tests in src/test/loops">
586 +
587 +    <mkdir dir="${build.dir}/test/loops"/>
588 +
589 +    <javac srcdir="${basedir}/src/test/loops"
590 +           destdir="${build.dir}/test/loops"
591 +           debug="${build.debug}"
592 +           debuglevel="${build.debuglevel}"
593 +           deprecation="${build.deprecation}"
594 +           includeAntRuntime="false"
595 +           includeJavaRuntime="false"
596 +           executable="${javac9}"
597 +           fork="true">
598 +
599 +      <include name="*.java"/>
600 +      <compilerarg value="-XDignore.symbol.file=true"/>
601 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
602 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
603 +      <compilerarg line="${build.args}"/>
604 +
605 +    </javac>
606 +
607 +  </target>
608 +
609 +
610    <!-- jsr166 4jdk7 -->
611  
612    <target name="4jdk7compile"
# Line 528 | Line 632
632        <compilerarg value="-Xprefer:source"/>
633        <compilerarg value="-XDignore.symbol.file=true"/>
634        <compilerarg value="-Xlint:all"/>
635 +      <compilerarg value="-Werror"/>
636        <compilerarg line="${build.args}"/>
637  
638      </javac>
# Line 569 | Line 674
674  
675      <jar destfile="${4jdk7product.jar}">
676        <fileset dir="${build.4jdk7.classes.dir}"/>
677 +      <manifest>
678 +        <attribute name="Built-By" value="${user.name}"/>
679 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
680 +      </manifest>
681      </jar>
682  
683    </target>
684  
685  
686 <  <target name="4jdk7-test-tck"
686 >  <target name="4jdk7-tck"
687            depends="4jdk7jar"
688            description="Runs tck tests for jsr166-4jdk7 directly">
689  
# Line 586 | Line 695
695          <!-- JDK8+ test classes -->
696          <exclude name="*8Test.java"/>
697          <exclude name="*9Test.java"/>
698 +        <exclude name="*10Test.java"/>
699          <exclude name="DoubleAccumulatorTest.java"/>
700          <exclude name="DoubleAdderTest.java"/>
701          <exclude name="LongAccumulatorTest.java"/>
# Line 593 | Line 703
703          <exclude name="CompletableFutureTest.java"/>
704          <exclude name="SplittableRandomTest.java"/>
705          <exclude name="StampedLockTest.java"/>
706 +        <exclude name="SubmissionPublisherTest.java"/>
707        </javac-elements>
708      </run-tck-tests>
709    </target>
710  
711  
712 <  <target name="4jdk7-test-tck-junit"
712 >  <target name="4jdk7-tck-junit"
713            depends="4jdk7compile"
714            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
715  
# Line 626 | Line 737
737      </junit>
738    </target>
739  
740 <  <target name="4jdk7-test-jtreg"
740 >  <target name="4jdk7-jtreg"
741            depends="4jdk7jar"
742            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
743      <run-jtreg-tests
744         target="7"
745         workdir="${build.4jdk7.dir}"
746 <       classes="${4jdk7product.jar}"
636 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
746 >       classes="${4jdk7product.jar}"/>
747    </target>
748  
749  
750    <target name="4jdk7-test"
751 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
751 >          depends="4jdk7-tck, 4jdk7-jtreg"
752            description="Runs tck and jtreg tests for jsr166-4jdk7">
753    </target>
754  
# Line 715 | Line 825
825        <include name="jsr166x/**/*.java"/>
826        <compilerarg value="-XDignore.symbol.file=true"/>
827        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
828 +      <compilerarg value="-Werror"/>
829        <compilerarg line="${build.args}"/>
830  
831      </javac>
# Line 727 | Line 838
838  
839      <jar destfile="${jsr166x.jar}">
840        <fileset dir="${build.jsr166x.classes.dir}"/>
841 +      <manifest>
842 +        <attribute name="Built-By" value="${user.name}"/>
843 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
844 +      </manifest>
845      </jar>
846  
847    </target>
# Line 801 | Line 916
916        <include name="jsr166y/**/*.java"/>
917        <compilerarg value="-XDignore.symbol.file=true"/>
918        <compilerarg value="-Xlint:all"/>
919 +      <compilerarg value="-Werror"/>
920        <compilerarg line="${build.args}"/>
921  
922      </javac>
# Line 813 | Line 929
929  
930      <jar destfile="${jsr166y.jar}" index="true">
931        <fileset dir="${build.jsr166y.classes.dir}"/>
932 +      <manifest>
933 +        <attribute name="Built-By" value="${user.name}"/>
934 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935 +      </manifest>
936      </jar>
937  
938    </target>
# Line 888 | Line 1008
1008        <include name="extra166y/**/*.java"/>
1009        <compilerarg value="-XDignore.symbol.file=true"/>
1010        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1011 +      <compilerarg value="-Werror"/>
1012        <compilerarg line="${build.args}"/>
1013  
1014      </javac>
# Line 900 | Line 1021
1021  
1022      <jar destfile="${extra166y.jar}" index="true">
1023        <fileset dir="${build.extra166y.classes.dir}"/>
1024 +      <manifest>
1025 +        <attribute name="Built-By" value="${user.name}"/>
1026 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1027 +      </manifest>
1028      </jar>
1029  
1030    </target>
# Line 975 | Line 1100
1100        <include name="jsr166e/**/*.java"/>
1101        <compilerarg value="-XDignore.symbol.file=true"/>
1102        <compilerarg value="-Xlint:all"/>
1103 +      <compilerarg value="-Werror"/>
1104        <compilerarg line="${build.args}"/>
1105  
1106      </javac>
# Line 1001 | Line 1127
1127        <include name="jsr166e/**/*.java"/>
1128        <compilerarg value="-XDignore.symbol.file=true"/>
1129        <compilerarg value="-Xlint:all"/>
1130 +      <compilerarg value="-Werror"/>
1131        <compilerarg value="-Xdoclint:all/protected"/>
1132  
1133      </javac>
# Line 1013 | Line 1140
1140  
1141      <jar destfile="${jsr166e.jar}" index="true">
1142        <fileset dir="${build.jsr166e.classes.dir}"/>
1143 +      <manifest>
1144 +        <attribute name="Built-By" value="${user.name}"/>
1145 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1146 +      </manifest>
1147      </jar>
1148  
1149    </target>
# Line 1038 | Line 1169
1169    </target>
1170  
1171  
1172 <  <target name="jsr166e-test-tck-one-java-version"
1172 >  <target name="jsr166e-tck-one-java-version"
1173            depends="jsr166ejar">
1174  
1175      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1050 | Line 1181
1181        classes="${jsr166e.jar}"/>
1182    </target>
1183  
1184 <  <target name="jsr166e-test-tck"
1184 >  <target name="jsr166e-tck"
1185            description="Runs tck tests for jsr166e for multiple java versions">
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="8"/> -->
1190   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
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="7"/>
1196        <param name="build.jsr166e.javac" value="${javac7}"/>
1197      </antcall>
1198  
1199      <antcall target="clean"/>
1200 <    <antcall target="jsr166e-test-tck-one-java-version">
1200 >    <antcall target="jsr166e-tck-one-java-version">
1201        <param name="build.jsr166e.java.version" value="6"/>
1202        <param name="build.jsr166e.javac" value="${javac6}"/>
1203      </antcall>
# Line 1074 | Line 1205
1205  
1206  
1207    <target name="jsr166e-test"
1208 <          depends="jsr166e-test-tck"
1208 >          depends="jsr166e-tck"
1209            description="Runs all tests for jsr166e">
1210    </target>
1211  
# Line 1104 | Line 1235
1235  
1236    <target name="lint">
1237      <antcall target="dists">
1238 +      <param name="build.javadoc.access" value="public"/>
1239 +    </antcall>
1240 +  </target>
1241 +
1242 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1243 +  <target name="lint-private">
1244 +    <antcall target="dist">
1245        <param name="build.javadoc.access" value="private"/>
1246      </antcall>
1247    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines