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

Diff of /jsr166/build.xml

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

revision 1.181 by jsr166, Sun Sep 13 05:26:02 2015 UTC revision 1.196 by jsr166, Sat Jan 2 21:02:44 2016 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 102  Line 96 
96        if:set="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="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 179  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 198  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 212  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 231  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="-Xpatch:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
243        <javac-elements/>        <javac-elements/>
244    
# Line 242  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="-Xpatch:${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 284  Line 289 
289      </patternset>      </patternset>
290    </fileset>    </fileset>
291    
292      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
293      <property name="jtreg.flags" value=""/>
294    
295    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
296      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
297      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
# Line 291  Line 299 
299      <attribute name="workdir"/>      <attribute name="workdir"/>
300      <attribute name="classes"/>      <attribute name="classes"/>
301      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
302    
303      <sequential>      <sequential>
304    
305        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
306        <property name="jtreg.verbose" value="nopass,fail,error"/>
307    
308        <local name="modules"/>
309        <condition property="modules">
310          <available file="${jdk@{target}.home}/jmods" type="dir"/>
311        </condition>
312    
313      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
314      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
315      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
316      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
317        <mkdir dir="@{workdir}/JTreport/html"/>
318        <mkdir dir="@{workdir}/JTreport/text"/>
319      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
320             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
321             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
322             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
323        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
324        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
325          <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
326        <arg value="-agentvm"/>        <arg value="-agentvm"/>
327        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
328        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
329        <arg value="-automatic"/>        <arg value="-automatic"/>
330        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
331        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
332          <arg line="${jtreg.flags}"/>
333      </jtreg>      </jtreg>
334      </sequential>      </sequential>
335    </macrodef>    </macrodef>
# Line 334  Line 356 
356            depends="configure-compiler"            depends="configure-compiler"
357            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
358    
359      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
360        <condition property="modules">
361          <and>
362            <available file="${jdk9.home}/jmods" type="dir"/>
363            <equals arg1="9" arg2="${build.main.java.version}"/>
364          </and>
365        </condition>
366    
367        <local name="destdir"/>
368        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
369        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
370    
371        <mkdir dir="${destdir}"/>
372    
373      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
374             destdir="${build.classes.dir}"             destdir="${destdir}"
375             debug="${build.debug}"             debug="${build.debug}"
376             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
377             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 348  Line 382 
382             fork="true">             fork="true">
383    
384        <include name="**/*.java"/>        <include name="**/*.java"/>
385          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
386        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
387        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
388        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 357  Line 392 
392        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
393    
394      </javac>      </javac>
395    
396        <!-- We need jdk9's Contended annotation, but at compile time only -->
397        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
398    </target>    </target>
399    
400    
# Line 397  Line 435 
435        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
436        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
437        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
438    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
439        <arg value="-tag"/>        <arg value="-tag"/>
440        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
441        <arg value="-tag"/>        <arg value="-tag"/>
# Line 566  Line 605 
605         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
606        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
607             source="${build.sourcelevel}"             source="${build.sourcelevel}"
608               target="${build.sourcelevel}"
609               fork="true">               fork="true">
610    
611        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 621  Line 661 
661             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
662             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
663             source="6"             source="6"
664               target="6"
665             classpath=""             classpath=""
666             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
667             includeAntRuntime="false"             includeAntRuntime="false"
# Line 650  Line 691 
691             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
692             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
693             source="6"             source="6"
694               target="6"
695             classpath=""             classpath=""
696             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
697             includeAntRuntime="false"             includeAntRuntime="false"
698             includeJavaRuntime="false"             includeJavaRuntime="false"
699             executable="${javac8}"             executable="${javac8}"
# Line 817  Line 859 
859             classpath=""             classpath=""
860             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
861             source="5"             source="5"
862               target="5"
863             includeAntRuntime="false"             includeAntRuntime="false"
864             includeJavaRuntime="false"             includeJavaRuntime="false"
865             executable="${javac7}"             executable="${javac7}"
# Line 906  Line 949 
949             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
950             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
951             source="6"             source="6"
952               target="6"
953             classpath=""             classpath=""
954             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
955             includeAntRuntime="false"             includeAntRuntime="false"
# Line 1000  Line 1044 
1044             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1045             classpath=""             classpath=""
1046             source="6"             source="6"
1047               target="6"
1048             includeAntRuntime="false"             includeAntRuntime="false"
1049             includeJavaRuntime="false"             includeJavaRuntime="false"
1050             executable="${javac7}"             executable="${javac7}"
# Line 1091  Line 1136 
1136             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1137             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1138             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1139               target="${build.jsr166e.java.version}"
1140             classpath=""             classpath=""
1141             includeAntRuntime="false"             includeAntRuntime="false"
1142             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1117  Line 1163 
1163             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1164             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1165             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1166               target="${build.jsr166e.java.version}"
1167             classpath=""             classpath=""
1168             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1169             includeAntRuntime="false"             includeAntRuntime="false"
1170             includeJavaRuntime="false"             includeJavaRuntime="false"
1171             executable="${javac8}"             executable="${javac8}"

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

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