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.143 by dl, Wed Jul 10 17:09:45 2013 UTC vs.
Revision 1.170 by jsr166, Wed Sep 2 03:53:43 2015 UTC

# Line 16 | Line 16
16    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8
19 +  $HOME/jdk/jdk9
20    where each of the above is a JDK or a symlink to same, and
21    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8
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 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27 >
28 >  Alternatively, define ant variables thus:
29 >  ant -Djdk$N.home=...
30 >  for $N in 6 7 8 9 ...
31   ------------------------------------------------------------------------------
32    </description>
33  
34 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
34 >  <!-- Display main targets by running 'ant -projecthelp' -->
35 >  <target name="usage">
36      <java classname="org.apache.tools.ant.Main">
37        <arg value="-projecthelp" />
38      </java>
# Line 44 | Line 50 | As of 2013-02, the very latest lambda 8
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"/>
52  <!-- Allow running an individual tck test class -->
53  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63  
64    <!-- Build locations -->
# Line 114 | Line 122 | As of 2013-02, the very latest lambda 8
122    <defjdklocations v="6"/>
123    <defjdklocations v="7"/>
124    <defjdklocations v="8"/>
125 +  <defjdklocations v="9"/>
126  
127    <!-- Source locations -->
128    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 154 | Line 163 | As of 2013-02, the very latest lambda 8
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 below does not yet exist as of 2013-01 -->
173 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/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 183 | Line 199 | As of 2013-02, the very latest lambda 8
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 197 | Line 213 | As of 2013-02, the very latest lambda 8
213             source="@{compile-target}"
214             target="@{compile-target}"
215             classpath="${junit.jar}"
200           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"
# Line 206 | Line 221 | As of 2013-02, the very latest lambda 8
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 217 | Line 233 | As of 2013-02, the very latest lambda 8
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 229 | Line 251 | As of 2013-02, the very latest lambda 8
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="util/concurrent/forkjoin/SubmissionTest.java"/>
278 +      <exclude name="**/StampedLock/**/*.java"/>
279 +      <exclude name="**/AtomicReferenceTest.java"/>
280 +      <exclude name="util/concurrent/atomic/Serial.java"/>
281 +    </patternset>
282 +  </fileset>
283 +
284    <macrodef name="run-jtreg-tests">
285 +    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
286      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
287      <attribute name="source" default="7"/>
288      <attribute name="target"/>
# Line 245 | Line 298 | As of 2013-02, the very latest lambda 8
298             jdk="${jdk@{target}.home}"
299             workDir="@{workdir}/JTwork"
300             reportDir="@{workdir}/JTreport">
301 <
301 >      <patternset refid="jdk@{target}.jtreg.tests"/>
302        <arg value="-Xbootclasspath/p:@{classes}"/>
303        <arg value="-agentvm"/>
304        <arg value="-v:nopass,fail"/>
# Line 268 | Line 321 | As of 2013-02, the very latest lambda 8
321  
322    <!-- Main targets -->
323  
324 +  <property name="build.main.java.version" value="9"/>
325 +  <property name="build.main.javac" value="${javac9}"/>
326 +
327    <target name="dists"
328            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
329            description="Builds all public jars and docs"/>
# Line 286 | Line 342 | As of 2013-02, the very latest lambda 8
342             classpath=""
343             includeAntRuntime="false"
344             includeJavaRuntime="false"
345 <           executable="${javac8}"
345 >           executable="${build.main.javac}"
346             fork="true">
347  
348        <include name="**/*.java"/>
349        <compilerarg value="-Xprefer:source"/>
350        <compilerarg value="-XDignore.symbol.file=true"/>
351        <compilerarg value="-Xlint:all"/>
352 +      <compilerarg value="-Werror"/>
353 +      <compilerarg value="-Xdoclint:all/protected"/>
354 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
355        <compilerarg line="${build.args}"/>
356  
357      </javac>
# Line 320 | Line 379 | As of 2013-02, the very latest lambda 8
379  
380      <javadoc destdir="${docs.dir}"
381               packagenames="none"
382 <             link="${jdkapi8docs.url}"
382 >             link="${java9.api.url}"
383               overview="${src.dir}/intro.html"
384               access="${build.javadoc.access}"
385 <             sourcepath="${src.dir}:${jdk8src.dir}"
385 >             sourcepath="${src.dir}:${jdk9src.dir}"
386               classpath=""
387 <             executable="${javadoc8}">
387 >             executable="${javadoc9}">
388        <fileset dir="${src.dir}" defaultexcludes="yes">
389          <include name="**/*.java"/>
390        </fileset>
391 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
392 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
393        <arg value="-XDignore.symbol.file=true"/>
394        <arg value="-tag"/>
395        <arg value="${javadoc.jls.option}"/>
# Line 337 | Line 398 | As of 2013-02, the very latest lambda 8
398        <arg value="-tag"/>
399        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
400        <arg value="-tag"/>
401 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
401 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
402      </javadoc>
403    </target>
404  
# Line 376 | Line 437 | As of 2013-02, the very latest lambda 8
437    <target name="dist-clean"
438            description="Removes all build and distribution products">
439  
440 +    <delete dir="${build.dir}"/>
441      <delete dir="${dist.dir}"/>
442  
443    </target>
# Line 391 | Line 453 | As of 2013-02, the very latest lambda 8
453      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
454    </target>
455  
456 <
456 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
457    <target name="test-tck"
458            depends="jar"
459            description="Runs tck tests for main directly">
460  
461      <run-tck-tests
462 <      target="8"
462 >      target="${build.main.java.version}"
463        workdir="${build.dir}"
464        classes="${product.jar}"/>
465    </target>
466  
467 +  <target name="test-tck-parallelism-1"
468 +          description="Runs test-tck with given common pool parallelism">
469 +    <antcall target="test-tck">
470 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
471 +    </antcall>
472 +  </target>
473 +
474 +  <target name="test-tck-parallelism-0"
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="0"/>
478 +    </antcall>
479 +  </target>
480 +
481 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
482    <target name="test-jtreg"
483            depends="jar"
484            description="Runs jtreg tests for main using the jtreg ant task">
485      <run-jtreg-tests
486 <       target="8"
486 >       target="${build.main.java.version}"
487         workdir="${build.dir}"
488         classes="${product.jar}"/>
489    </target>
490  
491    <target name="test"
492 <          depends="test-tck, test-jtreg"
492 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
493            description="Runs tck and jtreg tests for main">
494    </target>
495  
496 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
497 +
498 +    <antcall target="jtreg">
499 +      <param name="build.main.java.version" value="8"/>
500 +      <param name="build.main.javac" value="${javac8}"/>
501 +    </antcall>
502 +
503 +  </target>
504 +
505 +  <target name="test89"
506 +          description="Runs tck and jtreg tests for main for multiple java versions">
507 +
508 +    <antcall target="clean"/>
509 +    <antcall target="test">
510 +      <param name="build.main.java.version" value="8"/>
511 +      <param name="build.main.javac" value="${javac8}"/>
512 +    </antcall>
513 +
514 +    <antcall target="clean"/>
515 +    <antcall target="test">
516 +      <param name="build.main.java.version" value="9"/>
517 +      <param name="build.main.javac" value="${javac9}"/>
518 +    </antcall>
519 +
520 +  </target>
521 +
522  
523  
524    <target name="configure-compiler">
# Line 465 | Line 568 | As of 2013-02, the very latest lambda 8
568    </target>
569  
570  
571 +  <target name="compile-test-loops" depends="jar"
572 +          description="compile all the perf tests in src/test/loops">
573 +
574 +    <mkdir dir="${build.dir}/test/loops"/>
575 +
576 +    <javac srcdir="${basedir}/src/test/loops"
577 +           destdir="${build.dir}/test/loops"
578 +           debug="${build.debug}"
579 +           debuglevel="${build.debuglevel}"
580 +           deprecation="${build.deprecation}"
581 +           includeAntRuntime="false"
582 +           includeJavaRuntime="false"
583 +           executable="${javac9}"
584 +           fork="true">
585 +
586 +      <include name="*.java"/>
587 +      <compilerarg value="-XDignore.symbol.file=true"/>
588 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
589 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
590 +      <compilerarg line="${build.args}"/>
591 +
592 +    </javac>
593 +
594 +  </target>
595 +
596 +
597    <!-- jsr166 4jdk7 -->
598  
599    <target name="4jdk7compile"
# Line 490 | Line 619 | As of 2013-02, the very latest lambda 8
619        <compilerarg value="-Xprefer:source"/>
620        <compilerarg value="-XDignore.symbol.file=true"/>
621        <compilerarg value="-Xlint:all"/>
622 +      <compilerarg value="-Werror"/>
623 +      <compilerarg line="${build.args}"/>
624 +
625 +    </javac>
626 +  </target>
627 +
628 +  <target name="4jdk7doclint"
629 +          depends="configure-compiler"
630 +          description="Finds doclint warnings">
631 +
632 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
633 +
634 +    <javac srcdir="${4jdk7src.dir}"
635 +           destdir="${build.4jdk7.classes.dir}"
636 +           debug="${build.debug}"
637 +           debuglevel="${build.debuglevel}"
638 +           deprecation="${build.deprecation}"
639 +           source="6"
640 +           classpath=""
641 +           bootclasspath="${bootclasspath7}"
642 +           includeAntRuntime="false"
643 +           includeJavaRuntime="false"
644 +           executable="${javac8}"
645 +           fork="true">
646 +
647 +      <include name="**/*.java"/>
648 +      <compilerarg value="-Xprefer:source"/>
649 +      <compilerarg value="-XDignore.symbol.file=true"/>
650 +      <compilerarg value="-Xlint:all"/>
651 +      <compilerarg value="-Xdoclint:all/protected"/>
652        <compilerarg line="${build.args}"/>
653  
654      </javac>
# Line 518 | Line 677 | As of 2013-02, the very latest lambda 8
677        <javac-elements>
678          <!-- JDK8+ test classes -->
679          <exclude name="*8Test.java"/>
680 +        <exclude name="*9Test.java"/>
681          <exclude name="DoubleAccumulatorTest.java"/>
682          <exclude name="DoubleAdderTest.java"/>
683          <exclude name="LongAccumulatorTest.java"/>
684          <exclude name="LongAdderTest.java"/>
685          <exclude name="CompletableFutureTest.java"/>
686 +        <exclude name="SplittableRandomTest.java"/>
687          <exclude name="StampedLockTest.java"/>
688        </javac-elements>
689      </run-tck-tests>
# Line 563 | Line 724 | As of 2013-02, the very latest lambda 8
724      <run-jtreg-tests
725         target="7"
726         workdir="${build.4jdk7.dir}"
727 <       classes="${4jdk7product.jar}"
567 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
727 >       classes="${4jdk7product.jar}"/>
728    </target>
729  
730  
# Line 582 | Line 742 | As of 2013-02, the very latest lambda 8
742  
743      <javadoc destdir="${4jdk7docs.dir}"
744               packagenames="none"
745 <             link="${jdkapi7docs.url}"
745 >             link="${java7.api.url}"
746               overview="${4jdk7src.dir}/intro.html"
747               access="${build.javadoc.access}"
748               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 591 | Line 751 | As of 2013-02, the very latest lambda 8
751        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
752          <include name="**/*.java"/>
753        </fileset>
754 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
755        <arg value="-XDignore.symbol.file=true"/>
756      </javadoc>
757    </target>
# Line 609 | Line 770 | As of 2013-02, the very latest lambda 8
770    </target>
771  
772  
612  <target name="4jdk7dist-clean"
613          description="Removes all build and distribution products">
614
615  </target>
616
773    <target name="4jdk7dist-jar"
774            depends="4jdk7clean, 4jdk7jar">
775      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 650 | Line 806 | As of 2013-02, the very latest lambda 8
806        <include name="jsr166x/**/*.java"/>
807        <compilerarg value="-XDignore.symbol.file=true"/>
808        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
809 +      <compilerarg value="-Werror"/>
810        <compilerarg line="${build.args}"/>
811  
812      </javac>
# Line 675 | Line 832 | As of 2013-02, the very latest lambda 8
832  
833      <javadoc destdir="${jsr166xdocs.dir}"
834               packagenames="jsr166x.*"
835 <             link="${jdkapidocs.url}"
835 >             link="${java.api.url}"
836               access="${build.javadoc.access}"
837               sourcepath="${topsrc.dir}:${jdk6src.dir}"
838               bootclasspath="${bootclasspath6}"
839               source="5"
840               executable="${javadoc7}">
841 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
842        <arg value="-XDignore.symbol.file=true"/>
843  
844      </javadoc>
# Line 700 | Line 858 | As of 2013-02, the very latest lambda 8
858    </target>
859  
860  
703  <target name="jsr166xdist-clean"
704          description="Removes all build and distribution products">
705
706  </target>
707
708
861    <target name="jsr166xdist-jar"
862            depends="jsr166xclean, jsr166xjar">
863      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 741 | Line 893 | As of 2013-02, the very latest lambda 8
893        <include name="jsr166y/**/*.java"/>
894        <compilerarg value="-XDignore.symbol.file=true"/>
895        <compilerarg value="-Xlint:all"/>
896 +      <compilerarg value="-Werror"/>
897        <compilerarg line="${build.args}"/>
898  
899      </javac>
# Line 766 | Line 919 | As of 2013-02, the very latest lambda 8
919  
920      <javadoc destdir="${jsr166ydocs.dir}"
921               packagenames="jsr166y.*"
922 <             link="${jdkapidocs.url}"
922 >             link="${java.api.url}"
923               access="${build.javadoc.access}"
924               sourcepath="${topsrc.dir}:${jdk6src.dir}"
925               bootclasspath="${bootclasspath6}"
926               source="6"
927               executable="${javadoc7}">
928 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
929        <arg value="-XDignore.symbol.file=true"/>
930  
931      </javadoc>
# Line 791 | Line 945 | As of 2013-02, the very latest lambda 8
945    </target>
946  
947  
794  <target name="jsr166ydist-clean"
795          description="Removes all build and distribution products">
796
797  </target>
798
948    <target name="jsr166ydist-jar"
949            depends="jsr166yclean, jsr166yjar">
950      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 832 | Line 981 | As of 2013-02, the very latest lambda 8
981        <include name="extra166y/**/*.java"/>
982        <compilerarg value="-XDignore.symbol.file=true"/>
983        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
984 +      <compilerarg value="-Werror"/>
985        <compilerarg line="${build.args}"/>
986  
987      </javac>
# Line 857 | Line 1007 | As of 2013-02, the very latest lambda 8
1007  
1008      <javadoc destdir="${extra166ydocs.dir}"
1009               packagenames="extra166y.*"
1010 <             link="${jdkapidocs.url}"
1010 >             link="${java.api.url}"
1011               access="${build.javadoc.access}"
1012               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1013               bootclasspath="${bootclasspath6}"
1014               source="6"
1015               executable="${javadoc7}">
1016 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1017        <arg value="-XDignore.symbol.file=true"/>
1018  
1019      </javadoc>
# Line 882 | Line 1033 | As of 2013-02, the very latest lambda 8
1033    </target>
1034  
1035  
885  <target name="extra166ydist-clean"
886          description="Removes all build and distribution products">
887
888  </target>
889
1036    <target name="extra166ydist-jar"
1037            depends="extra166yclean, extra166yjar">
1038      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 899 | Line 1045 | As of 2013-02, the very latest lambda 8
1045  
1046    <!-- jsr166e -->
1047  
1048 +  <property name="build.jsr166e.java.version" value="6"/>
1049 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1050 +
1051    <target name="jsr166ecompile"
1052            depends="configure-compiler"
1053            description="Compiles jsr166e sources">
# Line 910 | Line 1059 | As of 2013-02, the very latest lambda 8
1059             debug="${build.debug}"
1060             debuglevel="${build.debuglevel}"
1061             deprecation="${build.deprecation}"
1062 <           source="7"
1062 >           source="${build.jsr166e.java.version}"
1063             classpath=""
1064             includeAntRuntime="false"
1065             includeJavaRuntime="false"
1066 <           executable="${javac7}"
1066 >           executable="${build.jsr166e.javac}"
1067             fork="true">
1068  
1069        <include name="jsr166e/**/*.java"/>
1070        <compilerarg value="-XDignore.symbol.file=true"/>
1071        <compilerarg value="-Xlint:all"/>
1072 +      <compilerarg value="-Werror"/>
1073        <compilerarg line="${build.args}"/>
1074  
1075      </javac>
1076    </target>
1077  
1078 +  <!-- jsr166e: find doclint errors -->
1079 +  <target name="jsr166edoclint">
1080 +
1081 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1082 +
1083 +    <javac srcdir="${topsrc.dir}"
1084 +           destdir="${build.jsr166e.classes.dir}"
1085 +           debug="${build.debug}"
1086 +           debuglevel="${build.debuglevel}"
1087 +           deprecation="${build.deprecation}"
1088 +           source="${build.jsr166e.java.version}"
1089 +           classpath=""
1090 +           bootclasspath="${bootclasspath7}"
1091 +           includeAntRuntime="false"
1092 +           includeJavaRuntime="false"
1093 +           executable="${javac8}"
1094 +           fork="true">
1095 +
1096 +      <include name="jsr166e/**/*.java"/>
1097 +      <compilerarg value="-XDignore.symbol.file=true"/>
1098 +      <compilerarg value="-Xlint:all"/>
1099 +      <compilerarg value="-Werror"/>
1100 +      <compilerarg value="-Xdoclint:all/protected"/>
1101 +
1102 +    </javac>
1103 +  </target>
1104 +
1105  
1106    <target name="jsr166ejar"
1107            depends="jsr166ecompile"
# Line 945 | Line 1122 | As of 2013-02, the very latest lambda 8
1122  
1123      <javadoc destdir="${jsr166edocs.dir}"
1124               packagenames="jsr166e.*"
1125 <             link="${jdkapidocs.url}"
1125 >             link="${java.api.url}"
1126               access="${build.javadoc.access}"
1127 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1128 <             source="7"
1127 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1128 >             source="${build.jsr166e.java.version}"
1129               executable="${javadoc7}">
1130 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1131        <arg value="-XDignore.symbol.file=true"/>
1132  
1133      </javadoc>
1134    </target>
1135  
1136  
1137 <  <target name="jsr166e-test-tck"
1138 <          depends="jsr166ejar"
1139 <          description="Runs tck tests for jsr166e">
1137 >  <target name="jsr166e-test-tck-one-java-version"
1138 >          depends="jsr166ejar">
1139 >
1140 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1141  
1142      <run-tck-tests
1143        tck.src.dir="${test.src.dir}/tck-jsr166e"
1144 <      target="7"
1144 >      target="${build.jsr166e.java.version}"
1145        workdir="${build.jsr166e.dir}"
1146        classes="${jsr166e.jar}"/>
1147    </target>
1148  
1149 +  <target name="jsr166e-test-tck"
1150 +          description="Runs tck tests for jsr166e for multiple java versions">
1151 +
1152 + <!--     <antcall target="clean"/> -->
1153 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1154 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1155 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1156 + <!--     </antcall> -->
1157 +
1158 +    <antcall target="clean"/>
1159 +    <antcall target="jsr166e-test-tck-one-java-version">
1160 +      <param name="build.jsr166e.java.version" value="7"/>
1161 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1162 +    </antcall>
1163 +
1164 +    <antcall target="clean"/>
1165 +    <antcall target="jsr166e-test-tck-one-java-version">
1166 +      <param name="build.jsr166e.java.version" value="6"/>
1167 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1168 +    </antcall>
1169 +  </target>
1170 +
1171 +
1172 +  <target name="jsr166e-test"
1173 +          depends="jsr166e-test-tck"
1174 +          description="Runs all tests for jsr166e">
1175 +  </target>
1176  
1177    <target name="jsr166edist"
1178            depends="jsr166edist-jar, jsr166edist-docs"
# Line 979 | Line 1185 | As of 2013-02, the very latest lambda 8
1185    </target>
1186  
1187  
982  <target name="jsr166edist-clean"
983          description="Removes all build and distribution products">
984
985  </target>
986
1188    <target name="jsr166edist-jar"
1189            depends="jsr166eclean, jsr166ejar">
1190      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 999 | Line 1200 | As of 2013-02, the very latest lambda 8
1200  
1201    <target name="lint">
1202      <antcall target="dists">
1203 +      <param name="build.javadoc.access" value="public"/>
1204 +    </antcall>
1205 +  </target>
1206 +
1207 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1208 +  <target name="lint-private">
1209 +    <antcall target="dist">
1210        <param name="build.javadoc.access" value="private"/>
1211      </antcall>
1212    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines