[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.185, Wed Sep 30 17:48:05 2015 UTC revision 1.197, Fri Mar 4 21:00:45 2016 UTC
# Line 175  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 236  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"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <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 249  Line 249 
249            jvm="${java@{target}}"            jvm="${java@{target}}"
250            fork="true">            fork="true">
251          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252          <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>          <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="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
257            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
259              <propertyref name="test.timeout.factor"/>
260          </syspropertyset>          </syspropertyset>
261    
262          <classpath>          <classpath>
# Line 289  Line 290 
290      </patternset>      </patternset>
291    </fileset>    </fileset>
292    
293      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
294      <property name="jtreg.flags" value=""/>
295    
296    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
297      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
298      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
# Line 299  Line 303 
303    
304      <sequential>      <sequential>
305    
306        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
307        <property name="jtreg.verbose" value="nopass,fail,error"/>
308    
309      <local name="modules"/>      <local name="modules"/>
310      <condition property="modules">      <condition property="modules">
311        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/jmods" type="dir"/>
# Line 307  Line 314 
314      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
315      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
316      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
317      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
318        <mkdir dir="@{workdir}/JTreport/html"/>
319        <mkdir dir="@{workdir}/JTreport/text"/>
320      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
321             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
322             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
323             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
324        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
325        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
326        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
327        <arg value="-agentvm"/>        <arg value="-agentvm"/>
328        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
329        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
330        <arg value="-automatic"/>        <arg value="-automatic"/>
331        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
332        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
333          <arg line="${jtreg.flags}"/>
334      </jtreg>      </jtreg>
335      </sequential>      </sequential>
336    </macrodef>    </macrodef>
# Line 383  Line 393 
393        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
394    
395      </javac>      </javac>
396    
397        <!-- We need jdk9's Contended annotation, but at compile time only -->
398        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
399    </target>    </target>
400    
401    
# Line 593  Line 606 
606         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
607        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
608             source="${build.sourcelevel}"             source="${build.sourcelevel}"
609               target="${build.sourcelevel}"
610               fork="true">               fork="true">
611    
612        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 648  Line 662 
662             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
663             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
664             source="6"             source="6"
665               target="6"
666             classpath=""             classpath=""
667             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
668             includeAntRuntime="false"             includeAntRuntime="false"
# Line 677  Line 692 
692             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
693             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
694             source="6"             source="6"
695               target="6"
696             classpath=""             classpath=""
697             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
698             includeAntRuntime="false"             includeAntRuntime="false"
699             includeJavaRuntime="false"             includeJavaRuntime="false"
700             executable="${javac8}"             executable="${javac8}"
# Line 844  Line 860 
860             classpath=""             classpath=""
861             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
862             source="5"             source="5"
863               target="5"
864             includeAntRuntime="false"             includeAntRuntime="false"
865             includeJavaRuntime="false"             includeJavaRuntime="false"
866             executable="${javac7}"             executable="${javac7}"
# Line 933  Line 950 
950             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
951             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
952             source="6"             source="6"
953               target="6"
954             classpath=""             classpath=""
955             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
956             includeAntRuntime="false"             includeAntRuntime="false"
# Line 1027  Line 1045 
1045             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1046             classpath=""             classpath=""
1047             source="6"             source="6"
1048               target="6"
1049             includeAntRuntime="false"             includeAntRuntime="false"
1050             includeJavaRuntime="false"             includeJavaRuntime="false"
1051             executable="${javac7}"             executable="${javac7}"
# Line 1118  Line 1137 
1137             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1138             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1139             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1140               target="${build.jsr166e.java.version}"
1141             classpath=""             classpath=""
1142             includeAntRuntime="false"             includeAntRuntime="false"
1143             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1144  Line 1164 
1164             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1165             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1166             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1167               target="${build.jsr166e.java.version}"
1168             classpath=""             classpath=""
1169             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1170             includeAntRuntime="false"             includeAntRuntime="false"
1171             includeJavaRuntime="false"             includeJavaRuntime="false"
1172             executable="${javac8}"             executable="${javac8}"

Legend:
Removed from v.1.185  
changed lines
  Added in v.1.197

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8