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.133 by jsr166, Sun Feb 3 02:16:08 2013 UTC vs.
Revision 1.148 by jsr166, Sat Jul 20 18:26:16 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 216 | Line 230 | As of 2013-02, the very latest lambda 8
230      </sequential>
231    </macrodef>
232  
233 +  <macrodef name="run-jtreg-tests">
234 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
235 +    <attribute name="source" default="7"/>
236 +    <attribute name="target"/>
237 +    <attribute name="workdir"/>
238 +    <attribute name="classes"/>
239 +    <attribute name="jtregflags" default=""/>
240 +    <sequential>
241 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
242 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
243 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
244 +    <mkdir dir="@{workdir}/JTreport"/>
245 +    <jtreg dir="@{jtreg.src.dir}"
246 +           jdk="${jdk@{target}.home}"
247 +           workDir="@{workdir}/JTwork"
248 +           reportDir="@{workdir}/JTreport">
249 +
250 +      <arg value="-Xbootclasspath/p:@{classes}"/>
251 +      <arg value="-agentvm"/>
252 +      <arg value="-v:nopass,fail"/>
253 +      <arg value="-vmoptions:-esa -ea"/>
254 +      <arg value="-automatic"/>
255 +      <arg value="-k:!ignore"/>
256 +      <arg line="@{jtregflags}"/>
257 +    </jtreg>
258 +    </sequential>
259 +  </macrodef>
260 +
261    <!-- ALoops classpath -->
262    <path id="loops.classpath">
263      <pathelement location="${build.loops.dir}"/>
# Line 252 | 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 268 | Line 312 | As of 2013-02, the very latest lambda 8
312    </target>
313  
314  
271  <target name="test"
272          depends="configure-tests, report-tests"
273          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
274
275
315    <target name="docs"
316            description="Builds javadocs for src/main to dist dir">
317  
# Line 293 | 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 334 | 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  
342  <!-- Internal targets -->
343
344
389    <target name="dist-jar"
390            depends="clean, jar">
391      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 353 | Line 397 | As of 2013-02, the very latest lambda 8
397    </target>
398  
399  
356  <target name="compile-tests"
357          depends="jar">
358
359    <mkdir dir="${build.testcases.dir}"/>
360
361    <javac srcdir="${tck.src.dir}"
362           destdir="${build.testcases.dir}"
363           debug="${build.debug}"
364           debuglevel="${build.debuglevel}"
365           deprecation="${build.deprecation}"
366           source="6"
367           classpath="${junit.jar}"
368           bootclasspath="@{product.jar}:${bootclasspath6}"
369           includeAntRuntime="false"
370           includeJavaRuntime="false"
371           executable="${javac8}"
372           fork="true">
373
374      <include name="**/*.java"/>
375      <compilerarg value="-XDignore.symbol.file=true"/>
376      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
377      <compilerarg line="${build.args}"/>
378
379    </javac>
380
381    <javac srcdir="${test.src.dir}"
382           destdir="${build.testcases.dir}"
383           debug="${build.debug}"
384           debuglevel="${build.debuglevel}"
385           deprecation="${build.deprecation}"
386           source="6"
387           classpath=""
388           bootclasspath="@{product.jar}:${bootclasspath6}"
389           includeAntRuntime="false"
390           includeJavaRuntime="false"
391           executable="${javac8}"
392           fork="true">
393
394      <include name="jsr166/test/**/*.java"/>
395      <compilerarg value="-XDignore.symbol.file=true"/>
396      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
397      <compilerarg line="${build.args}"/>
398
399    </javac>
400
401 <!--
402    <javac srcdir="${jtreg.src.dir}"
403          destdir="${build.testcases.dir}"
404            debug="${build.debug}"
405       debuglevel="${build.debuglevel}"
406      deprecation="${build.deprecation}"
407           source="${build.sourcelevel}"
408             fork="true">
409
410      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
411      <compilerarg value="-XDignore.symbol.file=true"/>
412      <compilerarg line="${build.args}"/>
413
414    </javac>
415 -->
416
417  </target>
418
400    <target name="test-tck"
401            depends="jar"
402            description="Runs tck tests for main directly">
# Line 426 | Line 407 | As of 2013-02, the very latest lambda 8
407        classes="${product.jar}"/>
408    </target>
409  
410 <  <target name="run-tests"
411 <          depends="compile-tests">
412 <
413 <    <!-- May be overridden by user.properties -->
414 <    <property name="testcase" value="*"/>
415 <
416 <    <mkdir dir="${build.reports.dir}"/>
436 <
437 <    <junit printsummary="true"
438 <             showoutput="true"
439 <          errorProperty="junit.failed"
440 <        failureProperty="junit.failed"
441 <                    dir="${build.reports.dir}"
442 <                    jvm="${java8}"
443 <                   fork="true">
444 <
445 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
446 <      <jvmarg value="-server"/>
447 <      <jvmarg value="-showversion"/>
448 <
449 <      <classpath refid="test.classpath"/>
450 <
451 <      <formatter type="xml"/>
452 <
453 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
454 <        <fileset dir="${tck.src.dir}">
455 <          <include name="**/${testcase}Test.java"/>
456 <        </fileset>
457 <      </batchtest>
458 <
459 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
460 <        <fileset dir="${test.src.dir}">
461 <          <include name="jsr166/test/**/${testcase}Test.java"/>
462 <        </fileset>
463 <      </batchtest>
464 <
465 < <!--
466 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
467 <        <fileset dir="${jtreg.src.dir}">
468 <          <include name="**/${testcase}Test.java"/>
469 <        </fileset>
470 <      </batchtest>
471 < -->
472 <
473 <    </junit>
474 <
410 >  <target name="test-jtreg"
411 >          depends="jar"
412 >          description="Runs jtreg tests for main using the jtreg ant task">
413 >    <run-jtreg-tests
414 >       target="8"
415 >       workdir="${build.dir}"
416 >       classes="${product.jar}"/>
417    </target>
418  
419 <
420 <  <target name="report-tests"
421 <          depends="run-tests">
480 <
481 <    <!-- Sets junit.report.format to frames if redirection is present,
482 <         otherwise sets it to noframes. -->
483 <    <available property="junit.report.format"
484 <                  value="frames"
485 <              classname="org.apache.xalan.lib.Redirect"
486 <    />
487 <    <property name="junit.report.format" value="noframes"/>
488 <
489 <    <junitreport todir="${build.reports.dir}">
490 <      <fileset dir="${build.reports.dir}">
491 <        <include name="TEST-*.xml"/>
492 <      </fileset>
493 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
494 <      />
495 <    </junitreport>
496 <
497 <    <fail message="Test Cases Failed" if="junit.failed"/>
498 <
419 >  <target name="test"
420 >          depends="test-tck, test-jtreg"
421 >          description="Runs tck and jtreg tests for main">
422    </target>
423  
424  
425 +
426    <target name="configure-compiler">
427  
428      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 516 | Line 440 | As of 2013-02, the very latest lambda 8
440    </target>
441  
442  
519  <target name="configure-tests"
520       depends="configure-compiler">
521
522    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
523    <available property="junit.available"
524               classname="junit.framework.Protectable"/>
525
526    <!-- Xalan -->
527    <available property="xalan.available"
528               classname="org.apache.xalan.Version"/>
529
530
531    <!-- Ant 1.6beta and later don't need or want this check -->
532    <!--
533    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534          unless="junit.available"/>
535
536    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
537          unless="xalan.available"/>
538    -->
539
540  </target>
541
443  
444    <!-- Various demos and test programs -->
445  
# Line 620 | Line 521 | As of 2013-02, the very latest lambda 8
521        workdir="${build.4jdk7.dir}"
522        classes="${4jdk7product.jar}">
523        <javac-elements>
524 +        <!-- JDK8+ test classes -->
525 +        <exclude name="*8Test.java"/>
526 +        <exclude name="DoubleAccumulatorTest.java"/>
527 +        <exclude name="DoubleAdderTest.java"/>
528 +        <exclude name="LongAccumulatorTest.java"/>
529 +        <exclude name="LongAdderTest.java"/>
530 +        <exclude name="CompletableFutureTest.java"/>
531 +        <exclude name="SplittableRandomTest.java"/>
532          <exclude name="StampedLockTest.java"/>
533        </javac-elements>
534      </run-tck-tests>
# Line 648 | Line 557 | As of 2013-02, the very latest lambda 8
557  
558        <formatter type="brief"/>
559  
560 <      <test name="JSR166TestCase" haltonfailure="no">
560 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
561        </test>
562  
563      </junit>
564    </target>
565  
566    <target name="4jdk7-test-jtreg"
567 <          depends="4jdk7compile"
567 >          depends="4jdk7jar"
568            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
569 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
570 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
571 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
572 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
573 <    <jtreg dir="${jtreg.src.dir}"
665 <           jdk="${jdk7.home}"
666 <           workDir="${build.4jdk7.dir}/JTwork"
667 <           reportDir="${build.4jdk7.dir}/JTreport">
668 <
669 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
670 <      <arg value="-agentvm"/>
671 <      <arg value="-v:nopass,fail"/>
672 <      <arg value="-vmoptions:-esa -ea"/>
673 <      <arg value="-automatic"/>
674 <      <arg value="-k:!ignore"/>
675 <    </jtreg>
569 >    <run-jtreg-tests
570 >       target="7"
571 >       workdir="${build.4jdk7.dir}"
572 >       classes="${4jdk7product.jar}"
573 >       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
574    </target>
575  
576  
# Line 717 | Line 615 | As of 2013-02, the very latest lambda 8
615    </target>
616  
617  
720  <target name="4jdk7dist-clean"
721          description="Removes all build and distribution products">
722
723  </target>
724
618    <target name="4jdk7dist-jar"
619            depends="4jdk7clean, 4jdk7jar">
620      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 808 | Line 701 | As of 2013-02, the very latest lambda 8
701    </target>
702  
703  
811  <target name="jsr166xdist-clean"
812          description="Removes all build and distribution products">
813
814  </target>
815
816
704    <target name="jsr166xdist-jar"
705            depends="jsr166xclean, jsr166xjar">
706      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 899 | Line 786 | As of 2013-02, the very latest lambda 8
786    </target>
787  
788  
902  <target name="jsr166ydist-clean"
903          description="Removes all build and distribution products">
904
905  </target>
906
789    <target name="jsr166ydist-jar"
790            depends="jsr166yclean, jsr166yjar">
791      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 990 | Line 872 | As of 2013-02, the very latest lambda 8
872    </target>
873  
874  
993  <target name="extra166ydist-clean"
994          description="Removes all build and distribution products">
995
996  </target>
997
875    <target name="extra166ydist-jar"
876            depends="extra166yclean, extra166yjar">
877      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1007 | Line 884 | As of 2013-02, the very latest lambda 8
884  
885    <!-- jsr166e -->
886  
887 +  <property name="build.jsr166e.java.version" value="6"/>
888 +  <property name="build.jsr166e.javac" value="${javac6}"/>
889 +
890    <target name="jsr166ecompile"
891            depends="configure-compiler"
892            description="Compiles jsr166e sources">
# Line 1018 | Line 898 | As of 2013-02, the very latest lambda 8
898             debug="${build.debug}"
899             debuglevel="${build.debuglevel}"
900             deprecation="${build.deprecation}"
901 <           source="7"
901 >           source="${build.jsr166e.java.version}"
902             classpath=""
903             includeAntRuntime="false"
904             includeJavaRuntime="false"
905 <           executable="${javac7}"
905 >           executable="${build.jsr166e.javac}"
906             fork="true">
907  
908        <include name="jsr166e/**/*.java"/>
# Line 1055 | Line 935 | As of 2013-02, the very latest lambda 8
935               packagenames="jsr166e.*"
936               link="${jdkapidocs.url}"
937               access="${build.javadoc.access}"
938 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
939 <             source="7"
938 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
939 >             source="${build.jsr166e.java.version}"
940               executable="${javadoc7}">
941        <arg value="-XDignore.symbol.file=true"/>
942  
# Line 1064 | Line 944 | As of 2013-02, the very latest lambda 8
944    </target>
945  
946  
947 <  <target name="jsr166e-test-tck"
948 <          depends="jsr166ejar"
949 <          description="Runs tck tests for jsr166e">
947 >  <target name="jsr166e-test-tck-one-java-version"
948 >          depends="jsr166ejar">
949 >
950 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
951  
952      <run-tck-tests
953        tck.src.dir="${test.src.dir}/tck-jsr166e"
954 <      source="7"
1074 <      target="8"
954 >      target="${build.jsr166e.java.version}"
955        workdir="${build.jsr166e.dir}"
956        classes="${jsr166e.jar}"/>
957    </target>
958  
959 +  <target name="jsr166e-test-tck"
960 +          description="Runs tck tests for jsr166e for multiple java versions">
961 +
962 + <!--     <antcall target="clean"/> -->
963 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
964 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
965 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
966 + <!--     </antcall> -->
967 +
968 +    <antcall target="clean"/>
969 +    <antcall target="jsr166e-test-tck-one-java-version">
970 +      <param name="build.jsr166e.java.version" value="7"/>
971 +      <param name="build.jsr166e.javac" value="${javac7}"/>
972 +    </antcall>
973 +
974 +    <antcall target="clean"/>
975 +    <antcall target="jsr166e-test-tck-one-java-version">
976 +      <param name="build.jsr166e.java.version" value="6"/>
977 +      <param name="build.jsr166e.javac" value="${javac6}"/>
978 +    </antcall>
979 +  </target>
980 +
981 +
982 +  <target name="jsr166e-test"
983 +          depends="jsr166e-test-tck"
984 +          description="Runs all tests for jsr166e">
985 +  </target>
986  
987    <target name="jsr166edist"
988            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1088 | Line 995 | As of 2013-02, the very latest lambda 8
995    </target>
996  
997  
1091  <target name="jsr166edist-clean"
1092          description="Removes all build and distribution products">
1093
1094  </target>
1095
998    <target name="jsr166edist-jar"
999            depends="jsr166eclean, jsr166ejar">
1000      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines