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.137 by jsr166, Wed Feb 6 19:55:06 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 44 | Line 46 | As of 2013-02, the very latest lambda 8
46    <property name="build.deprecation"    value="false"/>
47    <property name="build.javadoc.access" value="protected"/>
48  
49 +  <!-- Tck options; see JSR166TestCase.java -->
50 +  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51 +  <property name="jsr166.profileTests"     value="false"/>
52 +  <property name="jsr166.profileThreshold" value="100"/>
53 +  <property name="jsr166.runsPerTest"      value="1"/>
54 +  <!-- Allow running an individual tck test class -->
55 +  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57 +
58    <!-- Build locations -->
59    <property name="build.dir"                   location="build"/>
60    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 105 | 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 151 | 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 170 | Line 186 | As of 2013-02, the very latest lambda 8
186  
187    <macrodef name="run-tck-tests">
188      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
173 –    <attribute name="source" default="6"/>
189      <attribute name="target"/>
190 +    <attribute name="compile-target" default="@{target}"/>
191      <attribute name="workdir"/>
192      <attribute name="classes"/>
193      <attribute name="jvmflags" default=""/>
# Line 185 | Line 201 | As of 2013-02, the very latest lambda 8
201             debug="${build.debug}"
202             debuglevel="${build.debuglevel}"
203             deprecation="${build.deprecation}"
204 <           source="@{source}"
204 >           source="@{compile-target}"
205 >           target="@{compile-target}"
206             classpath="${junit.jar}"
207 <           bootclasspath="@{classes}:${bootclasspath@{source}}"
207 >           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
208             includeAntRuntime="false"
209             includeJavaRuntime="false"
210 <           executable="${javac@{target}}"
210 >           executable="${javac@{compile-target}}"
211             fork="true">
212  
213        <include name="*.java"/>
# Line 201 | Line 218 | As of 2013-02, the very latest lambda 8
218  
219      </javac>
220  
221 <    <java classname="JSR166TestCase"
221 >    <java classname="${jsr166.tckTestClass}"
222            failonerror="true"
223            jvm="${java@{target}}"
224            fork="true">
225          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
226          <jvmarg line="@{jvmflags}"/>
227 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
228 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
229 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
230          <classpath>
231            <pathelement location="${junit.jar}"/>
232            <pathelement location="@{workdir}/tck-classes"/>
# Line 255 | 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 273 | 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 296 | Line 321 | As of 2013-02, the very latest lambda 8
321    </target>
322  
323  
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 –
324    <target name="docs"
325            description="Builds javadocs for src/main to dist dir">
326  
# Line 312 | 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 362 | 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  
370 –  <!-- Internal targets -->
371 –
372 –
398    <target name="dist-jar"
399            depends="clean, jar">
400      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 381 | Line 406 | As of 2013-02, the very latest lambda 8
406    </target>
407  
408  
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 –
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 458 | 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">
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"/>
433 >  <target name="test89"
434 >          description="Runs tck and jtreg tests for main for multiple java versions">
435  
436 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
437 <        <fileset dir="${tck.src.dir}">
438 <          <include name="**/${testcase}Test.java"/>
439 <        </fileset>
440 <      </batchtest>
441 <
442 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
443 <        <fileset dir="${test.src.dir}">
444 <          <include name="jsr166/test/**/${testcase}Test.java"/>
445 <        </fileset>
446 <      </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>
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  
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>
542 –
451  
452    <target name="configure-compiler">
453  
# Line 558 | Line 466 | As of 2013-02, the very latest lambda 8
466    </target>
467  
468  
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 –
469  
470    <!-- Various demos and test programs -->
471  
# Line 641 | 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 664 | 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 693 | Line 613 | As of 2013-02, the very latest lambda 8
613  
614        <formatter type="brief"/>
615  
616 <      <test name="JSR166TestCase" haltonfailure="no">
616 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
617        </test>
618  
619      </junit>
# Line 705 | 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 750 | Line 671 | As of 2013-02, the very latest lambda 8
671    </target>
672  
673  
753 –  <target name="4jdk7dist-clean"
754 –          description="Removes all build and distribution products">
755 –
756 –  </target>
757 –
674    <target name="4jdk7dist-jar"
675            depends="4jdk7clean, 4jdk7jar">
676      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 841 | Line 757 | As of 2013-02, the very latest lambda 8
757    </target>
758  
759  
844 –  <target name="jsr166xdist-clean"
845 –          description="Removes all build and distribution products">
846 –
847 –  </target>
848 –
849 –
760    <target name="jsr166xdist-jar"
761            depends="jsr166xclean, jsr166xjar">
762      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 932 | Line 842 | As of 2013-02, the very latest lambda 8
842    </target>
843  
844  
935 –  <target name="jsr166ydist-clean"
936 –          description="Removes all build and distribution products">
937 –
938 –  </target>
939 –
845    <target name="jsr166ydist-jar"
846            depends="jsr166yclean, jsr166yjar">
847      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 1023 | Line 928 | As of 2013-02, the very latest lambda 8
928    </target>
929  
930  
1026 –  <target name="extra166ydist-clean"
1027 –          description="Removes all build and distribution products">
1028 –
1029 –  </target>
1030 –
931    <target name="extra166ydist-jar"
932            depends="extra166yclean, extra166yjar">
933      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1040 | 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 1051 | 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 1066 | 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 1088 | 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 1097 | 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 <      source="7"
1107 <      target="8"
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 1121 | Line 1077 | As of 2013-02, the very latest lambda 8
1077    </target>
1078  
1079  
1124 –  <target name="jsr166edist-clean"
1125 –          description="Removes all build and distribution products">
1126 –
1127 –  </target>
1128 –
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