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.151 by jsr166, Sun Feb 16 14:25:46 2014 UTC vs.
Revision 1.172 by jsr166, Wed Sep 2 05:00:20 2015 UTC

# Line 24 | Line 24
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 +
28 +  Alternatively, define ant variables thus:
29 +  ant -Djdk$N.home=...
30 +  for $N in 6 7 8 9 ...
31   ------------------------------------------------------------------------------
32    </description>
33  
# Line 46 | Line 50
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"/>
54  <!-- Allow running an individual tck test class -->
55  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63  
64    <!-- Build locations -->
# Line 157 | Line 163
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 expected canonical location does not yet exist as of 2014-02 -->
173 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
174 <
175 <  <property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>
170 <  <!-- No published jdk9 docs exist as of 2014-02 -->
171 <  <!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/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 190 | Line 199
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 204 | Line 213
213             source="@{compile-target}"
214             target="@{compile-target}"
215             classpath="${junit.jar}"
207           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"
# Line 213 | Line 221
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 224 | Line 233
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 236 | Line 251
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="**/CompletableFuture/**/*.java"/>
277 +      <exclude name="**/ConcurrentAssociateTest.java"/>
278 +      <exclude name="**/ConcurrentContainsKeyTest.java"/>
279 +      <exclude name="**/ConcurrentHashMap/ToArray.java"/>
280 +      <exclude name="**/ConcurrentRemoveIf.java"/>
281 +      <exclude name="**/COWSubList.java"/>
282 +      <exclude name="**/FutureTask/NegativeTimeout.java"/>
283 +      <exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>
284 +      <exclude name="**/forkjoin/SubmissionTest.java"/>
285 +      <exclude name="**/StampedLock/**/*.java"/>
286 +      <exclude name="**/AtomicReferenceTest.java"/>
287 +      <exclude name="util/concurrent/atomic/Serial.java"/>
288 +    </patternset>
289 +  </fileset>
290 +
291    <macrodef name="run-jtreg-tests">
292 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
293      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
294      <attribute name="source" default="7"/>
295      <attribute name="target"/>
# Line 252 | Line 305
305             jdk="${jdk@{target}.home}"
306             workDir="@{workdir}/JTwork"
307             reportDir="@{workdir}/JTreport">
308 <
308 >      <patternset refid="jdk@{target}.jtreg.tests"/>
309        <arg value="-Xbootclasspath/p:@{classes}"/>
310        <arg value="-agentvm"/>
311        <arg value="-v:nopass,fail"/>
# Line 303 | Line 356
356        <compilerarg value="-Xprefer:source"/>
357        <compilerarg value="-XDignore.symbol.file=true"/>
358        <compilerarg value="-Xlint:all"/>
359 +      <compilerarg value="-Werror"/>
360        <compilerarg value="-Xdoclint:all/protected"/>
361        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362        <compilerarg line="${build.args}"/>
# Line 332 | Line 386
386  
387      <javadoc destdir="${docs.dir}"
388               packagenames="none"
389 <             link="${jdkapi9docs.url}"
389 >             link="${java9.api.url}"
390               overview="${src.dir}/intro.html"
391               access="${build.javadoc.access}"
392               sourcepath="${src.dir}:${jdk9src.dir}"
# Line 341 | Line 395
395        <fileset dir="${src.dir}" defaultexcludes="yes">
396          <include name="**/*.java"/>
397        </fileset>
398 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
399        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
400        <arg value="-XDignore.symbol.file=true"/>
401        <arg value="-tag"/>
# Line 405 | Line 460
460      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
461    </target>
462  
463 <
463 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
464    <target name="test-tck"
465            depends="jar"
466            description="Runs tck tests for main directly">
# Line 416 | Line 471
471        classes="${product.jar}"/>
472    </target>
473  
474 +  <target name="test-tck-parallelism-1"
475 +          description="Runs test-tck with given common pool parallelism">
476 +    <antcall target="test-tck">
477 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
478 +    </antcall>
479 +  </target>
480 +
481 +  <target name="test-tck-parallelism-0"
482 +          description="Runs test-tck with given common pool parallelism">
483 +    <antcall target="test-tck">
484 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
485 +    </antcall>
486 +  </target>
487 +
488 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
489    <target name="test-jtreg"
490            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">
# Line 426 | Line 496
496    </target>
497  
498    <target name="test"
499 <          depends="test-tck, test-jtreg"
499 >          depends="test-tck, test-tck-parallelism-1, test-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 496 | 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 521 | 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 625 | Line 731
731      <run-jtreg-tests
732         target="7"
733         workdir="${build.4jdk7.dir}"
734 <       classes="${4jdk7product.jar}"
629 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
734 >       classes="${4jdk7product.jar}"/>
735    </target>
736  
737  
# Line 644 | Line 749
749  
750      <javadoc destdir="${4jdk7docs.dir}"
751               packagenames="none"
752 <             link="${jdkapi7docs.url}"
752 >             link="${java7.api.url}"
753               overview="${4jdk7src.dir}/intro.html"
754               access="${build.javadoc.access}"
755               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 653 | Line 758
758        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
759          <include name="**/*.java"/>
760        </fileset>
761 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
762        <arg value="-XDignore.symbol.file=true"/>
763      </javadoc>
764    </target>
# Line 707 | Line 813
813        <include name="jsr166x/**/*.java"/>
814        <compilerarg value="-XDignore.symbol.file=true"/>
815        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
816 +      <compilerarg value="-Werror"/>
817        <compilerarg line="${build.args}"/>
818  
819      </javac>
# Line 732 | Line 839
839  
840      <javadoc destdir="${jsr166xdocs.dir}"
841               packagenames="jsr166x.*"
842 <             link="${jdkapidocs.url}"
842 >             link="${java.api.url}"
843               access="${build.javadoc.access}"
844               sourcepath="${topsrc.dir}:${jdk6src.dir}"
845               bootclasspath="${bootclasspath6}"
846               source="5"
847               executable="${javadoc7}">
848 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
849        <arg value="-XDignore.symbol.file=true"/>
850  
851      </javadoc>
# Line 792 | Line 900
900        <include name="jsr166y/**/*.java"/>
901        <compilerarg value="-XDignore.symbol.file=true"/>
902        <compilerarg value="-Xlint:all"/>
903 +      <compilerarg value="-Werror"/>
904        <compilerarg line="${build.args}"/>
905  
906      </javac>
# Line 817 | Line 926
926  
927      <javadoc destdir="${jsr166ydocs.dir}"
928               packagenames="jsr166y.*"
929 <             link="${jdkapidocs.url}"
929 >             link="${java.api.url}"
930               access="${build.javadoc.access}"
931               sourcepath="${topsrc.dir}:${jdk6src.dir}"
932               bootclasspath="${bootclasspath6}"
933               source="6"
934               executable="${javadoc7}">
935 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
936        <arg value="-XDignore.symbol.file=true"/>
937  
938      </javadoc>
# Line 878 | Line 988
988        <include name="extra166y/**/*.java"/>
989        <compilerarg value="-XDignore.symbol.file=true"/>
990        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
991 +      <compilerarg value="-Werror"/>
992        <compilerarg line="${build.args}"/>
993  
994      </javac>
# Line 903 | Line 1014
1014  
1015      <javadoc destdir="${extra166ydocs.dir}"
1016               packagenames="extra166y.*"
1017 <             link="${jdkapidocs.url}"
1017 >             link="${java.api.url}"
1018               access="${build.javadoc.access}"
1019               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1020               bootclasspath="${bootclasspath6}"
1021               source="6"
1022               executable="${javadoc7}">
1023 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1024        <arg value="-XDignore.symbol.file=true"/>
1025  
1026      </javadoc>
# Line 964 | Line 1076
1076        <include name="jsr166e/**/*.java"/>
1077        <compilerarg value="-XDignore.symbol.file=true"/>
1078        <compilerarg value="-Xlint:all"/>
1079 +      <compilerarg value="-Werror"/>
1080        <compilerarg line="${build.args}"/>
1081  
1082      </javac>
# Line 990 | Line 1103
1103        <include name="jsr166e/**/*.java"/>
1104        <compilerarg value="-XDignore.symbol.file=true"/>
1105        <compilerarg value="-Xlint:all"/>
1106 +      <compilerarg value="-Werror"/>
1107        <compilerarg value="-Xdoclint:all/protected"/>
1108  
1109      </javac>
# Line 1015 | Line 1129
1129  
1130      <javadoc destdir="${jsr166edocs.dir}"
1131               packagenames="jsr166e.*"
1132 <             link="${jdkapidocs.url}"
1132 >             link="${java.api.url}"
1133               access="${build.javadoc.access}"
1134               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1135               source="${build.jsr166e.java.version}"
1136               executable="${javadoc7}">
1137 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1138        <arg value="-XDignore.symbol.file=true"/>
1139  
1140      </javadoc>
# Line 1092 | Line 1207
1207  
1208    <target name="lint">
1209      <antcall target="dists">
1210 +      <param name="build.javadoc.access" value="public"/>
1211 +    </antcall>
1212 +  </target>
1213 +
1214 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1215 +  <target name="lint-private">
1216 +    <antcall target="dist">
1217        <param name="build.javadoc.access" value="private"/>
1218      </antcall>
1219    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines