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.140 by jsr166, Mon May 20 19:12:23 2013 UTC vs.
Revision 1.151 by jsr166, Sun Feb 16 14:25:46 2014 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.
25 As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27   ------------------------------------------------------------------------------
28    </description>
29  
30 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30 >  <!-- Display main targets by running 'ant -projecthelp' -->
31 >  <target name="usage">
32      <java classname="org.apache.tools.ant.Main">
33        <arg value="-projecthelp" />
34      </java>
# Line 114 | Line 116 | As of 2013-02, the very latest lambda 8
116    <defjdklocations v="6"/>
117    <defjdklocations v="7"/>
118    <defjdklocations v="8"/>
119 +  <defjdklocations v="9"/>
120  
121    <!-- Source locations -->
122    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 160 | Line 163 | As of 2013-02, the very latest lambda 8
163    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
164  
165    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
166 <  <!-- The below does not yet exist as of 2013-01 -->
166 >  <!-- The expected canonical location does not yet exist as of 2014-02 -->
167    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
168  
169 +  <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/"/> -->
172 +
173    <!-- Default jdk api doc location (latest stable release seems best) -->
174    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175  
# Line 268 | Line 275 | As of 2013-02, the very latest lambda 8
275  
276    <!-- Main targets -->
277  
278 +  <property name="build.main.java.version" value="9"/>
279 +  <property name="build.main.javac" value="${javac9}"/>
280 +
281    <target name="dists"
282            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
283            description="Builds all public jars and docs"/>
# Line 286 | Line 296 | As of 2013-02, the very latest lambda 8
296             classpath=""
297             includeAntRuntime="false"
298             includeJavaRuntime="false"
299 <           executable="${javac8}"
299 >           executable="${build.main.javac}"
300             fork="true">
301  
302        <include name="**/*.java"/>
303        <compilerarg value="-Xprefer:source"/>
304        <compilerarg value="-XDignore.symbol.file=true"/>
305        <compilerarg value="-Xlint:all"/>
306 +      <compilerarg value="-Xdoclint:all/protected"/>
307 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
308        <compilerarg line="${build.args}"/>
309  
310      </javac>
# Line 309 | Line 321 | As of 2013-02, the very latest lambda 8
321    </target>
322  
323  
312  <target name="test"
313          depends="configure-tests, report-tests"
314          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315
316
324    <target name="docs"
325            description="Builds javadocs for src/main to dist dir">
326  
# Line 325 | Line 332 | As of 2013-02, the very latest lambda 8
332  
333      <javadoc destdir="${docs.dir}"
334               packagenames="none"
335 <             link="${jdkapi8docs.url}"
335 >             link="${jdkapi9docs.url}"
336               overview="${src.dir}/intro.html"
337               access="${build.javadoc.access}"
338 <             sourcepath="${src.dir}:${jdk8src.dir}"
338 >             sourcepath="${src.dir}:${jdk9src.dir}"
339               classpath=""
340 <             executable="${javadoc8}">
340 >             executable="${javadoc9}">
341        <fileset dir="${src.dir}" defaultexcludes="yes">
342          <include name="**/*.java"/>
343        </fileset>
344 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
345        <arg value="-XDignore.symbol.file=true"/>
346        <arg value="-tag"/>
347        <arg value="${javadoc.jls.option}"/>
348 +      <arg value="-tag"/>
349 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
350 +      <arg value="-tag"/>
351 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
352 +      <arg value="-tag"/>
353 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
354      </javadoc>
355    </target>
356  
# Line 375 | Line 389 | As of 2013-02, the very latest lambda 8
389    <target name="dist-clean"
390            description="Removes all build and distribution products">
391  
392 +    <delete dir="${build.dir}"/>
393      <delete dir="${dist.dir}"/>
394  
395    </target>
396  
397  
383  <!-- Internal targets -->
384
385
398    <target name="dist-jar"
399            depends="clean, jar">
400      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 394 | Line 406 | As of 2013-02, the very latest lambda 8
406    </target>
407  
408  
397  <target name="compile-tests"
398          depends="jar">
399
400    <mkdir dir="${build.testcases.dir}"/>
401
402    <javac srcdir="${tck.src.dir}"
403           destdir="${build.testcases.dir}"
404           debug="${build.debug}"
405           debuglevel="${build.debuglevel}"
406           deprecation="${build.deprecation}"
407           source="6"
408           classpath="${junit.jar}"
409           bootclasspath="@{product.jar}:${bootclasspath6}"
410           includeAntRuntime="false"
411           includeJavaRuntime="false"
412           executable="${javac8}"
413           fork="true">
414
415      <include name="**/*.java"/>
416      <compilerarg value="-XDignore.symbol.file=true"/>
417      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418      <compilerarg line="${build.args}"/>
419
420    </javac>
421
422    <javac srcdir="${test.src.dir}"
423           destdir="${build.testcases.dir}"
424           debug="${build.debug}"
425           debuglevel="${build.debuglevel}"
426           deprecation="${build.deprecation}"
427           source="6"
428           classpath=""
429           bootclasspath="@{product.jar}:${bootclasspath6}"
430           includeAntRuntime="false"
431           includeJavaRuntime="false"
432           executable="${javac8}"
433           fork="true">
434
435      <include name="jsr166/test/**/*.java"/>
436      <compilerarg value="-XDignore.symbol.file=true"/>
437      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438      <compilerarg line="${build.args}"/>
439
440    </javac>
441
442 <!--
443    <javac srcdir="${jtreg.src.dir}"
444          destdir="${build.testcases.dir}"
445            debug="${build.debug}"
446       debuglevel="${build.debuglevel}"
447      deprecation="${build.deprecation}"
448           source="${build.sourcelevel}"
449             fork="true">
450
451      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452      <compilerarg value="-XDignore.symbol.file=true"/>
453      <compilerarg line="${build.args}"/>
454
455    </javac>
456 -->
457
458  </target>
459
409    <target name="test-tck"
410            depends="jar"
411            description="Runs tck tests for main directly">
412  
413      <run-tck-tests
414 <      target="8"
414 >      target="${build.main.java.version}"
415        workdir="${build.dir}"
416        classes="${product.jar}"/>
417    </target>
# Line 471 | Line 420 | As of 2013-02, the very latest lambda 8
420            depends="jar"
421            description="Runs jtreg tests for main using the jtreg ant task">
422      <run-jtreg-tests
423 <       target="8"
423 >       target="${build.main.java.version}"
424         workdir="${build.dir}"
425         classes="${product.jar}"/>
426    </target>
427  
428 <  <target name="test-ng"
428 >  <target name="test"
429            depends="test-tck, test-jtreg"
430            description="Runs tck and jtreg tests for main">
431    </target>
432  
433 <  <target name="run-tests"
434 <          depends="compile-tests">
486 <
487 <    <!-- May be overridden by user.properties -->
488 <    <property name="testcase" value="*"/>
489 <
490 <    <mkdir dir="${build.reports.dir}"/>
491 <
492 <    <junit printsummary="true"
493 <             showoutput="true"
494 <          errorProperty="junit.failed"
495 <        failureProperty="junit.failed"
496 <                    dir="${build.reports.dir}"
497 <                    jvm="${java8}"
498 <                   fork="true">
499 <
500 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501 <      <jvmarg value="-server"/>
502 <      <jvmarg value="-showversion"/>
503 <
504 <      <classpath refid="test.classpath"/>
505 <
506 <      <formatter type="xml"/>
507 <
508 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
509 <        <fileset dir="${tck.src.dir}">
510 <          <include name="**/${testcase}Test.java"/>
511 <        </fileset>
512 <      </batchtest>
513 <
514 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
515 <        <fileset dir="${test.src.dir}">
516 <          <include name="jsr166/test/**/${testcase}Test.java"/>
517 <        </fileset>
518 <      </batchtest>
519 <
520 < <!--
521 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
522 <        <fileset dir="${jtreg.src.dir}">
523 <          <include name="**/${testcase}Test.java"/>
524 <        </fileset>
525 <      </batchtest>
526 < -->
433 >  <target name="test89"
434 >          description="Runs tck and jtreg tests for main for multiple java versions">
435  
436 <    </junit>
436 >    <antcall target="clean"/>
437 >    <antcall target="test">
438 >      <param name="build.main.java.version" value="8"/>
439 >      <param name="build.main.javac" value="${javac8}"/>
440 >    </antcall>
441 >
442 >    <antcall target="clean"/>
443 >    <antcall target="test">
444 >      <param name="build.main.java.version" value="9"/>
445 >      <param name="build.main.javac" value="${javac9}"/>
446 >    </antcall>
447  
448    </target>
449  
450  
533  <target name="report-tests"
534          depends="run-tests">
535
536    <!-- Sets junit.report.format to frames if redirection is present,
537         otherwise sets it to noframes. -->
538    <available property="junit.report.format"
539                  value="frames"
540              classname="org.apache.xalan.lib.Redirect"
541    />
542    <property name="junit.report.format" value="noframes"/>
543
544    <junitreport todir="${build.reports.dir}">
545      <fileset dir="${build.reports.dir}">
546        <include name="TEST-*.xml"/>
547      </fileset>
548      <report format="${junit.report.format}" todir="${build.reports.dir}"
549      />
550    </junitreport>
551
552    <fail message="Test Cases Failed" if="junit.failed"/>
553
554  </target>
555
451  
452    <target name="configure-compiler">
453  
# Line 571 | Line 466 | As of 2013-02, the very latest lambda 8
466    </target>
467  
468  
574  <target name="configure-tests"
575       depends="configure-compiler">
576
577    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
578    <available property="junit.available"
579               classname="junit.framework.Protectable"/>
580
581    <!-- Xalan -->
582    <available property="xalan.available"
583               classname="org.apache.xalan.Version"/>
584
585
586    <!-- Ant 1.6beta and later don't need or want this check -->
587    <!--
588    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
589          unless="junit.available"/>
590
591    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
592          unless="xalan.available"/>
593    -->
594
595  </target>
596
469  
470    <!-- Various demos and test programs -->
471  
# Line 654 | Line 526 | As of 2013-02, the very latest lambda 8
526      </javac>
527    </target>
528  
529 +  <target name="4jdk7doclint"
530 +          depends="configure-compiler"
531 +          description="Finds doclint warnings">
532 +
533 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
534 +
535 +    <javac srcdir="${4jdk7src.dir}"
536 +           destdir="${build.4jdk7.classes.dir}"
537 +           debug="${build.debug}"
538 +           debuglevel="${build.debuglevel}"
539 +           deprecation="${build.deprecation}"
540 +           source="6"
541 +           classpath=""
542 +           bootclasspath="${bootclasspath7}"
543 +           includeAntRuntime="false"
544 +           includeJavaRuntime="false"
545 +           executable="${javac8}"
546 +           fork="true">
547 +
548 +      <include name="**/*.java"/>
549 +      <compilerarg value="-Xprefer:source"/>
550 +      <compilerarg value="-XDignore.symbol.file=true"/>
551 +      <compilerarg value="-Xlint:all"/>
552 +      <compilerarg value="-Xdoclint:all/protected"/>
553 +      <compilerarg line="${build.args}"/>
554 +
555 +    </javac>
556 +  </target>
557 +
558  
559    <target name="4jdk7jar"
560            depends="4jdk7compile"
# Line 677 | Line 578 | As of 2013-02, the very latest lambda 8
578        <javac-elements>
579          <!-- JDK8+ test classes -->
580          <exclude name="*8Test.java"/>
581 +        <exclude name="*9Test.java"/>
582          <exclude name="DoubleAccumulatorTest.java"/>
583          <exclude name="DoubleAdderTest.java"/>
584          <exclude name="LongAccumulatorTest.java"/>
585          <exclude name="LongAdderTest.java"/>
586          <exclude name="CompletableFutureTest.java"/>
587 +        <exclude name="SplittableRandomTest.java"/>
588          <exclude name="StampedLockTest.java"/>
589        </javac-elements>
590      </run-tck-tests>
# Line 722 | Line 625 | As of 2013-02, the very latest lambda 8
625      <run-jtreg-tests
626         target="7"
627         workdir="${build.4jdk7.dir}"
628 <       classes="${4jdk7product.jar}"/>
628 >       classes="${4jdk7product.jar}"
629 >       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
630    </target>
631  
632  
# Line 767 | Line 671 | As of 2013-02, the very latest lambda 8
671    </target>
672  
673  
770  <target name="4jdk7dist-clean"
771          description="Removes all build and distribution products">
772
773  </target>
774
674    <target name="4jdk7dist-jar"
675            depends="4jdk7clean, 4jdk7jar">
676      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 858 | Line 757 | As of 2013-02, the very latest lambda 8
757    </target>
758  
759  
861  <target name="jsr166xdist-clean"
862          description="Removes all build and distribution products">
863
864  </target>
865
866
760    <target name="jsr166xdist-jar"
761            depends="jsr166xclean, jsr166xjar">
762      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 949 | Line 842 | As of 2013-02, the very latest lambda 8
842    </target>
843  
844  
952  <target name="jsr166ydist-clean"
953          description="Removes all build and distribution products">
954
955  </target>
956
845    <target name="jsr166ydist-jar"
846            depends="jsr166yclean, jsr166yjar">
847      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 1040 | Line 928 | As of 2013-02, the very latest lambda 8
928    </target>
929  
930  
1043  <target name="extra166ydist-clean"
1044          description="Removes all build and distribution products">
1045
1046  </target>
1047
931    <target name="extra166ydist-jar"
932            depends="extra166yclean, extra166yjar">
933      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1057 | Line 940 | As of 2013-02, the very latest lambda 8
940  
941    <!-- jsr166e -->
942  
943 +  <property name="build.jsr166e.java.version" value="6"/>
944 +  <property name="build.jsr166e.javac" value="${javac6}"/>
945 +
946    <target name="jsr166ecompile"
947            depends="configure-compiler"
948            description="Compiles jsr166e sources">
# Line 1068 | Line 954 | As of 2013-02, the very latest lambda 8
954             debug="${build.debug}"
955             debuglevel="${build.debuglevel}"
956             deprecation="${build.deprecation}"
957 <           source="7"
957 >           source="${build.jsr166e.java.version}"
958             classpath=""
959             includeAntRuntime="false"
960             includeJavaRuntime="false"
961 <           executable="${javac7}"
961 >           executable="${build.jsr166e.javac}"
962             fork="true">
963  
964        <include name="jsr166e/**/*.java"/>
# Line 1083 | Line 969 | As of 2013-02, the very latest lambda 8
969      </javac>
970    </target>
971  
972 +  <!-- jsr166e: find doclint errors -->
973 +  <target name="jsr166edoclint">
974 +
975 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
976 +
977 +    <javac srcdir="${topsrc.dir}"
978 +           destdir="${build.jsr166e.classes.dir}"
979 +           debug="${build.debug}"
980 +           debuglevel="${build.debuglevel}"
981 +           deprecation="${build.deprecation}"
982 +           source="${build.jsr166e.java.version}"
983 +           classpath=""
984 +           bootclasspath="${bootclasspath7}"
985 +           includeAntRuntime="false"
986 +           includeJavaRuntime="false"
987 +           executable="${javac8}"
988 +           fork="true">
989 +
990 +      <include name="jsr166e/**/*.java"/>
991 +      <compilerarg value="-XDignore.symbol.file=true"/>
992 +      <compilerarg value="-Xlint:all"/>
993 +      <compilerarg value="-Xdoclint:all/protected"/>
994 +
995 +    </javac>
996 +  </target>
997 +
998  
999    <target name="jsr166ejar"
1000            depends="jsr166ecompile"
# Line 1105 | Line 1017 | As of 2013-02, the very latest lambda 8
1017               packagenames="jsr166e.*"
1018               link="${jdkapidocs.url}"
1019               access="${build.javadoc.access}"
1020 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1021 <             source="7"
1020 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021 >             source="${build.jsr166e.java.version}"
1022               executable="${javadoc7}">
1023        <arg value="-XDignore.symbol.file=true"/>
1024  
# Line 1114 | Line 1026 | As of 2013-02, the very latest lambda 8
1026    </target>
1027  
1028  
1029 <  <target name="jsr166e-test-tck"
1030 <          depends="jsr166ejar"
1031 <          description="Runs tck tests for jsr166e">
1029 >  <target name="jsr166e-test-tck-one-java-version"
1030 >          depends="jsr166ejar">
1031 >
1032 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1033  
1034      <run-tck-tests
1035        tck.src.dir="${test.src.dir}/tck-jsr166e"
1036 <      target="7"
1036 >      target="${build.jsr166e.java.version}"
1037        workdir="${build.jsr166e.dir}"
1038        classes="${jsr166e.jar}"/>
1039    </target>
1040  
1041 +  <target name="jsr166e-test-tck"
1042 +          description="Runs tck tests for jsr166e for multiple java versions">
1043 +
1044 + <!--     <antcall target="clean"/> -->
1045 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1046 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1047 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1048 + <!--     </antcall> -->
1049 +
1050 +    <antcall target="clean"/>
1051 +    <antcall target="jsr166e-test-tck-one-java-version">
1052 +      <param name="build.jsr166e.java.version" value="7"/>
1053 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1054 +    </antcall>
1055 +
1056 +    <antcall target="clean"/>
1057 +    <antcall target="jsr166e-test-tck-one-java-version">
1058 +      <param name="build.jsr166e.java.version" value="6"/>
1059 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1060 +    </antcall>
1061 +  </target>
1062 +
1063 +
1064 +  <target name="jsr166e-test"
1065 +          depends="jsr166e-test-tck"
1066 +          description="Runs all tests for jsr166e">
1067 +  </target>
1068  
1069    <target name="jsr166edist"
1070            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1137 | Line 1077 | As of 2013-02, the very latest lambda 8
1077    </target>
1078  
1079  
1140  <target name="jsr166edist-clean"
1141          description="Removes all build and distribution products">
1142
1143  </target>
1144
1080    <target name="jsr166edist-jar"
1081            depends="jsr166eclean, jsr166ejar">
1082      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines