/[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.189 by jsr166, Thu Nov 5 15:02:34 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 186  Line 194 
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
196    
197    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
198    <path id="test.classpath">     To profile a single tck test class:
199      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
201    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202       To stress test a single tck test method:
203       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204      -->
205      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208      <attribute name="target"/>      <attribute name="target"/>
# Line 200  Line 211 
211      <attribute name="classes"/>      <attribute name="classes"/>
212      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
214    
215      <sequential>      <sequential>
216    
217        <local name="modules"/>
218        <condition property="modules">
219          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220        </condition>
221    
222      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
223    
224      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 212  Line 229 
229             source="@{compile-target}"             source="@{compile-target}"
230             target="@{compile-target}"             target="@{compile-target}"
231             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
232             includeAntRuntime="false"             includeAntRuntime="false"
233             includeJavaRuntime="false"             includeJavaRuntime="false"
234             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 220  Line 236 
236    
237        <include name="*.java"/>        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
239        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241          <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
243        <javac-elements/>        <javac-elements/>
244    
# Line 230  Line 248 
248            failonerror="true"            failonerror="true"
249            jvm="${java@{target}}"            jvm="${java@{target}}"
250            fork="true">            fork="true">
251          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252            <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
253          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
254          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
255          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <syspropertyset id="system-properties-used-by-tck">
257              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258              <propertyref prefix="jsr166."/>
259            </syspropertyset>
260    
261          <classpath>          <classpath>
262            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 244  Line 267 
267      </sequential>      </sequential>
268    </macrodef>    </macrodef>
269    
270      <!-- Define jtreg test sets for different jdk versions -->
271      <fileset dir="${jtreg9.src.dir}">
272        <patternset id="jdk9.jtreg.tests">
273          <include name="**/*.java"/>
274        </patternset>
275      </fileset>
276    
277      <fileset dir="${jtreg8.src.dir}">
278        <patternset id="jdk8.jtreg.tests">
279          <include name="**/*.java"/>
280          <exclude name="**/SpliteratorCharacteristics.java"/>
281          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282          <exclude name="**/GCDuringIteration.java"/>
283        </patternset>
284      </fileset>
285    
286      <fileset dir="${jtreg7.src.dir}">
287        <patternset id="jdk7.jtreg.tests">
288          <include name="**/*.java"/>
289        </patternset>
290      </fileset>
291    
292    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
293      <!-- 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}"/>  
294      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
295      <attribute name="target"/>      <attribute name="target"/>
296      <attribute name="workdir"/>      <attribute name="workdir"/>
297      <attribute name="classes"/>      <attribute name="classes"/>
298      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
299    
300      <sequential>      <sequential>
301    
302        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303        <property name="jtreg.verbose" value="nopass,fail,error"/>
304    
305        <local name="modules"/>
306        <condition property="modules">
307          <available file="${jdk@{target}.home}/jmods" type="dir"/>
308        </condition>
309    
310      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
312      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
313      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
314      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
315             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
316             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
317             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
318          <patternset refid="jdk@{target}.jtreg.tests"/>
319        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321        <arg value="-agentvm"/>        <arg value="-agentvm"/>
322        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
323        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
324        <arg value="-automatic"/>        <arg value="-automatic"/>
325        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 295  Line 350 
350            depends="configure-compiler"            depends="configure-compiler"
351            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
352    
353      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
354        <condition property="modules">
355          <and>
356            <available file="${jdk9.home}/jmods" type="dir"/>
357            <equals arg1="9" arg2="${build.main.java.version}"/>
358          </and>
359        </condition>
360    
361        <local name="destdir"/>
362        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
363        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
364    
365        <mkdir dir="${destdir}"/>
366    
367      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
368             destdir="${build.classes.dir}"             destdir="${destdir}"
369             debug="${build.debug}"             debug="${build.debug}"
370             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
371             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 309  Line 376 
376             fork="true">             fork="true">
377    
378        <include name="**/*.java"/>        <include name="**/*.java"/>
379          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
380        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
381        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
382        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
383          <compilerarg value="-Werror"/>
384        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
385        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
386        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 326  Line 395 
395    
396      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
397        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
398          <manifest>
399            <attribute name="Built-By" value="${user.name}"/>
400            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
401          </manifest>
402      </jar>      </jar>
403    </target>    </target>
404    
# Line 353  Line 426 
426        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
427        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
428        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
429    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
430        <arg value="-tag"/>        <arg value="-tag"/>
431        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
432        <arg value="-tag"/>        <arg value="-tag"/>
# Line 384  Line 458 
458        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
459        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
460        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
461          <manifest>
462            <attribute name="Built-By" value="${user.name}"/>
463            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
464          </manifest>
465      </jar>      </jar>
466    </target>    </target>
467    
# Line 415  Line 493 
493      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
494    </target>    </target>
495    
496      <target name="tck"
   <target name="test-tck"  
497            depends="jar"            depends="jar"
498            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
499    
# Line 426  Line 503 
503        classes="${product.jar}"/>        classes="${product.jar}"/>
504    </target>    </target>
505    
506    <target name="test-jtreg"    <target name="tck-parallelism-1"
507              description="Runs tck with given common pool parallelism">
508        <antcall target="tck">
509          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
510        </antcall>
511      </target>
512    
513      <target name="tck-parallelism-0"
514              description="Runs tck with given common pool parallelism">
515        <antcall target="tck">
516          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
517        </antcall>
518      </target>
519    
520      <target name="jtreg"
521            depends="jar"            depends="jar"
522            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
523      <run-jtreg-tests      <run-jtreg-tests
# Line 436  Line 527 
527    </target>    </target>
528    
529    <target name="test"    <target name="test"
530            depends="test-tck, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
531            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
532    </target>    </target>
533    
534      <target name="jtreg8" description="Runs jtreg tests with jdk8">
535    
536        <antcall target="jtreg">
537          <param name="build.main.java.version" value="8"/>
538          <param name="build.main.javac" value="${javac8}"/>
539        </antcall>
540    
541      </target>
542    
543    <target name="test89"    <target name="test89"
544            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
545    
# Line 460  Line 560 
560    
561    
562    <target name="configure-compiler">    <target name="configure-compiler">
563        <fail message="ant version too old">
564          <condition>
565            <not> <antversion atleast="1.9.1"/> </not>
566          </condition>
567        </fail>
568    
569      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
570    
# Line 506  Line 611 
611    </target>    </target>
612    
613    
614      <target name="compile-test-loops" depends="jar"
615              description="compile all the perf tests in src/test/loops">
616    
617        <mkdir dir="${build.dir}/test/loops"/>
618    
619        <javac srcdir="${basedir}/src/test/loops"
620               destdir="${build.dir}/test/loops"
621               debug="${build.debug}"
622               debuglevel="${build.debuglevel}"
623               deprecation="${build.deprecation}"
624               includeAntRuntime="false"
625               includeJavaRuntime="false"
626               executable="${javac9}"
627               fork="true">
628    
629          <include name="*.java"/>
630          <compilerarg value="-XDignore.symbol.file=true"/>
631          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
632          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
633          <compilerarg line="${build.args}"/>
634    
635        </javac>
636    
637      </target>
638    
639    
640    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
641    
642    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 531  Line 662 
662        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
664        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
665          <compilerarg value="-Werror"/>
666        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
667    
668      </javac>      </javac>
# Line 572  Line 704 
704    
705      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
706        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
707          <manifest>
708            <attribute name="Built-By" value="${user.name}"/>
709            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
710          </manifest>
711      </jar>      </jar>
712    
713    </target>    </target>
714    
715    
716    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
717            depends="4jdk7jar"            depends="4jdk7jar"
718            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
719    
# Line 589  Line 725 
725          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
726          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
727          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
728            <exclude name="*10Test.java"/>
729          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
730          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
731          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 596  Line 733 
733          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
734          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
735          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
736            <exclude name="SubmissionPublisherTest.java"/>
737        </javac-elements>        </javac-elements>
738      </run-tck-tests>      </run-tck-tests>
739    </target>    </target>
740    
741    
742    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
743            depends="4jdk7compile"            depends="4jdk7compile"
744            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
745    
# Line 629  Line 767 
767      </junit>      </junit>
768    </target>    </target>
769    
770    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
771            depends="4jdk7jar"            depends="4jdk7jar"
772            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
773      <run-jtreg-tests      <run-jtreg-tests
774         target="7"         target="7"
775         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
776         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
777    </target>    </target>
778    
779    
780    <target name="4jdk7-test"    <target name="4jdk7-test"
781            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
782            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
783    </target>    </target>
784    
# Line 718  Line 855 
855        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
856        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
857        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
858          <compilerarg value="-Werror"/>
859        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
860    
861      </javac>      </javac>
# Line 730  Line 868 
868    
869      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
870        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
871          <manifest>
872            <attribute name="Built-By" value="${user.name}"/>
873            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
874          </manifest>
875      </jar>      </jar>
876    
877    </target>    </target>
# Line 794  Line 936 
936             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
937             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
938             source="6"             source="6"
939               target="6"
940             classpath=""             classpath=""
941             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
942             includeAntRuntime="false"             includeAntRuntime="false"
# Line 804  Line 947 
947        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
948        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
949        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
950          <compilerarg value="-Werror"/>
951        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
952    
953      </javac>      </javac>
# Line 816  Line 960 
960    
961      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
962        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
963          <manifest>
964            <attribute name="Built-By" value="${user.name}"/>
965            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
966          </manifest>
967      </jar>      </jar>
968    
969    </target>    </target>
# Line 891  Line 1039 
1039        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1040        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1041        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1042          <compilerarg value="-Werror"/>
1043        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1044    
1045      </javac>      </javac>
# Line 903  Line 1052 
1052    
1053      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1054        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1055          <manifest>
1056            <attribute name="Built-By" value="${user.name}"/>
1057            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1058          </manifest>
1059      </jar>      </jar>
1060    
1061    </target>    </target>
# Line 978  Line 1131 
1131        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1132        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1133        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1134          <compilerarg value="-Werror"/>
1135        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1136    
1137      </javac>      </javac>
# Line 1004  Line 1158 
1158        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1159        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1160        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1161          <compilerarg value="-Werror"/>
1162        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1163    
1164      </javac>      </javac>
# Line 1016  Line 1171 
1171    
1172      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1173        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1174          <manifest>
1175            <attribute name="Built-By" value="${user.name}"/>
1176            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1177          </manifest>
1178      </jar>      </jar>
1179    
1180    </target>    </target>
# Line 1041  Line 1200 
1200    </target>    </target>
1201    
1202    
1203    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1204            depends="jsr166ejar">            depends="jsr166ejar">
1205    
1206      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1053  Line 1212 
1212        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1213    </target>    </target>
1214    
1215    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1216            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1217    
1218  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1219  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1220  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1221  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1222  <!--     </antcall> -->  <!--     </antcall> -->
1223    
1224      <antcall target="clean"/>      <antcall target="clean"/>
1225      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1226        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1227        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1228      </antcall>      </antcall>
1229    
1230      <antcall target="clean"/>      <antcall target="clean"/>
1231      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1232        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1233        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1234      </antcall>      </antcall>
# Line 1077  Line 1236 
1236    
1237    
1238    <target name="jsr166e-test"    <target name="jsr166e-test"
1239            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1240            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1241    </target>    </target>
1242    
# Line 1107  Line 1266 
1266    
1267    <target name="lint">    <target name="lint">
1268      <antcall target="dists">      <antcall target="dists">
1269          <param name="build.javadoc.access" value="public"/>
1270        </antcall>
1271      </target>
1272    
1273    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1274      <target name="lint-private">
1275        <antcall target="dist">
1276        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1277      </antcall>      </antcall>
1278    </target>    </target>

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

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