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.173 by jsr166, Thu Sep 3 01:24:31 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 123 | Line 129
129    <property name="test.src.dir"         location="${basedir}/src/test"/>
130    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
131    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
132 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
132 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
133 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
134 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
135 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
136    <property name="lib.dir"              location="${basedir}/lib"/>
137    <property name="dist.dir"             location="${basedir}/dist"/>
138    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 157 | Line 166
166    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
167    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
168  
169 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
170 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
171 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
172 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
173 <
174 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
175 <  <!-- The expected canonical location does not yet exist as of 2014-02 -->
176 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
177 <
178 <  <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/"/> -->
169 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
170 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
171 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
172 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
173 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
174 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
175 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
176 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
177 >  <!-- Default jdk doc location (latest stable release seems best) -->
178 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
179  
180 <  <!-- Default jdk api doc location (latest stable release seems best) -->
181 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
180 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
181 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
182 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
183 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
184 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
185 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
186 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
187  
188    <!-- Define the "jtreg" task -->
189    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 190 | Line 202
202      <attribute name="compile-target" default="@{target}"/>
203      <attribute name="workdir"/>
204      <attribute name="classes"/>
205 <    <attribute name="jvmflags" default=""/>
205 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
206      <element name="javac-elements" optional="true"/>
207      <sequential>
208  
# Line 204 | Line 216
216             source="@{compile-target}"
217             target="@{compile-target}"
218             classpath="${junit.jar}"
207           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
219             includeAntRuntime="false"
220             includeJavaRuntime="false"
221             executable="${javac@{compile-target}}"
# Line 213 | Line 224
224        <include name="*.java"/>
225        <compilerarg value="-XDignore.symbol.file=true"/>
226        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
227 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
228        <compilerarg line="${build.args}"/>
229        <javac-elements/>
230  
# Line 224 | Line 236
236            fork="true">
237          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
238          <jvmarg line="@{jvmflags}"/>
239 +
240 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
241 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
242 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
243 +        </syspropertyset>
244 +
245          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
246          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
247          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 236 | Line 254
254      </sequential>
255    </macrodef>
256  
257 +  <!-- Define jtreg test sets for different jdk versions -->
258 +  <fileset dir="${jtreg9.src.dir}">
259 +    <patternset id="jdk9.jtreg.tests">
260 +      <include name="**/*.java"/>
261 +    </patternset>
262 +  </fileset>
263 +
264 +  <fileset dir="${jtreg8.src.dir}">
265 +    <patternset id="jdk8.jtreg.tests">
266 +      <include name="**/*.java"/>
267 +      <exclude name="**/SpliteratorCharacteristics.java"/>
268 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269 +      <exclude name="**/GCDuringIteration.java"/>
270 +    </patternset>
271 +  </fileset>
272 +
273 +  <fileset dir="${jtreg7.src.dir}">
274 +    <patternset id="jdk7.jtreg.tests">
275 +      <include name="**/*.java"/>
276 +    </patternset>
277 +  </fileset>
278 +
279    <macrodef name="run-jtreg-tests">
280 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
280 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
281      <attribute name="source" default="7"/>
282      <attribute name="target"/>
283      <attribute name="workdir"/>
# Line 248 | Line 288
288      <delete dir="@{workdir}/JTreport" quiet="true"/>
289      <mkdir dir="@{workdir}/JTwork/scratch"/>
290      <mkdir dir="@{workdir}/JTreport"/>
291 <    <jtreg dir="@{jtreg.src.dir}"
291 >    <jtreg dir="${jtreg@{target}.src.dir}"
292             jdk="${jdk@{target}.home}"
293             workDir="@{workdir}/JTwork"
294             reportDir="@{workdir}/JTreport">
295 <
295 >      <patternset refid="jdk@{target}.jtreg.tests"/>
296        <arg value="-Xbootclasspath/p:@{classes}"/>
297        <arg value="-agentvm"/>
298        <arg value="-v:nopass,fail"/>
# Line 303 | Line 343
343        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>
345        <compilerarg value="-Xlint:all"/>
346 +      <compilerarg value="-Werror"/>
347        <compilerarg value="-Xdoclint:all/protected"/>
348        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
349        <compilerarg line="${build.args}"/>
# Line 332 | Line 373
373  
374      <javadoc destdir="${docs.dir}"
375               packagenames="none"
376 <             link="${jdkapi9docs.url}"
376 >             link="${java9.api.url}"
377               overview="${src.dir}/intro.html"
378               access="${build.javadoc.access}"
379               sourcepath="${src.dir}:${jdk9src.dir}"
# Line 341 | Line 382
382        <fileset dir="${src.dir}" defaultexcludes="yes">
383          <include name="**/*.java"/>
384        </fileset>
385 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
386        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
387        <arg value="-XDignore.symbol.file=true"/>
388        <arg value="-tag"/>
# Line 405 | Line 447
447      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
448    </target>
449  
450 <
450 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
451    <target name="test-tck"
452            depends="jar"
453            description="Runs tck tests for main directly">
# Line 416 | Line 458
458        classes="${product.jar}"/>
459    </target>
460  
461 +  <target name="test-tck-parallelism-1"
462 +          description="Runs test-tck with given common pool parallelism">
463 +    <antcall target="test-tck">
464 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
465 +    </antcall>
466 +  </target>
467 +
468 +  <target name="test-tck-parallelism-0"
469 +          description="Runs test-tck with given common pool parallelism">
470 +    <antcall target="test-tck">
471 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
472 +    </antcall>
473 +  </target>
474 +
475 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
476    <target name="test-jtreg"
477            depends="jar"
478            description="Runs jtreg tests for main using the jtreg ant task">
# Line 426 | Line 483
483    </target>
484  
485    <target name="test"
486 <          depends="test-tck, test-jtreg"
486 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
487            description="Runs tck and jtreg tests for main">
488    </target>
489  
490 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
491 +
492 +    <antcall target="jtreg">
493 +      <param name="build.main.java.version" value="8"/>
494 +      <param name="build.main.javac" value="${javac8}"/>
495 +    </antcall>
496 +
497 +  </target>
498 +
499    <target name="test89"
500            description="Runs tck and jtreg tests for main for multiple java versions">
501  
# Line 496 | Line 562
562    </target>
563  
564  
565 +  <target name="compile-test-loops" depends="jar"
566 +          description="compile all the perf tests in src/test/loops">
567 +
568 +    <mkdir dir="${build.dir}/test/loops"/>
569 +
570 +    <javac srcdir="${basedir}/src/test/loops"
571 +           destdir="${build.dir}/test/loops"
572 +           debug="${build.debug}"
573 +           debuglevel="${build.debuglevel}"
574 +           deprecation="${build.deprecation}"
575 +           includeAntRuntime="false"
576 +           includeJavaRuntime="false"
577 +           executable="${javac9}"
578 +           fork="true">
579 +
580 +      <include name="*.java"/>
581 +      <compilerarg value="-XDignore.symbol.file=true"/>
582 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
583 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
584 +      <compilerarg line="${build.args}"/>
585 +
586 +    </javac>
587 +
588 +  </target>
589 +
590 +
591    <!-- jsr166 4jdk7 -->
592  
593    <target name="4jdk7compile"
# Line 521 | Line 613
613        <compilerarg value="-Xprefer:source"/>
614        <compilerarg value="-XDignore.symbol.file=true"/>
615        <compilerarg value="-Xlint:all"/>
616 +      <compilerarg value="-Werror"/>
617        <compilerarg line="${build.args}"/>
618  
619      </javac>
# Line 625 | Line 718
718      <run-jtreg-tests
719         target="7"
720         workdir="${build.4jdk7.dir}"
721 <       classes="${4jdk7product.jar}"
629 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
721 >       classes="${4jdk7product.jar}"/>
722    </target>
723  
724  
# Line 644 | Line 736
736  
737      <javadoc destdir="${4jdk7docs.dir}"
738               packagenames="none"
739 <             link="${jdkapi7docs.url}"
739 >             link="${java7.api.url}"
740               overview="${4jdk7src.dir}/intro.html"
741               access="${build.javadoc.access}"
742               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 653 | Line 745
745        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
746          <include name="**/*.java"/>
747        </fileset>
748 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
749        <arg value="-XDignore.symbol.file=true"/>
750      </javadoc>
751    </target>
# Line 707 | Line 800
800        <include name="jsr166x/**/*.java"/>
801        <compilerarg value="-XDignore.symbol.file=true"/>
802        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
803 +      <compilerarg value="-Werror"/>
804        <compilerarg line="${build.args}"/>
805  
806      </javac>
# Line 732 | Line 826
826  
827      <javadoc destdir="${jsr166xdocs.dir}"
828               packagenames="jsr166x.*"
829 <             link="${jdkapidocs.url}"
829 >             link="${java.api.url}"
830               access="${build.javadoc.access}"
831               sourcepath="${topsrc.dir}:${jdk6src.dir}"
832               bootclasspath="${bootclasspath6}"
833               source="5"
834               executable="${javadoc7}">
835 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
836        <arg value="-XDignore.symbol.file=true"/>
837  
838      </javadoc>
# Line 792 | Line 887
887        <include name="jsr166y/**/*.java"/>
888        <compilerarg value="-XDignore.symbol.file=true"/>
889        <compilerarg value="-Xlint:all"/>
890 +      <compilerarg value="-Werror"/>
891        <compilerarg line="${build.args}"/>
892  
893      </javac>
# Line 817 | Line 913
913  
914      <javadoc destdir="${jsr166ydocs.dir}"
915               packagenames="jsr166y.*"
916 <             link="${jdkapidocs.url}"
916 >             link="${java.api.url}"
917               access="${build.javadoc.access}"
918               sourcepath="${topsrc.dir}:${jdk6src.dir}"
919               bootclasspath="${bootclasspath6}"
920               source="6"
921               executable="${javadoc7}">
922 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
923        <arg value="-XDignore.symbol.file=true"/>
924  
925      </javadoc>
# Line 878 | Line 975
975        <include name="extra166y/**/*.java"/>
976        <compilerarg value="-XDignore.symbol.file=true"/>
977        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
978 +      <compilerarg value="-Werror"/>
979        <compilerarg line="${build.args}"/>
980  
981      </javac>
# Line 903 | Line 1001
1001  
1002      <javadoc destdir="${extra166ydocs.dir}"
1003               packagenames="extra166y.*"
1004 <             link="${jdkapidocs.url}"
1004 >             link="${java.api.url}"
1005               access="${build.javadoc.access}"
1006               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1007               bootclasspath="${bootclasspath6}"
1008               source="6"
1009               executable="${javadoc7}">
1010 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1011        <arg value="-XDignore.symbol.file=true"/>
1012  
1013      </javadoc>
# Line 964 | Line 1063
1063        <include name="jsr166e/**/*.java"/>
1064        <compilerarg value="-XDignore.symbol.file=true"/>
1065        <compilerarg value="-Xlint:all"/>
1066 +      <compilerarg value="-Werror"/>
1067        <compilerarg line="${build.args}"/>
1068  
1069      </javac>
# Line 990 | Line 1090
1090        <include name="jsr166e/**/*.java"/>
1091        <compilerarg value="-XDignore.symbol.file=true"/>
1092        <compilerarg value="-Xlint:all"/>
1093 +      <compilerarg value="-Werror"/>
1094        <compilerarg value="-Xdoclint:all/protected"/>
1095  
1096      </javac>
# Line 1015 | Line 1116
1116  
1117      <javadoc destdir="${jsr166edocs.dir}"
1118               packagenames="jsr166e.*"
1119 <             link="${jdkapidocs.url}"
1119 >             link="${java.api.url}"
1120               access="${build.javadoc.access}"
1121               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1122               source="${build.jsr166e.java.version}"
1123               executable="${javadoc7}">
1124 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1125        <arg value="-XDignore.symbol.file=true"/>
1126  
1127      </javadoc>
# Line 1092 | Line 1194
1194  
1195    <target name="lint">
1196      <antcall target="dists">
1197 +      <param name="build.javadoc.access" value="public"/>
1198 +    </antcall>
1199 +  </target>
1200 +
1201 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1202 +  <target name="lint-private">
1203 +    <antcall target="dist">
1204        <param name="build.javadoc.access" value="private"/>
1205      </antcall>
1206    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines