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.168 by jsr166, Wed Sep 2 02:14:59 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="util/concurrent/CompletableFuture/**/*.java"/>
277 +      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278 +      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279 +    </patternset>
280 +  </fileset>
281 +
282    <macrodef name="run-jtreg-tests">
283 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
285      <attribute name="source" default="7"/>
286      <attribute name="target"/>
# Line 252 | Line 296
296             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork"
298             reportDir="@{workdir}/JTreport">
299 <
299 >      <patternset refid="jdk@{target}.jtreg.tests"/>
300        <arg value="-Xbootclasspath/p:@{classes}"/>
301        <arg value="-agentvm"/>
302        <arg value="-v:nopass,fail"/>
# Line 303 | Line 347
347        <compilerarg value="-Xprefer:source"/>
348        <compilerarg value="-XDignore.symbol.file=true"/>
349        <compilerarg value="-Xlint:all"/>
350 +      <compilerarg value="-Werror"/>
351        <compilerarg value="-Xdoclint:all/protected"/>
352        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
353        <compilerarg line="${build.args}"/>
# Line 332 | Line 377
377  
378      <javadoc destdir="${docs.dir}"
379               packagenames="none"
380 <             link="${jdkapi9docs.url}"
380 >             link="${java9.api.url}"
381               overview="${src.dir}/intro.html"
382               access="${build.javadoc.access}"
383               sourcepath="${src.dir}:${jdk9src.dir}"
# Line 341 | Line 386
386        <fileset dir="${src.dir}" defaultexcludes="yes">
387          <include name="**/*.java"/>
388        </fileset>
389 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
390        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
391        <arg value="-XDignore.symbol.file=true"/>
392        <arg value="-tag"/>
# Line 405 | Line 451
451      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
452    </target>
453  
454 <
454 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
455    <target name="test-tck"
456            depends="jar"
457            description="Runs tck tests for main directly">
# Line 416 | Line 462
462        classes="${product.jar}"/>
463    </target>
464  
465 +  <target name="test-tck-parallelism-1"
466 +          description="Runs test-tck with given common pool parallelism">
467 +    <antcall target="test-tck">
468 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
469 +    </antcall>
470 +  </target>
471 +
472 +  <target name="test-tck-parallelism-0"
473 +          description="Runs test-tck with given common pool parallelism">
474 +    <antcall target="test-tck">
475 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
476 +    </antcall>
477 +  </target>
478 +
479 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480    <target name="test-jtreg"
481            depends="jar"
482            description="Runs jtreg tests for main using the jtreg ant task">
# Line 426 | Line 487
487    </target>
488  
489    <target name="test"
490 <          depends="test-tck, test-jtreg"
490 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
491            description="Runs tck and jtreg tests for main">
492    </target>
493  
494 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
495 +
496 +    <antcall target="jtreg">
497 +      <param name="build.main.java.version" value="8"/>
498 +      <param name="build.main.javac" value="${javac8}"/>
499 +    </antcall>
500 +
501 +  </target>
502 +
503    <target name="test89"
504            description="Runs tck and jtreg tests for main for multiple java versions">
505  
# Line 496 | Line 566
566    </target>
567  
568  
569 +  <target name="compile-test-loops" depends="jar"
570 +          description="compile all the perf tests in src/test/loops">
571 +
572 +    <mkdir dir="${build.dir}/test/loops"/>
573 +
574 +    <javac srcdir="${basedir}/src/test/loops"
575 +           destdir="${build.dir}/test/loops"
576 +           debug="${build.debug}"
577 +           debuglevel="${build.debuglevel}"
578 +           deprecation="${build.deprecation}"
579 +           includeAntRuntime="false"
580 +           includeJavaRuntime="false"
581 +           executable="${javac9}"
582 +           fork="true">
583 +
584 +      <include name="*.java"/>
585 +      <compilerarg value="-XDignore.symbol.file=true"/>
586 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
587 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
588 +      <compilerarg line="${build.args}"/>
589 +
590 +    </javac>
591 +
592 +  </target>
593 +
594 +
595    <!-- jsr166 4jdk7 -->
596  
597    <target name="4jdk7compile"
# Line 521 | Line 617
617        <compilerarg value="-Xprefer:source"/>
618        <compilerarg value="-XDignore.symbol.file=true"/>
619        <compilerarg value="-Xlint:all"/>
620 +      <compilerarg value="-Werror"/>
621        <compilerarg line="${build.args}"/>
622  
623      </javac>
# Line 625 | Line 722
722      <run-jtreg-tests
723         target="7"
724         workdir="${build.4jdk7.dir}"
725 <       classes="${4jdk7product.jar}"
629 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
725 >       classes="${4jdk7product.jar}"/>
726    </target>
727  
728  
# Line 644 | Line 740
740  
741      <javadoc destdir="${4jdk7docs.dir}"
742               packagenames="none"
743 <             link="${jdkapi7docs.url}"
743 >             link="${java7.api.url}"
744               overview="${4jdk7src.dir}/intro.html"
745               access="${build.javadoc.access}"
746               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 653 | Line 749
749        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
750          <include name="**/*.java"/>
751        </fileset>
752 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
753        <arg value="-XDignore.symbol.file=true"/>
754      </javadoc>
755    </target>
# Line 707 | Line 804
804        <include name="jsr166x/**/*.java"/>
805        <compilerarg value="-XDignore.symbol.file=true"/>
806        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
807 +      <compilerarg value="-Werror"/>
808        <compilerarg line="${build.args}"/>
809  
810      </javac>
# Line 732 | Line 830
830  
831      <javadoc destdir="${jsr166xdocs.dir}"
832               packagenames="jsr166x.*"
833 <             link="${jdkapidocs.url}"
833 >             link="${java.api.url}"
834               access="${build.javadoc.access}"
835               sourcepath="${topsrc.dir}:${jdk6src.dir}"
836               bootclasspath="${bootclasspath6}"
837               source="5"
838               executable="${javadoc7}">
839 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
840        <arg value="-XDignore.symbol.file=true"/>
841  
842      </javadoc>
# Line 792 | Line 891
891        <include name="jsr166y/**/*.java"/>
892        <compilerarg value="-XDignore.symbol.file=true"/>
893        <compilerarg value="-Xlint:all"/>
894 +      <compilerarg value="-Werror"/>
895        <compilerarg line="${build.args}"/>
896  
897      </javac>
# Line 817 | Line 917
917  
918      <javadoc destdir="${jsr166ydocs.dir}"
919               packagenames="jsr166y.*"
920 <             link="${jdkapidocs.url}"
920 >             link="${java.api.url}"
921               access="${build.javadoc.access}"
922               sourcepath="${topsrc.dir}:${jdk6src.dir}"
923               bootclasspath="${bootclasspath6}"
924               source="6"
925               executable="${javadoc7}">
926 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
927        <arg value="-XDignore.symbol.file=true"/>
928  
929      </javadoc>
# Line 878 | Line 979
979        <include name="extra166y/**/*.java"/>
980        <compilerarg value="-XDignore.symbol.file=true"/>
981        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
982 +      <compilerarg value="-Werror"/>
983        <compilerarg line="${build.args}"/>
984  
985      </javac>
# Line 903 | Line 1005
1005  
1006      <javadoc destdir="${extra166ydocs.dir}"
1007               packagenames="extra166y.*"
1008 <             link="${jdkapidocs.url}"
1008 >             link="${java.api.url}"
1009               access="${build.javadoc.access}"
1010               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1011               bootclasspath="${bootclasspath6}"
1012               source="6"
1013               executable="${javadoc7}">
1014 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1015        <arg value="-XDignore.symbol.file=true"/>
1016  
1017      </javadoc>
# Line 964 | Line 1067
1067        <include name="jsr166e/**/*.java"/>
1068        <compilerarg value="-XDignore.symbol.file=true"/>
1069        <compilerarg value="-Xlint:all"/>
1070 +      <compilerarg value="-Werror"/>
1071        <compilerarg line="${build.args}"/>
1072  
1073      </javac>
# Line 990 | 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 value="-Xdoclint:all/protected"/>
1099  
1100      </javac>
# Line 1015 | Line 1120
1120  
1121      <javadoc destdir="${jsr166edocs.dir}"
1122               packagenames="jsr166e.*"
1123 <             link="${jdkapidocs.url}"
1123 >             link="${java.api.url}"
1124               access="${build.javadoc.access}"
1125               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1126               source="${build.jsr166e.java.version}"
1127               executable="${javadoc7}">
1128 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1129        <arg value="-XDignore.symbol.file=true"/>
1130  
1131      </javadoc>
# Line 1092 | Line 1198
1198  
1199    <target name="lint">
1200      <antcall target="dists">
1201 +      <param name="build.javadoc.access" value="public"/>
1202 +    </antcall>
1203 +  </target>
1204 +
1205 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1206 +  <target name="lint-private">
1207 +    <antcall target="dist">
1208        <param name="build.javadoc.access" value="private"/>
1209      </antcall>
1210    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines