[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.179, Sun Sep 13 03:22:29 2015 UTC revision 1.194, Wed Dec 16 02:29:06 2015 UTC
# Line 29  Line 29 
29    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
30    ant -Djdk$N.home=...    ant -Djdk$N.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.dir="$HOME/jdk/src/jigsaw" clean test dist
36      "docs" target is still broken.
37  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
38    </description>    </description>
39    
# Line 52  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=10 -Djsr166.tckTestClass=CompletableFutureTest tck  
    To stress test a single tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 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 95  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      <available property="jdk@{v}.have.java.base"      <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"/>        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"      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96        if:set="jdk@{v}.have.java.base"/>        if:set="have.java.base"/>
97      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98        unless:set="jdk@{v}.have.java.base"/>        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 178  Line 175 
175    <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"/>
176    <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"/>
177    <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"/>
178    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2015-11 -->
179    <!-- <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"/> -->
180    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 197  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 211  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 230  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}"/>        <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 241  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    
255          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
257            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258              <propertyref prefix="jsr166."/>
259          </syspropertyset>          </syspropertyset>
260    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
261          <classpath>          <classpath>
262            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 290  Line 296 
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"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314        <mkdir dir="@{workdir}/JTreport/html"/>
315        <mkdir dir="@{workdir}/JTreport/text"/>
316      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
317             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
318             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
319             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
320        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
321        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
322          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
323        <arg value="-agentvm"/>        <arg value="-agentvm"/>
324        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
325        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
326        <arg value="-automatic"/>        <arg value="-automatic"/>
327        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 333  Line 352 
352            depends="configure-compiler"            depends="configure-compiler"
353            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
354    
355      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
356        <condition property="modules">
357          <and>
358            <available file="${jdk9.home}/jmods" type="dir"/>
359            <equals arg1="9" arg2="${build.main.java.version}"/>
360          </and>
361        </condition>
362    
363        <local name="destdir"/>
364        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
365        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
366    
367        <mkdir dir="${destdir}"/>
368    
369      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
370             destdir="${build.classes.dir}"             destdir="${destdir}"
371             debug="${build.debug}"             debug="${build.debug}"
372             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
373             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 347  Line 378 
378             fork="true">             fork="true">
379    
380        <include name="**/*.java"/>        <include name="**/*.java"/>
381          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
382        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
383        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
384        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 356  Line 388 
388        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
389    
390      </javac>      </javac>
391    
392        <!-- We need jdk9's Contended annotation, but at compile time only -->
393        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
394    </target>    </target>
395    
396    
# Line 396  Line 431 
431        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
432        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
433        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
434    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
435        <arg value="-tag"/>        <arg value="-tag"/>
436        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
437        <arg value="-tag"/>        <arg value="-tag"/>
# Line 529  Line 565 
565    
566    
567    <target name="configure-compiler">    <target name="configure-compiler">
568        <fail message="ant version too old">
569          <condition>
570            <not> <antversion atleast="1.9.1"/> </not>
571          </condition>
572        </fail>
573    
574      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
575    
# Line 560  Line 601 
601         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
602        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
603             source="${build.sourcelevel}"             source="${build.sourcelevel}"
604               target="${build.sourcelevel}"
605               fork="true">               fork="true">
606    
607        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 615  Line 657 
657             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
658             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
659             source="6"             source="6"
660               target="6"
661             classpath=""             classpath=""
662             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
663             includeAntRuntime="false"             includeAntRuntime="false"
# Line 644  Line 687 
687             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
688             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
689             source="6"             source="6"
690               target="6"
691             classpath=""             classpath=""
692             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
693             includeAntRuntime="false"             includeAntRuntime="false"
694             includeJavaRuntime="false"             includeJavaRuntime="false"
695             executable="${javac8}"             executable="${javac8}"
# Line 811  Line 855 
855             classpath=""             classpath=""
856             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
857             source="5"             source="5"
858               target="5"
859             includeAntRuntime="false"             includeAntRuntime="false"
860             includeJavaRuntime="false"             includeJavaRuntime="false"
861             executable="${javac7}"             executable="${javac7}"
# Line 900  Line 945 
945             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
946             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
947             source="6"             source="6"
948               target="6"
949             classpath=""             classpath=""
950             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
951             includeAntRuntime="false"             includeAntRuntime="false"
# Line 994  Line 1040 
1040             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1041             classpath=""             classpath=""
1042             source="6"             source="6"
1043               target="6"
1044             includeAntRuntime="false"             includeAntRuntime="false"
1045             includeJavaRuntime="false"             includeJavaRuntime="false"
1046             executable="${javac7}"             executable="${javac7}"
# Line 1085  Line 1132 
1132             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1133             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1134             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1135               target="${build.jsr166e.java.version}"
1136             classpath=""             classpath=""
1137             includeAntRuntime="false"             includeAntRuntime="false"
1138             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1111  Line 1159 
1159             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1160             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1161             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1162               target="${build.jsr166e.java.version}"
1163             classpath=""             classpath=""
1164             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1165             includeAntRuntime="false"             includeAntRuntime="false"
1166             includeJavaRuntime="false"             includeJavaRuntime="false"
1167             executable="${javac8}"             executable="${javac8}"

Legend:
Removed from v.1.179  
changed lines
  Added in v.1.194

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8