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

Diff of /jsr166/build.xml

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

revision 1.157 by jsr166, Tue Jul 8 00:01:39 2014 UTC revision 1.183 by jsr166, Sat Sep 26 17:58:52 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      As of 2015-09, there is incomplete hacky support for jigsaw
34      Build for jigsaw using something like:
35      ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36      "docs" target is still broken.
37  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
38    </description>    </description>
39    
# Line 34  Line 44 
44      </java>      </java>
45    </target>    </target>
46    
47      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48    
49    <!-- User-specific settings -->    <!-- User-specific settings -->
50    <property file="user.properties"/>    <property file="user.properties"/>
# Line 46  Line 57 
57    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
58    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
59    
   <!-- Tck options; see JSR166TestCase.java  
    Profiling a tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck  
    Stress test a tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck  
   -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <!-- Stress test an individual tck test class:  
   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck  
   -->  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
60    <!-- Build locations -->    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
62    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 92  Line 89 
89      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <local name="have.java.base"/>
93        <available property="have.java.base"
94          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96          if:set="have.java.base"/>
97        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98          unless:set="have.java.base"/>
99        <local name="modules"/>
100        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
102      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
104        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
105        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
106        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
107        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
108        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
109      </path>      </path>
110      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111      </sequential>      </sequential>
112    </macrodef>    </macrodef>
113    
# Line 128  Line 133 
133    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
134    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
141    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
142    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 192  Line 200 
200      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
201    </path>    </path>
202    
203      <!-- Tck options; see JSR166TestCase.java
204       To profile a single tck test class:
205       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
206       To stress test a single tck test class:
207       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
208       To stress test a single tck test method:
209       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
210      -->
211      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
212    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
213      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
214      <attribute name="target"/>      <attribute name="target"/>
# Line 200  Line 217 
217      <attribute name="classes"/>      <attribute name="classes"/>
218      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
219      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
220    
221      <sequential>      <sequential>
222    
223        <local name="modules"/>
224        <condition property="modules">
225          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
226        </condition>
227    
228      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
229    
230      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 212  Line 235 
235             source="@{compile-target}"             source="@{compile-target}"
236             target="@{compile-target}"             target="@{compile-target}"
237             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
238             includeAntRuntime="false"             includeAntRuntime="false"
239             includeJavaRuntime="false"             includeJavaRuntime="false"
240             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 221  Line 243 
243        <include name="*.java"/>        <include name="*.java"/>
244        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
245        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
246          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
247          <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
248        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
249        <javac-elements/>        <javac-elements/>
250    
# Line 230  Line 254 
254            failonerror="true"            failonerror="true"
255            jvm="${java@{target}}"            jvm="${java@{target}}"
256            fork="true">            fork="true">
257          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258            <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
259          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
260          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
261          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
262          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <syspropertyset id="system-properties-used-by-tck">
263              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
264              <propertyref prefix="jsr166"/>
265            </syspropertyset>
266    
267          <classpath>          <classpath>
268            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
269            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 244  Line 273 
273      </sequential>      </sequential>
274    </macrodef>    </macrodef>
275    
276      <!-- Define jtreg test sets for different jdk versions -->
277      <fileset dir="${jtreg9.src.dir}">
278        <patternset id="jdk9.jtreg.tests">
279          <include name="**/*.java"/>
280        </patternset>
281      </fileset>
282    
283      <fileset dir="${jtreg8.src.dir}">
284        <patternset id="jdk8.jtreg.tests">
285          <include name="**/*.java"/>
286          <exclude name="**/SpliteratorCharacteristics.java"/>
287          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
288          <exclude name="**/GCDuringIteration.java"/>
289        </patternset>
290      </fileset>
291    
292      <fileset dir="${jtreg7.src.dir}">
293        <patternset id="jdk7.jtreg.tests">
294          <include name="**/*.java"/>
295        </patternset>
296      </fileset>
297    
298    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
299      <!-- 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}"/>  
300      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
301      <attribute name="target"/>      <attribute name="target"/>
302      <attribute name="workdir"/>      <attribute name="workdir"/>
303      <attribute name="classes"/>      <attribute name="classes"/>
304      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
305    
306      <sequential>      <sequential>
307    
308        <local name="modules"/>
309        <condition property="modules">
310          <available file="${jdk@{target}.home}/jmods" type="dir"/>
311        </condition>
312    
313      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
314      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
315      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
316      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
317      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
318             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
319             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
320             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
321          <patternset refid="jdk@{target}.jtreg.tests"/>
322        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
323          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
324        <arg value="-agentvm"/>        <arg value="-agentvm"/>
325        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
326        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 295  Line 353 
353            depends="configure-compiler"            depends="configure-compiler"
354            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
355    
356      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
357        <condition property="modules">
358          <and>
359            <available file="${jdk9.home}/jmods" type="dir"/>
360            <equals arg1="9" arg2="${build.main.java.version}"/>
361          </and>
362        </condition>
363    
364        <local name="destdir"/>
365        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
366        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
367    
368        <mkdir dir="${destdir}"/>
369    
370      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
371             destdir="${build.classes.dir}"             destdir="${destdir}"
372             debug="${build.debug}"             debug="${build.debug}"
373             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
374             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 309  Line 379 
379             fork="true">             fork="true">
380    
381        <include name="**/*.java"/>        <include name="**/*.java"/>
382          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
383        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
384        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
385        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
386          <compilerarg value="-Werror"/>
387        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
388        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
389        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 326  Line 398 
398    
399      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
400        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
401          <manifest>
402            <attribute name="Built-By" value="${user.name}"/>
403            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
404          </manifest>
405      </jar>      </jar>
406    </target>    </target>
407    
# Line 353  Line 429 
429        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
430        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
431        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
432    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
433        <arg value="-tag"/>        <arg value="-tag"/>
434        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
435        <arg value="-tag"/>        <arg value="-tag"/>
# Line 384  Line 461 
461        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
462        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
463        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
464          <manifest>
465            <attribute name="Built-By" value="${user.name}"/>
466            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
467          </manifest>
468      </jar>      </jar>
469    </target>    </target>
470    
# Line 415  Line 496 
496      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
497    </target>    </target>
498    
499      <target name="tck"
   <target name="test-tck"  
500            depends="jar"            depends="jar"
501            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
502    
# Line 426  Line 506 
506        classes="${product.jar}"/>        classes="${product.jar}"/>
507    </target>    </target>
508    
509    <target name="test-jtreg"    <target name="tck-parallelism-1"
510              description="Runs tck with given common pool parallelism">
511        <antcall target="tck">
512          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
513        </antcall>
514      </target>
515    
516      <target name="tck-parallelism-0"
517              description="Runs tck with given common pool parallelism">
518        <antcall target="tck">
519          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
520        </antcall>
521      </target>
522    
523      <target name="jtreg"
524            depends="jar"            depends="jar"
525            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
526      <run-jtreg-tests      <run-jtreg-tests
# Line 436  Line 530 
530    </target>    </target>
531    
532    <target name="test"    <target name="test"
533            depends="test-tck, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
534            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
535    </target>    </target>
536    
537      <target name="jtreg8" description="Runs jtreg tests with jdk8">
538    
539        <antcall target="jtreg">
540          <param name="build.main.java.version" value="8"/>
541          <param name="build.main.javac" value="${javac8}"/>
542        </antcall>
543    
544      </target>
545    
546    <target name="test89"    <target name="test89"
547            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
548    
# Line 460  Line 563 
563    
564    
565    <target name="configure-compiler">    <target name="configure-compiler">
566        <fail message="ant version too old">
567          <condition>
568            <not> <antversion atleast="1.9.1"/> </not>
569          </condition>
570        </fail>
571    
572      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
573    
# Line 506  Line 614 
614    </target>    </target>
615    
616    
617      <target name="compile-test-loops" depends="jar"
618              description="compile all the perf tests in src/test/loops">
619    
620        <mkdir dir="${build.dir}/test/loops"/>
621    
622        <javac srcdir="${basedir}/src/test/loops"
623               destdir="${build.dir}/test/loops"
624               debug="${build.debug}"
625               debuglevel="${build.debuglevel}"
626               deprecation="${build.deprecation}"
627               includeAntRuntime="false"
628               includeJavaRuntime="false"
629               executable="${javac9}"
630               fork="true">
631    
632          <include name="*.java"/>
633          <compilerarg value="-XDignore.symbol.file=true"/>
634          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
635          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
636          <compilerarg line="${build.args}"/>
637    
638        </javac>
639    
640      </target>
641    
642    
643    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
644    
645    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 531  Line 665 
665        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
666        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
667        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
668          <compilerarg value="-Werror"/>
669        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
670    
671      </javac>      </javac>
# Line 572  Line 707 
707    
708      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
709        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
710          <manifest>
711            <attribute name="Built-By" value="${user.name}"/>
712            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
713          </manifest>
714      </jar>      </jar>
715    
716    </target>    </target>
717    
718    
719    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
720            depends="4jdk7jar"            depends="4jdk7jar"
721            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
722    
# Line 589  Line 728 
728          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
729          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
730          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
731            <exclude name="*10Test.java"/>
732          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
733          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
734          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 596  Line 736 
736          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
737          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
738          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
739            <exclude name="SubmissionPublisherTest.java"/>
740        </javac-elements>        </javac-elements>
741      </run-tck-tests>      </run-tck-tests>
742    </target>    </target>
743    
744    
745    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
746            depends="4jdk7compile"            depends="4jdk7compile"
747            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
748    
# Line 629  Line 770 
770      </junit>      </junit>
771    </target>    </target>
772    
773    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
774            depends="4jdk7jar"            depends="4jdk7jar"
775            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
776      <run-jtreg-tests      <run-jtreg-tests
777         target="7"         target="7"
778         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
779         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
780    </target>    </target>
781    
782    
783    <target name="4jdk7-test"    <target name="4jdk7-test"
784            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
785            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
786    </target>    </target>
787    
# Line 718  Line 858 
858        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
859        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
860        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
861          <compilerarg value="-Werror"/>
862        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
863    
864      </javac>      </javac>
# Line 730  Line 871 
871    
872      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
873        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
874          <manifest>
875            <attribute name="Built-By" value="${user.name}"/>
876            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
877          </manifest>
878      </jar>      </jar>
879    
880    </target>    </target>
# Line 804  Line 949 
949        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
950        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
951        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
952          <compilerarg value="-Werror"/>
953        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
954    
955      </javac>      </javac>
# Line 816  Line 962 
962    
963      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
964        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
965          <manifest>
966            <attribute name="Built-By" value="${user.name}"/>
967            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
968          </manifest>
969      </jar>      </jar>
970    
971    </target>    </target>
# Line 891  Line 1041 
1041        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1042        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1043        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1044          <compilerarg value="-Werror"/>
1045        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1046    
1047      </javac>      </javac>
# Line 903  Line 1054 
1054    
1055      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1056        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1057          <manifest>
1058            <attribute name="Built-By" value="${user.name}"/>
1059            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1060          </manifest>
1061      </jar>      </jar>
1062    
1063    </target>    </target>
# Line 978  Line 1133 
1133        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1134        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1135        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1136          <compilerarg value="-Werror"/>
1137        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1138    
1139      </javac>      </javac>
# Line 1004  Line 1160 
1160        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1161        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1162        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1163          <compilerarg value="-Werror"/>
1164        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1165    
1166      </javac>      </javac>
# Line 1016  Line 1173 
1173    
1174      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1175        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1176          <manifest>
1177            <attribute name="Built-By" value="${user.name}"/>
1178            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1179          </manifest>
1180      </jar>      </jar>
1181    
1182    </target>    </target>
# Line 1041  Line 1202 
1202    </target>    </target>
1203    
1204    
1205    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1206            depends="jsr166ejar">            depends="jsr166ejar">
1207    
1208      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1053  Line 1214 
1214        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1215    </target>    </target>
1216    
1217    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1218            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1219    
1220  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1221  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1222  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1223  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1224  <!--     </antcall> -->  <!--     </antcall> -->
1225    
1226      <antcall target="clean"/>      <antcall target="clean"/>
1227      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1228        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1229        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1230      </antcall>      </antcall>
1231    
1232      <antcall target="clean"/>      <antcall target="clean"/>
1233      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1234        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1235        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1236      </antcall>      </antcall>
# Line 1077  Line 1238 
1238    
1239    
1240    <target name="jsr166e-test"    <target name="jsr166e-test"
1241            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1242            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1243    </target>    </target>
1244    
# Line 1107  Line 1268 
1268    
1269    <target name="lint">    <target name="lint">
1270      <antcall target="dists">      <antcall target="dists">
1271          <param name="build.javadoc.access" value="public"/>
1272        </antcall>
1273      </target>
1274    
1275    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1276      <target name="lint-private">
1277        <antcall target="dist">
1278        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1279      </antcall>      </antcall>
1280    </target>    </target>

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.183

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