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

Diff of /jsr166/build.xml

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

revision 1.164, Wed May 20 06:13:09 2015 UTC revision 1.199, Fri Mar 25 03:36:15 2016 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 26  Line 27 
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:    Alternatively, define ant variables thus:
30    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
31    for $N in 6 7 8 9 ...    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.home="$HOME/jdk/src/jigsaw" clean test dist
36      "docs" target is still broken.
37  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
38    </description>    </description>
39    
# Line 38  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 50  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  
    To profile a single tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck  
    To stress test a single 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"/>  
   <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 93  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"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
93        <local name="have.java.base"/>
94        <available property="have.java.base"
95          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97          if:set="have.java.base"/>
98        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99          unless:set="have.java.base"/>
100        <local name="modules"/>
101        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
102      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
103      <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"/>
104      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
105        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
106        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
107        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
108        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
109        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
110      </path>      </path>
111      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
112      </sequential>      </sequential>
113    </macrodef>    </macrodef>
114    
# Line 129  Line 134 
134    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
135    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
136    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
137    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
138      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
139      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
140      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
141    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
142    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
143    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 168  Line 176 
176    <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"/>
177    <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"/>
178    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
179    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2015-11 -->
180    <!-- <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"/> -->
181    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
182    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 187  Line 195 
195    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
196             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
197    
198    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
199    <path id="test.classpath">     To profile a single tck test class:
200      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
201      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
202    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
203       To stress test a single tck test method:
204       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
205      -->
206      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
207    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
208      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
209      <attribute name="target"/>      <attribute name="target"/>
# Line 201  Line 212 
212      <attribute name="classes"/>      <attribute name="classes"/>
213      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
215    
216      <sequential>      <sequential>
217    
218        <local name="modules"/>
219        <condition property="modules">
220          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
221        </condition>
222    
223      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
224    
225      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 220  Line 237 
237    
238        <include name="*.java"/>        <include name="*.java"/>
239        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
240        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
241        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
242          <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
243        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
244        <javac-elements/>        <javac-elements/>
245    
# Line 231  Line 249 
249            failonerror="true"            failonerror="true"
250            jvm="${java@{target}}"            jvm="${java@{target}}"
251            fork="true">            fork="true">
252          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
253            <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
254          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
255    
256          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
257          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
258            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
259              <propertyref prefix="jsr166."/>
260              <propertyref name="test.timeout.factor"/>
261          </syspropertyset>          </syspropertyset>
262    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
263          <classpath>          <classpath>
264            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
265            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 251  Line 269 
269      </sequential>      </sequential>
270    </macrodef>    </macrodef>
271    
272      <!-- Define jtreg test sets for different jdk versions -->
273      <fileset dir="${jtreg9.src.dir}">
274        <patternset id="jdk9.jtreg.tests">
275          <include name="**/*.java"/>
276        </patternset>
277      </fileset>
278    
279      <fileset dir="${jtreg8.src.dir}">
280        <patternset id="jdk8.jtreg.tests">
281          <include name="**/*.java"/>
282          <exclude name="**/SpliteratorCharacteristics.java"/>
283          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
284          <exclude name="**/GCDuringIteration.java"/>
285        </patternset>
286      </fileset>
287    
288      <fileset dir="${jtreg7.src.dir}">
289        <patternset id="jdk7.jtreg.tests">
290          <include name="**/*.java"/>
291        </patternset>
292      </fileset>
293    
294      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
295      <property name="jtreg.flags" value=""/>
296    
297    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
298      <!-- 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}"/>  
299      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
300      <attribute name="target"/>      <attribute name="target"/>
301      <attribute name="workdir"/>      <attribute name="workdir"/>
302      <attribute name="classes"/>      <attribute name="classes"/>
303      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
304    
305      <sequential>      <sequential>
306    
307        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
308        <property name="jtreg.verbose" value="nopass,fail,error"/>
309    
310        <local name="modules"/>
311        <condition property="modules">
312          <available file="${jdk@{target}.home}/jmods" type="dir"/>
313        </condition>
314    
315      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
316      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
317      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
318      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
319      <jtreg dir="@{jtreg.src.dir}"      <mkdir dir="@{workdir}/JTreport/html"/>
320        <mkdir dir="@{workdir}/JTreport/text"/>
321        <jtreg dir="${jtreg@{target}.src.dir}"
322             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
323             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
324             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
325          <patternset refid="jdk@{target}.jtreg.tests"/>
326        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
327          <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
328        <arg value="-agentvm"/>        <arg value="-agentvm"/>
329        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
330        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
331        <arg value="-automatic"/>        <arg value="-automatic"/>
332        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
333        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
334          <arg line="${jtreg.flags}"/>
335      </jtreg>      </jtreg>
336      </sequential>      </sequential>
337    </macrodef>    </macrodef>
# Line 302  Line 358 
358            depends="configure-compiler"            depends="configure-compiler"
359            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
360    
361      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
362        <condition property="modules">
363          <and>
364            <available file="${jdk9.home}/jmods" type="dir"/>
365            <equals arg1="9" arg2="${build.main.java.version}"/>
366          </and>
367        </condition>
368    
369        <local name="destdir"/>
370        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
371        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
372    
373        <mkdir dir="${destdir}"/>
374    
375      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
376             destdir="${build.classes.dir}"             destdir="${destdir}"
377             debug="${build.debug}"             debug="${build.debug}"
378             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
379             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 316  Line 384 
384             fork="true">             fork="true">
385    
386        <include name="**/*.java"/>        <include name="**/*.java"/>
387          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
388        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
389        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
390        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 325  Line 394 
394        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
395    
396      </javac>      </javac>
397    
398        <!-- We need jdk9's Contended annotation, but at compile time only -->
399        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
400    </target>    </target>
401    
402    
# Line 334  Line 406 
406    
407      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
408        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
409          <manifest>
410            <attribute name="Built-By" value="${user.name}"/>
411            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
412          </manifest>
413      </jar>      </jar>
414    </target>    </target>
415    
# Line 352  Line 428 
428               link="${java9.api.url}"               link="${java9.api.url}"
429               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
430               access="${build.javadoc.access}"               access="${build.javadoc.access}"
431               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
432               classpath=""               classpath=""
433               executable="${javadoc9}">               executable="${javadoc9}">
434        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 361  Line 437 
437        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
438        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
440    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
441        <arg value="-tag"/>        <arg value="-tag"/>
442        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
443        <arg value="-tag"/>        <arg value="-tag"/>
# Line 369  Line 446 
446        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
447        <arg value="-tag"/>        <arg value="-tag"/>
448        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
449    <!-- tags added in jdk9 -->
450          <arg value="-tag"/>
451          <arg value="revised:X"/>
452          <arg value="-tag"/>
453          <arg value="spec:X"/>
454      </javadoc>      </javadoc>
455    </target>    </target>
456    
# Line 392  Line 474 
474        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
475        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
476        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
477          <manifest>
478            <attribute name="Built-By" value="${user.name}"/>
479            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
480          </manifest>
481      </jar>      </jar>
482    </target>    </target>
483    
# Line 423  Line 509 
509      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
510    </target>    </target>
511    
512    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
513            depends="jar"            depends="jar"
514            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
515    
# Line 434  Line 519 
519        classes="${product.jar}"/>        classes="${product.jar}"/>
520    </target>    </target>
521    
522    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
523            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
524      <antcall target="test-tck">      <antcall target="tck">
525        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
526      </antcall>      </antcall>
527    </target>    </target>
528    
529    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
530            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
531      <antcall target="test-tck">      <antcall target="tck">
532        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
533      </antcall>      </antcall>
534    </target>    </target>
535    
536    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
537            depends="jar"            depends="jar"
538            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
539      <run-jtreg-tests      <run-jtreg-tests
# Line 459  Line 543 
543    </target>    </target>
544    
545    <target name="test"    <target name="test"
546            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
547            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
548    </target>    </target>
549    
550      <target name="jtreg8" description="Runs jtreg tests with jdk8">
551    
552        <antcall target="jtreg">
553          <param name="build.main.java.version" value="8"/>
554          <param name="build.main.javac" value="${javac8}"/>
555        </antcall>
556    
557      </target>
558    
559    <target name="test89"    <target name="test89"
560            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
561    
# Line 483  Line 576 
576    
577    
578    <target name="configure-compiler">    <target name="configure-compiler">
579        <fail message="ant version too old">
580          <condition>
581            <not> <antversion atleast="1.9.1"/> </not>
582          </condition>
583        </fail>
584    
585      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
586    
# Line 514  Line 612 
612         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
613        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
614             source="${build.sourcelevel}"             source="${build.sourcelevel}"
615               target="${build.sourcelevel}"
616               fork="true">               fork="true">
617    
618        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 529  Line 628 
628    </target>    </target>
629    
630    
631      <target name="compile-test-loops" depends="jar"
632              description="compile all the perf tests in src/test/loops">
633    
634        <mkdir dir="${build.dir}/test/loops"/>
635    
636        <javac srcdir="${basedir}/src/test/loops"
637               destdir="${build.dir}/test/loops"
638               debug="${build.debug}"
639               debuglevel="${build.debuglevel}"
640               deprecation="${build.deprecation}"
641               includeAntRuntime="false"
642               includeJavaRuntime="false"
643               executable="${javac9}"
644               fork="true">
645    
646          <include name="*.java"/>
647          <compilerarg value="-XDignore.symbol.file=true"/>
648          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
649          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
650          <compilerarg line="${build.args}"/>
651    
652        </javac>
653    
654      </target>
655    
656    
657    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
658    
659    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 543  Line 668 
668             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
669             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
670             source="6"             source="6"
671               target="6"
672             classpath=""             classpath=""
673             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
674             includeAntRuntime="false"             includeAntRuntime="false"
# Line 572  Line 698 
698             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
699             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
700             source="6"             source="6"
701               target="6"
702             classpath=""             classpath=""
703             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
704             includeAntRuntime="false"             includeAntRuntime="false"
705             includeJavaRuntime="false"             includeJavaRuntime="false"
706             executable="${javac8}"             executable="${javac8}"
# Line 596  Line 723 
723    
724      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
725        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
726          <manifest>
727            <attribute name="Built-By" value="${user.name}"/>
728            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
729          </manifest>
730      </jar>      </jar>
731    
732    </target>    </target>
733    
734    
735    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
736            depends="4jdk7jar"            depends="4jdk7jar"
737            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
738    
# Line 613  Line 744 
744          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
745          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
746          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
747            <exclude name="*10Test.java"/>
748          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
749          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
750          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 620  Line 752 
752          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
753          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
754          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
755            <exclude name="SubmissionPublisherTest.java"/>
756        </javac-elements>        </javac-elements>
757      </run-tck-tests>      </run-tck-tests>
758    </target>    </target>
759    
760    
761    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
762            depends="4jdk7compile"            depends="4jdk7compile"
763            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
764    
# Line 653  Line 786 
786      </junit>      </junit>
787    </target>    </target>
788    
789    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
790            depends="4jdk7jar"            depends="4jdk7jar"
791            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
792      <run-jtreg-tests      <run-jtreg-tests
793         target="7"         target="7"
794         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
795         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
796    </target>    </target>
797    
798    
799    <target name="4jdk7-test"    <target name="4jdk7-test"
800            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
801            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
802    </target>    </target>
803    
# Line 681  Line 813 
813               link="${java7.api.url}"               link="${java7.api.url}"
814               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
815               access="${build.javadoc.access}"               access="${build.javadoc.access}"
816               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817               classpath=""               classpath=""
818               executable="${javadoc7}">               executable="${javadoc7}">
819        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
# Line 734  Line 866 
866             classpath=""             classpath=""
867             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
868             source="5"             source="5"
869               target="5"
870             includeAntRuntime="false"             includeAntRuntime="false"
871             includeJavaRuntime="false"             includeJavaRuntime="false"
872             executable="${javac7}"             executable="${javac7}"
# Line 755  Line 888 
888    
889      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
890        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
891          <manifest>
892            <attribute name="Built-By" value="${user.name}"/>
893            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
894          </manifest>
895      </jar>      </jar>
896    
897    </target>    </target>
# Line 770  Line 907 
907               packagenames="jsr166x.*"               packagenames="jsr166x.*"
908               link="${java.api.url}"               link="${java.api.url}"
909               access="${build.javadoc.access}"               access="${build.javadoc.access}"
910               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
912               source="5"               source="5"
913               executable="${javadoc7}">               executable="${javadoc7}">
# Line 819  Line 956 
956             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
957             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
958             source="6"             source="6"
959               target="6"
960             classpath=""             classpath=""
961             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
962             includeAntRuntime="false"             includeAntRuntime="false"
# Line 842  Line 980 
980    
981      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
982        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
983          <manifest>
984            <attribute name="Built-By" value="${user.name}"/>
985            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
986          </manifest>
987      </jar>      </jar>
988    
989    </target>    </target>
# Line 857  Line 999 
999               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1000               link="${java.api.url}"               link="${java.api.url}"
1001               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1002               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1004               source="6"               source="6"
1005               executable="${javadoc7}">               executable="${javadoc7}">
# Line 909  Line 1051 
1051             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1052             classpath=""             classpath=""
1053             source="6"             source="6"
1054               target="6"
1055             includeAntRuntime="false"             includeAntRuntime="false"
1056             includeJavaRuntime="false"             includeJavaRuntime="false"
1057             executable="${javac7}"             executable="${javac7}"
# Line 930  Line 1073 
1073    
1074      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1075        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1076          <manifest>
1077            <attribute name="Built-By" value="${user.name}"/>
1078            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1079          </manifest>
1080      </jar>      </jar>
1081    
1082    </target>    </target>
# Line 945  Line 1092 
1092               packagenames="extra166y.*"               packagenames="extra166y.*"
1093               link="${java.api.url}"               link="${java.api.url}"
1094               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1095               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1097               source="6"               source="6"
1098               executable="${javadoc7}">               executable="${javadoc7}">
# Line 996  Line 1143 
1143             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1144             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1145             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1146               target="${build.jsr166e.java.version}"
1147             classpath=""             classpath=""
1148             includeAntRuntime="false"             includeAntRuntime="false"
1149             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1022  Line 1170 
1170             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1171             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1172             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1173               target="${build.jsr166e.java.version}"
1174             classpath=""             classpath=""
1175             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1176             includeAntRuntime="false"             includeAntRuntime="false"
1177             includeJavaRuntime="false"             includeJavaRuntime="false"
1178             executable="${javac8}"             executable="${javac8}"
# Line 1045  Line 1194 
1194    
1195      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1196        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1197          <manifest>
1198            <attribute name="Built-By" value="${user.name}"/>
1199            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200          </manifest>
1201      </jar>      </jar>
1202    
1203    </target>    </target>
# Line 1060  Line 1213 
1213               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1214               link="${java.api.url}"               link="${java.api.url}"
1215               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1216               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1218               executable="${javadoc7}">               executable="${javadoc7}">
1219        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
# Line 1070  Line 1223 
1223    </target>    </target>
1224    
1225    
1226    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1227            depends="jsr166ejar">            depends="jsr166ejar">
1228    
1229      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1082  Line 1235 
1235        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1236    </target>    </target>
1237    
1238    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1239            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1240    
1241  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1242  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1243  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1244  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1245  <!--     </antcall> -->  <!--     </antcall> -->
1246    
1247      <antcall target="clean"/>      <antcall target="clean"/>
1248      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1249        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1250        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1251      </antcall>      </antcall>
1252    
1253      <antcall target="clean"/>      <antcall target="clean"/>
1254      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1255        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1256        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1257      </antcall>      </antcall>
# Line 1106  Line 1259 
1259    
1260    
1261    <target name="jsr166e-test"    <target name="jsr166e-test"
1262            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1263            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1264    </target>    </target>
1265    

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.199

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8