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.135 by jsr166, Mon Feb 4 19:37:52 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 44 | Line 45 | As of 2013-02, the very latest lambda 8
45    <property name="build.deprecation"    value="false"/>
46    <property name="build.javadoc.access" value="protected"/>
47  
48 +  <!-- Tck options; see JSR166TestCase.java -->
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"/>
59    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 170 | Line 180 | As of 2013-02, the very latest lambda 8
180  
181    <macrodef name="run-tck-tests">
182      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173    <attribute name="source" default="6"/>
183      <attribute name="target"/>
184 +    <attribute name="compile-target" default="@{target}"/>
185      <attribute name="workdir"/>
186      <attribute name="classes"/>
187      <attribute name="jvmflags" default=""/>
# Line 185 | Line 195 | As of 2013-02, the very latest lambda 8
195             debug="${build.debug}"
196             debuglevel="${build.debuglevel}"
197             deprecation="${build.deprecation}"
198 <           source="@{source}"
198 >           source="@{compile-target}"
199 >           target="@{compile-target}"
200             classpath="${junit.jar}"
201 <           bootclasspath="@{classes}:${bootclasspath@{source}}"
201 >           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
202             includeAntRuntime="false"
203             includeJavaRuntime="false"
204 <           executable="${javac@{target}}"
204 >           executable="${javac@{compile-target}}"
205             fork="true">
206  
207        <include name="*.java"/>
# Line 201 | 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">
219          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
220          <jvmarg line="@{jvmflags}"/>
221 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
222 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
223 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
224          <classpath>
225            <pathelement location="${junit.jar}"/>
226            <pathelement location="@{workdir}/tck-classes"/>
# Line 280 | 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 296 | Line 312 | As of 2013-02, the very latest lambda 8
312    </target>
313  
314  
299  <target name="test"
300          depends="configure-tests, report-tests"
301          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
302
303
315    <target name="docs"
316            description="Builds javadocs for src/main to dist dir">
317  
# Line 321 | 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 362 | 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  
370  <!-- Internal targets -->
371
372
389    <target name="dist-jar"
390            depends="clean, jar">
391      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 381 | Line 397 | As of 2013-02, the very latest lambda 8
397    </target>
398  
399  
384  <target name="compile-tests"
385          depends="jar">
386
387    <mkdir dir="${build.testcases.dir}"/>
388
389    <javac srcdir="${tck.src.dir}"
390           destdir="${build.testcases.dir}"
391           debug="${build.debug}"
392           debuglevel="${build.debuglevel}"
393           deprecation="${build.deprecation}"
394           source="6"
395           classpath="${junit.jar}"
396           bootclasspath="@{product.jar}:${bootclasspath6}"
397           includeAntRuntime="false"
398           includeJavaRuntime="false"
399           executable="${javac8}"
400           fork="true">
401
402      <include name="**/*.java"/>
403      <compilerarg value="-XDignore.symbol.file=true"/>
404      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
405      <compilerarg line="${build.args}"/>
406
407    </javac>
408
409    <javac srcdir="${test.src.dir}"
410           destdir="${build.testcases.dir}"
411           debug="${build.debug}"
412           debuglevel="${build.debuglevel}"
413           deprecation="${build.deprecation}"
414           source="6"
415           classpath=""
416           bootclasspath="@{product.jar}:${bootclasspath6}"
417           includeAntRuntime="false"
418           includeJavaRuntime="false"
419           executable="${javac8}"
420           fork="true">
421
422      <include name="jsr166/test/**/*.java"/>
423      <compilerarg value="-XDignore.symbol.file=true"/>
424      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
425      <compilerarg line="${build.args}"/>
426
427    </javac>
428
429 <!--
430    <javac srcdir="${jtreg.src.dir}"
431          destdir="${build.testcases.dir}"
432            debug="${build.debug}"
433       debuglevel="${build.debuglevel}"
434      deprecation="${build.deprecation}"
435           source="${build.sourcelevel}"
436             fork="true">
437
438      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
439      <compilerarg value="-XDignore.symbol.file=true"/>
440      <compilerarg line="${build.args}"/>
441
442    </javac>
443 -->
444
445  </target>
446
400    <target name="test-tck"
401            depends="jar"
402            description="Runs tck tests for main directly">
# Line 463 | 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  
471  <target name="run-tests"
472          depends="compile-tests">
473
474    <!-- May be overridden by user.properties -->
475    <property name="testcase" value="*"/>
476
477    <mkdir dir="${build.reports.dir}"/>
478
479    <junit printsummary="true"
480             showoutput="true"
481          errorProperty="junit.failed"
482        failureProperty="junit.failed"
483                    dir="${build.reports.dir}"
484                    jvm="${java8}"
485                   fork="true">
486
487      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
488      <jvmarg value="-server"/>
489      <jvmarg value="-showversion"/>
490
491      <classpath refid="test.classpath"/>
492
493      <formatter type="xml"/>
494
495      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
496        <fileset dir="${tck.src.dir}">
497          <include name="**/${testcase}Test.java"/>
498        </fileset>
499      </batchtest>
500
501      <batchtest todir="${build.reports.dir}" if="do.test.old">
502        <fileset dir="${test.src.dir}">
503          <include name="jsr166/test/**/${testcase}Test.java"/>
504        </fileset>
505      </batchtest>
506
507 <!--
508      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
509        <fileset dir="${jtreg.src.dir}">
510          <include name="**/${testcase}Test.java"/>
511        </fileset>
512      </batchtest>
513 -->
514
515    </junit>
516
517  </target>
518
519
520  <target name="report-tests"
521          depends="run-tests">
522
523    <!-- Sets junit.report.format to frames if redirection is present,
524         otherwise sets it to noframes. -->
525    <available property="junit.report.format"
526                  value="frames"
527              classname="org.apache.xalan.lib.Redirect"
528    />
529    <property name="junit.report.format" value="noframes"/>
530
531    <junitreport todir="${build.reports.dir}">
532      <fileset dir="${build.reports.dir}">
533        <include name="TEST-*.xml"/>
534      </fileset>
535      <report format="${junit.report.format}" todir="${build.reports.dir}"
536      />
537    </junitreport>
538
539    <fail message="Test Cases Failed" if="junit.failed"/>
540
541  </target>
424  
425  
426    <target name="configure-compiler">
# Line 558 | Line 440 | As of 2013-02, the very latest lambda 8
440    </target>
441  
442  
561  <target name="configure-tests"
562       depends="configure-compiler">
563
564    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
565    <available property="junit.available"
566               classname="junit.framework.Protectable"/>
567
568    <!-- Xalan -->
569    <available property="xalan.available"
570               classname="org.apache.xalan.Version"/>
571
572
573    <!-- Ant 1.6beta and later don't need or want this check -->
574    <!--
575    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
576          unless="junit.available"/>
577
578    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
579          unless="xalan.available"/>
580    -->
581
582  </target>
583
443  
444    <!-- Various demos and test programs -->
445  
# Line 641 | 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 663 | Line 551 | As of 2013-02, the very latest lambda 8
551        classes="${4jdk7product.jar}">
552        <javac-elements>
553          <!-- JDK8+ test classes -->
554 +        <exclude name="*8Test.java"/>
555 +        <exclude name="DoubleAccumulatorTest.java"/>
556 +        <exclude name="DoubleAdderTest.java"/>
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 691 | 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 703 | 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 748 | Line 644 | As of 2013-02, the very latest lambda 8
644    </target>
645  
646  
751  <target name="4jdk7dist-clean"
752          description="Removes all build and distribution products">
753
754  </target>
755
647    <target name="4jdk7dist-jar"
648            depends="4jdk7clean, 4jdk7jar">
649      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 839 | Line 730 | As of 2013-02, the very latest lambda 8
730    </target>
731  
732  
842  <target name="jsr166xdist-clean"
843          description="Removes all build and distribution products">
844
845  </target>
846
847
733    <target name="jsr166xdist-jar"
734            depends="jsr166xclean, jsr166xjar">
735      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 930 | Line 815 | As of 2013-02, the very latest lambda 8
815    </target>
816  
817  
933  <target name="jsr166ydist-clean"
934          description="Removes all build and distribution products">
935
936  </target>
937
818    <target name="jsr166ydist-jar"
819            depends="jsr166yclean, jsr166yjar">
820      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 1021 | Line 901 | As of 2013-02, the very latest lambda 8
901    </target>
902  
903  
1024  <target name="extra166ydist-clean"
1025          description="Removes all build and distribution products">
1026
1027  </target>
1028
904    <target name="extra166ydist-jar"
905            depends="extra166yclean, extra166yjar">
906      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1038 | 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 1049 | 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 1086 | 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 1095 | 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 <      source="7"
1105 <      target="8"
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 1119 | Line 1024 | As of 2013-02, the very latest lambda 8
1024    </target>
1025  
1026  
1122  <target name="jsr166edist-clean"
1123          description="Removes all build and distribution products">
1124
1125  </target>
1126
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