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.141 by jsr166, Tue Jun 18 19:03:50 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 293 | 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 309 | Line 312 | As of 2013-02, the very latest lambda 8
312    </target>
313  
314  
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
315    <target name="docs"
316            description="Builds javadocs for src/main to dist dir">
317  
# Line 334 | 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 375 | 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  
383  <!-- Internal targets -->
384
385
389    <target name="dist-jar"
390            depends="clean, jar">
391      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 394 | Line 397 | As of 2013-02, the very latest lambda 8
397    </target>
398  
399  
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
400    <target name="test-tck"
401            depends="jar"
402            description="Runs tck tests for main directly">
# Line 476 | 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  
484  <target name="run-tests"
485          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 -->
527
528    </junit>
529
530  </target>
531
532
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>
424  
425  
426    <target name="configure-compiler">
# Line 571 | Line 440 | As of 2013-02, the very latest lambda 8
440    </target>
441  
442  
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
443  
444    <!-- Various demos and test programs -->
445  
# Line 654 | 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 682 | 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 768 | Line 644 | As of 2013-02, the very latest lambda 8
644    </target>
645  
646  
771  <target name="4jdk7dist-clean"
772          description="Removes all build and distribution products">
773
774  </target>
775
647    <target name="4jdk7dist-jar"
648            depends="4jdk7clean, 4jdk7jar">
649      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 859 | Line 730 | As of 2013-02, the very latest lambda 8
730    </target>
731  
732  
862  <target name="jsr166xdist-clean"
863          description="Removes all build and distribution products">
864
865  </target>
866
867
733    <target name="jsr166xdist-jar"
734            depends="jsr166xclean, jsr166xjar">
735      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 950 | Line 815 | As of 2013-02, the very latest lambda 8
815    </target>
816  
817  
953  <target name="jsr166ydist-clean"
954          description="Removes all build and distribution products">
955
956  </target>
957
818    <target name="jsr166ydist-jar"
819            depends="jsr166yclean, jsr166yjar">
820      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 1041 | Line 901 | As of 2013-02, the very latest lambda 8
901    </target>
902  
903  
1044  <target name="extra166ydist-clean"
1045          description="Removes all build and distribution products">
1046
1047  </target>
1048
904    <target name="extra166ydist-jar"
905            depends="extra166yclean, extra166yjar">
906      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1058 | 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 1069 | 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 1106 | 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 1115 | 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 1138 | Line 1024 | As of 2013-02, the very latest lambda 8
1024    </target>
1025  
1026  
1141  <target name="jsr166edist-clean"
1142          description="Removes all build and distribution products">
1143
1144  </target>
1145
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