/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.154 by jsr166, Mon Jun 16 15:55:54 2014 UTC revision 1.181 by jsr166, Sun Sep 13 05:26:02 2015 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 24  Line 25 
25    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
28    
29      Alternatively, define ant variables thus:
30      ant -Djdk$N.home=...
31      for $N in 6 7 8 9 ...
32  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
33    </description>    </description>
34    
# Line 34  Line 39 
39      </java>      </java>
40    </target>    </target>
41    
42      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43    
44    <!-- User-specific settings -->    <!-- User-specific settings -->
45    <property file="user.properties"/>    <property file="user.properties"/>
# Line 46  Line 52 
52    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
53    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
54    
55    <!-- Tck options; see JSR166TestCase.java -->    <!-- Tck options; see JSR166TestCase.java
56    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     To profile a single tck test class:
57       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58       To stress test a single tck test class:
59       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60      -->
61    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
62    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
63    <property name="jsr166.runsPerTest"      value="1"/>    <property name="jsr166.runsPerTest"      value="1"/>
   <!-- Allow running an individual tck test class -->  
   <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->  
64    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65    
66    <!-- Build locations -->    <!-- Build locations -->
# Line 87  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <local name="have.java.base"/>
99        <available property="have.java.base"
100          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
102          if:set="have.java.base"/>
103        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
104          unless:set="have.java.base"/>
105      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
106      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
107      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}">
# Line 123  Line 137 
137    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
138    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
139    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
140    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
141      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
142      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
143      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
144    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
145    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
146    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 161  Line 178 
178    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
179    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
180    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
181    <!-- The expected canonical location does not yet exist as of 2014-02 -->    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
182    <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->    <!-- The expected canonical location does not yet exist as of 2014-07 -->
   <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>  
   <!-- No published jdk9 docs exist as of 2014-02 -->  
183    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
184    <property name="java9.docroot.url"      value="${java8.docroot.url}"/>    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
185    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
186    <property name="java.docroot.url"       value="${java7.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
187    
188    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
189    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 195  Line 210 
210      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
211      <attribute name="workdir"/>      <attribute name="workdir"/>
212      <attribute name="classes"/>      <attribute name="classes"/>
213      <attribute name="jvmflags" default="-ea -esa"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
215      <sequential>      <sequential>
216    
# Line 209  Line 224 
224             source="@{compile-target}"             source="@{compile-target}"
225             target="@{compile-target}"             target="@{compile-target}"
226             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
227             includeAntRuntime="false"             includeAntRuntime="false"
228             includeJavaRuntime="false"             includeJavaRuntime="false"
229             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 218  Line 232 
232        <include name="*.java"/>        <include name="*.java"/>
233        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
234        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
235          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
236        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
237        <javac-elements/>        <javac-elements/>
238    
# Line 229  Line 244 
244            fork="true">            fork="true">
245          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
246          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
247    
248            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
249            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
250              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
251            </syspropertyset>
252    
253          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
254          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
255          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 241  Line 262 
262      </sequential>      </sequential>
263    </macrodef>    </macrodef>
264    
265      <!-- Define jtreg test sets for different jdk versions -->
266      <fileset dir="${jtreg9.src.dir}">
267        <patternset id="jdk9.jtreg.tests">
268          <include name="**/*.java"/>
269        </patternset>
270      </fileset>
271    
272      <fileset dir="${jtreg8.src.dir}">
273        <patternset id="jdk8.jtreg.tests">
274          <include name="**/*.java"/>
275          <exclude name="**/SpliteratorCharacteristics.java"/>
276          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
277          <exclude name="**/GCDuringIteration.java"/>
278        </patternset>
279      </fileset>
280    
281      <fileset dir="${jtreg7.src.dir}">
282        <patternset id="jdk7.jtreg.tests">
283          <include name="**/*.java"/>
284        </patternset>
285      </fileset>
286    
287    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
288      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>  
289      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
290      <attribute name="target"/>      <attribute name="target"/>
291      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 254  Line 296 
296      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
297      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
298      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
299      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
300             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
301             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
302             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
303          <patternset refid="jdk@{target}.jtreg.tests"/>
304        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
305        <arg value="-agentvm"/>        <arg value="-agentvm"/>
306        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 309  Line 351 
351        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
352        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
353        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
354          <compilerarg value="-Werror"/>
355        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
356        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 323  Line 366 
366    
367      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
368        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
369          <manifest>
370            <attribute name="Built-By" value="${user.name}"/>
371            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
372          </manifest>
373      </jar>      </jar>
374    </target>    </target>
375    
# Line 381  Line 428 
428        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
429        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
430        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
431          <manifest>
432            <attribute name="Built-By" value="${user.name}"/>
433            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
434          </manifest>
435      </jar>      </jar>
436    </target>    </target>
437    
# Line 412  Line 463 
463      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
464    </target>    </target>
465    
466      <target name="tck"
   <target name="test-tck"  
467            depends="jar"            depends="jar"
468            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
469    
# Line 423  Line 473 
473        classes="${product.jar}"/>        classes="${product.jar}"/>
474    </target>    </target>
475    
476    <target name="test-jtreg"    <target name="tck-parallelism-1"
477              description="Runs tck with given common pool parallelism">
478        <antcall target="tck">
479          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
480        </antcall>
481      </target>
482    
483      <target name="tck-parallelism-0"
484              description="Runs tck with given common pool parallelism">
485        <antcall target="tck">
486          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
487        </antcall>
488      </target>
489    
490      <target name="jtreg"
491            depends="jar"            depends="jar"
492            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
493      <run-jtreg-tests      <run-jtreg-tests
# Line 433  Line 497 
497    </target>    </target>
498    
499    <target name="test"    <target name="test"
500            depends="test-tck, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
501            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
502    </target>    </target>
503    
504      <target name="jtreg8" description="Runs jtreg tests with jdk8">
505    
506        <antcall target="jtreg">
507          <param name="build.main.java.version" value="8"/>
508          <param name="build.main.javac" value="${javac8}"/>
509        </antcall>
510    
511      </target>
512    
513    <target name="test89"    <target name="test89"
514            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
515    
# Line 457  Line 530 
530    
531    
532    <target name="configure-compiler">    <target name="configure-compiler">
533        <fail message="ant version too old">
534          <condition>
535            <not> <antversion atleast="1.9.1"/> </not>
536          </condition>
537        </fail>
538    
539      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
540    
# Line 503  Line 581 
581    </target>    </target>
582    
583    
584      <target name="compile-test-loops" depends="jar"
585              description="compile all the perf tests in src/test/loops">
586    
587        <mkdir dir="${build.dir}/test/loops"/>
588    
589        <javac srcdir="${basedir}/src/test/loops"
590               destdir="${build.dir}/test/loops"
591               debug="${build.debug}"
592               debuglevel="${build.debuglevel}"
593               deprecation="${build.deprecation}"
594               includeAntRuntime="false"
595               includeJavaRuntime="false"
596               executable="${javac9}"
597               fork="true">
598    
599          <include name="*.java"/>
600          <compilerarg value="-XDignore.symbol.file=true"/>
601          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
602          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
603          <compilerarg line="${build.args}"/>
604    
605        </javac>
606    
607      </target>
608    
609    
610    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
611    
612    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 528  Line 632 
632        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
633        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
634        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
635          <compilerarg value="-Werror"/>
636        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
637    
638      </javac>      </javac>
# Line 569  Line 674 
674    
675      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
676        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
677          <manifest>
678            <attribute name="Built-By" value="${user.name}"/>
679            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
680          </manifest>
681      </jar>      </jar>
682    
683    </target>    </target>
684    
685    
686    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
687            depends="4jdk7jar"            depends="4jdk7jar"
688            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
689    
# Line 586  Line 695 
695          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
696          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
697          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
698            <exclude name="*10Test.java"/>
699          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
700          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
701          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 593  Line 703 
703          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
704          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
705          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
706            <exclude name="SubmissionPublisherTest.java"/>
707        </javac-elements>        </javac-elements>
708      </run-tck-tests>      </run-tck-tests>
709    </target>    </target>
710    
711    
712    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
713            depends="4jdk7compile"            depends="4jdk7compile"
714            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
715    
# Line 626  Line 737 
737      </junit>      </junit>
738    </target>    </target>
739    
740    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
741            depends="4jdk7jar"            depends="4jdk7jar"
742            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
743      <run-jtreg-tests      <run-jtreg-tests
744         target="7"         target="7"
745         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
746         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
747    </target>    </target>
748    
749    
750    <target name="4jdk7-test"    <target name="4jdk7-test"
751            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
752            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
753    </target>    </target>
754    
# Line 715  Line 825 
825        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
826        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
827        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
828          <compilerarg value="-Werror"/>
829        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
830    
831      </javac>      </javac>
# Line 727  Line 838 
838    
839      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
840        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
841          <manifest>
842            <attribute name="Built-By" value="${user.name}"/>
843            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
844          </manifest>
845      </jar>      </jar>
846    
847    </target>    </target>
# Line 801  Line 916 
916        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
917        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
918        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
919          <compilerarg value="-Werror"/>
920        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
921    
922      </javac>      </javac>
# Line 813  Line 929 
929    
930      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
931        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
932          <manifest>
933            <attribute name="Built-By" value="${user.name}"/>
934            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935          </manifest>
936      </jar>      </jar>
937    
938    </target>    </target>
# Line 888  Line 1008 
1008        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1009        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1010        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1011          <compilerarg value="-Werror"/>
1012        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1013    
1014      </javac>      </javac>
# Line 900  Line 1021 
1021    
1022      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1023        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1024          <manifest>
1025            <attribute name="Built-By" value="${user.name}"/>
1026            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1027          </manifest>
1028      </jar>      </jar>
1029    
1030    </target>    </target>
# Line 975  Line 1100 
1100        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1101        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1102        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1103          <compilerarg value="-Werror"/>
1104        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1105    
1106      </javac>      </javac>
# Line 1001  Line 1127 
1127        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1128        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1129        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1130          <compilerarg value="-Werror"/>
1131        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1132    
1133      </javac>      </javac>
# Line 1013  Line 1140 
1140    
1141      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1142        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1143          <manifest>
1144            <attribute name="Built-By" value="${user.name}"/>
1145            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1146          </manifest>
1147      </jar>      </jar>
1148    
1149    </target>    </target>
# Line 1038  Line 1169 
1169    </target>    </target>
1170    
1171    
1172    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1173            depends="jsr166ejar">            depends="jsr166ejar">
1174    
1175      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1050  Line 1181 
1181        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1182    </target>    </target>
1183    
1184    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1185            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1186    
1187  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1188  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1189  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1190  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1191  <!--     </antcall> -->  <!--     </antcall> -->
1192    
1193      <antcall target="clean"/>      <antcall target="clean"/>
1194      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1195        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1196        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1197      </antcall>      </antcall>
1198    
1199      <antcall target="clean"/>      <antcall target="clean"/>
1200      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1201        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1202        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1203      </antcall>      </antcall>
# Line 1074  Line 1205 
1205    
1206    
1207    <target name="jsr166e-test"    <target name="jsr166e-test"
1208            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1209            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1210    </target>    </target>
1211    
# Line 1104  Line 1235 
1235    
1236    <target name="lint">    <target name="lint">
1237      <antcall target="dists">      <antcall target="dists">
1238          <param name="build.javadoc.access" value="public"/>
1239        </antcall>
1240      </target>
1241    
1242    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1243      <target name="lint-private">
1244        <antcall target="dist">
1245        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1246      </antcall>      </antcall>
1247    </target>    </target>

Legend:
Removed from v.1.154  
changed lines
  Added in v.1.181

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27