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.139 by jsr166, Thu May 2 21:38:03 2013 UTC vs.
Revision 1.149 by jsr166, Sat Jul 20 20:40:24 2013 UTC

# Line 26 | Line 26 | As of 2013-02, the very latest lambda 8
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29 >  <!-- Display main targets by running 'ant -projecthelp' -->
30 >  <target name="usage">
31      <java classname="org.apache.tools.ant.Main">
32        <arg value="-projecthelp" />
33      </java>
# Line 45 | Line 46 | As of 2013-02, the very latest lambda 8
46    <property name="build.javadoc.access" value="protected"/>
47  
48    <!-- Tck options; see JSR166TestCase.java -->
49 <  <!-- Use via, e.g. ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49 >  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
50    <property name="jsr166.profileTests"     value="false"/>
51    <property name="jsr166.profileThreshold" value="100"/>
52    <property name="jsr166.runsPerTest"      value="1"/>
53 +  <!-- Allow running an individual tck test class -->
54 +  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
55 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
56  
57    <!-- Build locations -->
58    <property name="build.dir"                   location="build"/>
# Line 208 | Line 212 | As of 2013-02, the very latest lambda 8
212  
213      </javac>
214  
215 <    <java classname="JSR166TestCase"
215 >    <java classname="${jsr166.tckTestClass}"
216            failonerror="true"
217            jvm="${java@{target}}"
218            fork="true">
# Line 290 | Line 294 | As of 2013-02, the very latest lambda 8
294        <compilerarg value="-Xprefer:source"/>
295        <compilerarg value="-XDignore.symbol.file=true"/>
296        <compilerarg value="-Xlint:all"/>
297 +      <compilerarg value="-Xdoclint:all/protected"/>
298 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
299        <compilerarg line="${build.args}"/>
300  
301      </javac>
# Line 306 | Line 312 | As of 2013-02, the very latest lambda 8
312    </target>
313  
314  
309 –  <target name="test"
310 –          depends="configure-tests, report-tests"
311 –          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
312 –
313 –
315    <target name="docs"
316            description="Builds javadocs for src/main to dist dir">
317  
# Line 331 | Line 332 | As of 2013-02, the very latest lambda 8
332        <fileset dir="${src.dir}" defaultexcludes="yes">
333          <include name="**/*.java"/>
334        </fileset>
335 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
336        <arg value="-XDignore.symbol.file=true"/>
337        <arg value="-tag"/>
338        <arg value="${javadoc.jls.option}"/>
339 +      <arg value="-tag"/>
340 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
341 +      <arg value="-tag"/>
342 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
343 +      <arg value="-tag"/>
344 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
345      </javadoc>
346    </target>
347  
# Line 372 | Line 380 | As of 2013-02, the very latest lambda 8
380    <target name="dist-clean"
381            description="Removes all build and distribution products">
382  
383 +    <delete dir="${build.dir}"/>
384      <delete dir="${dist.dir}"/>
385  
386    </target>
387  
388  
380 –  <!-- Internal targets -->
381 –
382 –
389    <target name="dist-jar"
390            depends="clean, jar">
391      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 391 | Line 397 | As of 2013-02, the very latest lambda 8
397    </target>
398  
399  
394 –  <target name="compile-tests"
395 –          depends="jar">
396 –
397 –    <mkdir dir="${build.testcases.dir}"/>
398 –
399 –    <javac srcdir="${tck.src.dir}"
400 –           destdir="${build.testcases.dir}"
401 –           debug="${build.debug}"
402 –           debuglevel="${build.debuglevel}"
403 –           deprecation="${build.deprecation}"
404 –           source="6"
405 –           classpath="${junit.jar}"
406 –           bootclasspath="@{product.jar}:${bootclasspath6}"
407 –           includeAntRuntime="false"
408 –           includeJavaRuntime="false"
409 –           executable="${javac8}"
410 –           fork="true">
411 –
412 –      <include name="**/*.java"/>
413 –      <compilerarg value="-XDignore.symbol.file=true"/>
414 –      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
415 –      <compilerarg line="${build.args}"/>
416 –
417 –    </javac>
418 –
419 –    <javac srcdir="${test.src.dir}"
420 –           destdir="${build.testcases.dir}"
421 –           debug="${build.debug}"
422 –           debuglevel="${build.debuglevel}"
423 –           deprecation="${build.deprecation}"
424 –           source="6"
425 –           classpath=""
426 –           bootclasspath="@{product.jar}:${bootclasspath6}"
427 –           includeAntRuntime="false"
428 –           includeJavaRuntime="false"
429 –           executable="${javac8}"
430 –           fork="true">
431 –
432 –      <include name="jsr166/test/**/*.java"/>
433 –      <compilerarg value="-XDignore.symbol.file=true"/>
434 –      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
435 –      <compilerarg line="${build.args}"/>
436 –
437 –    </javac>
438 –
439 – <!--
440 –    <javac srcdir="${jtreg.src.dir}"
441 –          destdir="${build.testcases.dir}"
442 –            debug="${build.debug}"
443 –       debuglevel="${build.debuglevel}"
444 –      deprecation="${build.deprecation}"
445 –           source="${build.sourcelevel}"
446 –             fork="true">
447 –
448 –      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
449 –      <compilerarg value="-XDignore.symbol.file=true"/>
450 –      <compilerarg line="${build.args}"/>
451 –
452 –    </javac>
453 – -->
454 –
455 –  </target>
456 –
400    <target name="test-tck"
401            depends="jar"
402            description="Runs tck tests for main directly">
# Line 473 | Line 416 | As of 2013-02, the very latest lambda 8
416         classes="${product.jar}"/>
417    </target>
418  
419 <  <target name="test-ng"
419 >  <target name="test"
420            depends="test-tck, test-jtreg"
421            description="Runs tck and jtreg tests for main">
422    </target>
423  
481 –  <target name="run-tests"
482 –          depends="compile-tests">
483 –
484 –    <!-- May be overridden by user.properties -->
485 –    <property name="testcase" value="*"/>
486 –
487 –    <mkdir dir="${build.reports.dir}"/>
488 –
489 –    <junit printsummary="true"
490 –             showoutput="true"
491 –          errorProperty="junit.failed"
492 –        failureProperty="junit.failed"
493 –                    dir="${build.reports.dir}"
494 –                    jvm="${java8}"
495 –                   fork="true">
496 –
497 –      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
498 –      <jvmarg value="-server"/>
499 –      <jvmarg value="-showversion"/>
500 –
501 –      <classpath refid="test.classpath"/>
502 –
503 –      <formatter type="xml"/>
504 –
505 –      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
506 –        <fileset dir="${tck.src.dir}">
507 –          <include name="**/${testcase}Test.java"/>
508 –        </fileset>
509 –      </batchtest>
510 –
511 –      <batchtest todir="${build.reports.dir}" if="do.test.old">
512 –        <fileset dir="${test.src.dir}">
513 –          <include name="jsr166/test/**/${testcase}Test.java"/>
514 –        </fileset>
515 –      </batchtest>
516 –
517 – <!--
518 –      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
519 –        <fileset dir="${jtreg.src.dir}">
520 –          <include name="**/${testcase}Test.java"/>
521 –        </fileset>
522 –      </batchtest>
523 – -->
524 –
525 –    </junit>
526 –
527 –  </target>
528 –
529 –
530 –  <target name="report-tests"
531 –          depends="run-tests">
532 –
533 –    <!-- Sets junit.report.format to frames if redirection is present,
534 –         otherwise sets it to noframes. -->
535 –    <available property="junit.report.format"
536 –                  value="frames"
537 –              classname="org.apache.xalan.lib.Redirect"
538 –    />
539 –    <property name="junit.report.format" value="noframes"/>
540 –
541 –    <junitreport todir="${build.reports.dir}">
542 –      <fileset dir="${build.reports.dir}">
543 –        <include name="TEST-*.xml"/>
544 –      </fileset>
545 –      <report format="${junit.report.format}" todir="${build.reports.dir}"
546 –      />
547 –    </junitreport>
548 –
549 –    <fail message="Test Cases Failed" if="junit.failed"/>
550 –
551 –  </target>
424  
425  
426    <target name="configure-compiler">
# Line 568 | Line 440 | As of 2013-02, the very latest lambda 8
440    </target>
441  
442  
571 –  <target name="configure-tests"
572 –       depends="configure-compiler">
573 –
574 –    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
575 –    <available property="junit.available"
576 –               classname="junit.framework.Protectable"/>
577 –
578 –    <!-- Xalan -->
579 –    <available property="xalan.available"
580 –               classname="org.apache.xalan.Version"/>
581 –
582 –
583 –    <!-- Ant 1.6beta and later don't need or want this check -->
584 –    <!--
585 –    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
586 –          unless="junit.available"/>
587 –
588 –    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
589 –          unless="xalan.available"/>
590 –    -->
591 –
592 –  </target>
593 –
443  
444    <!-- Various demos and test programs -->
445  
# Line 651 | Line 500 | As of 2013-02, the very latest lambda 8
500      </javac>
501    </target>
502  
503 +  <target name="4jdk7doclint"
504 +          depends="configure-compiler"
505 +          description="Finds doclint warnings">
506 +
507 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
508 +
509 +    <javac srcdir="${4jdk7src.dir}"
510 +           destdir="${build.4jdk7.classes.dir}"
511 +           debug="${build.debug}"
512 +           debuglevel="${build.debuglevel}"
513 +           deprecation="${build.deprecation}"
514 +           source="6"
515 +           classpath=""
516 +           bootclasspath="${bootclasspath7}"
517 +           includeAntRuntime="false"
518 +           includeJavaRuntime="false"
519 +           executable="${javac8}"
520 +           fork="true">
521 +
522 +      <include name="**/*.java"/>
523 +      <compilerarg value="-Xprefer:source"/>
524 +      <compilerarg value="-XDignore.symbol.file=true"/>
525 +      <compilerarg value="-Xlint:all"/>
526 +      <compilerarg value="-Xdoclint:all/protected"/>
527 +      <compilerarg line="${build.args}"/>
528 +
529 +    </javac>
530 +  </target>
531 +
532  
533    <target name="4jdk7jar"
534            depends="4jdk7compile"
# Line 679 | Line 557 | As of 2013-02, the very latest lambda 8
557          <exclude name="LongAccumulatorTest.java"/>
558          <exclude name="LongAdderTest.java"/>
559          <exclude name="CompletableFutureTest.java"/>
560 +        <exclude name="SplittableRandomTest.java"/>
561          <exclude name="StampedLockTest.java"/>
562        </javac-elements>
563      </run-tck-tests>
# Line 707 | Line 586 | As of 2013-02, the very latest lambda 8
586  
587        <formatter type="brief"/>
588  
589 <      <test name="JSR166TestCase" haltonfailure="no">
589 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
590        </test>
591  
592      </junit>
# Line 719 | Line 598 | As of 2013-02, the very latest lambda 8
598      <run-jtreg-tests
599         target="7"
600         workdir="${build.4jdk7.dir}"
601 <       classes="${4jdk7product.jar}"/>
601 >       classes="${4jdk7product.jar}"
602 >       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
603    </target>
604  
605  
# Line 764 | Line 644 | As of 2013-02, the very latest lambda 8
644    </target>
645  
646  
767 –  <target name="4jdk7dist-clean"
768 –          description="Removes all build and distribution products">
769 –
770 –  </target>
771 –
647    <target name="4jdk7dist-jar"
648            depends="4jdk7clean, 4jdk7jar">
649      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 855 | Line 730 | As of 2013-02, the very latest lambda 8
730    </target>
731  
732  
858 –  <target name="jsr166xdist-clean"
859 –          description="Removes all build and distribution products">
860 –
861 –  </target>
862 –
863 –
733    <target name="jsr166xdist-jar"
734            depends="jsr166xclean, jsr166xjar">
735      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 946 | Line 815 | As of 2013-02, the very latest lambda 8
815    </target>
816  
817  
949 –  <target name="jsr166ydist-clean"
950 –          description="Removes all build and distribution products">
951 –
952 –  </target>
953 –
818    <target name="jsr166ydist-jar"
819            depends="jsr166yclean, jsr166yjar">
820      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 1037 | Line 901 | As of 2013-02, the very latest lambda 8
901    </target>
902  
903  
1040 –  <target name="extra166ydist-clean"
1041 –          description="Removes all build and distribution products">
1042 –
1043 –  </target>
1044 –
904    <target name="extra166ydist-jar"
905            depends="extra166yclean, extra166yjar">
906      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1054 | Line 913 | As of 2013-02, the very latest lambda 8
913  
914    <!-- jsr166e -->
915  
916 +  <property name="build.jsr166e.java.version" value="6"/>
917 +  <property name="build.jsr166e.javac" value="${javac6}"/>
918 +
919    <target name="jsr166ecompile"
920            depends="configure-compiler"
921            description="Compiles jsr166e sources">
# Line 1065 | Line 927 | As of 2013-02, the very latest lambda 8
927             debug="${build.debug}"
928             debuglevel="${build.debuglevel}"
929             deprecation="${build.deprecation}"
930 <           source="7"
930 >           source="${build.jsr166e.java.version}"
931             classpath=""
932             includeAntRuntime="false"
933             includeJavaRuntime="false"
934 <           executable="${javac7}"
934 >           executable="${build.jsr166e.javac}"
935             fork="true">
936  
937        <include name="jsr166e/**/*.java"/>
# Line 1102 | Line 964 | As of 2013-02, the very latest lambda 8
964               packagenames="jsr166e.*"
965               link="${jdkapidocs.url}"
966               access="${build.javadoc.access}"
967 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
968 <             source="7"
967 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
968 >             source="${build.jsr166e.java.version}"
969               executable="${javadoc7}">
970        <arg value="-XDignore.symbol.file=true"/>
971  
# Line 1111 | Line 973 | As of 2013-02, the very latest lambda 8
973    </target>
974  
975  
976 <  <target name="jsr166e-test-tck"
977 <          depends="jsr166ejar"
978 <          description="Runs tck tests for jsr166e">
976 >  <target name="jsr166e-test-tck-one-java-version"
977 >          depends="jsr166ejar">
978 >
979 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
980  
981      <run-tck-tests
982        tck.src.dir="${test.src.dir}/tck-jsr166e"
983 <      target="7"
983 >      target="${build.jsr166e.java.version}"
984        workdir="${build.jsr166e.dir}"
985        classes="${jsr166e.jar}"/>
986    </target>
987  
988 +  <target name="jsr166e-test-tck"
989 +          description="Runs tck tests for jsr166e for multiple java versions">
990 +
991 + <!--     <antcall target="clean"/> -->
992 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
993 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
994 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
995 + <!--     </antcall> -->
996 +
997 +    <antcall target="clean"/>
998 +    <antcall target="jsr166e-test-tck-one-java-version">
999 +      <param name="build.jsr166e.java.version" value="7"/>
1000 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1001 +    </antcall>
1002 +
1003 +    <antcall target="clean"/>
1004 +    <antcall target="jsr166e-test-tck-one-java-version">
1005 +      <param name="build.jsr166e.java.version" value="6"/>
1006 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1007 +    </antcall>
1008 +  </target>
1009 +
1010 +
1011 +  <target name="jsr166e-test"
1012 +          depends="jsr166e-test-tck"
1013 +          description="Runs all tests for jsr166e">
1014 +  </target>
1015  
1016    <target name="jsr166edist"
1017            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1134 | Line 1024 | As of 2013-02, the very latest lambda 8
1024    </target>
1025  
1026  
1137 –  <target name="jsr166edist-clean"
1138 –          description="Removes all build and distribution products">
1139 –
1140 –  </target>
1141 –
1027    <target name="jsr166edist-jar"
1028            depends="jsr166eclean, jsr166ejar">
1029      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines