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

Diff of /jsr166/build.xml

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

revision 1.187 by jsr166, Sun Oct 4 05:22:26 2015 UTC revision 1.198 by jsr166, Thu Mar 24 20:44:47 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 238  Line 238 
238        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
239        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <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="-verbose:nopass,fail,error"/>        <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 432  Line 445 
445        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
446        <arg value="-tag"/>        <arg value="-tag"/>
447        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
448    <!-- tags added in jdk9 -->
449          <arg value="-tag"/>
450          <arg value="revised:X"/>
451          <arg value="-tag"/>
452          <arg value="spec:X"/>
453      </javadoc>      </javadoc>
454    </target>    </target>
455    
# Line 593  Line 611 
611         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
612        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
613             source="${build.sourcelevel}"             source="${build.sourcelevel}"
614               target="${build.sourcelevel}"
615               fork="true">               fork="true">
616    
617        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 648  Line 667 
667             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
668             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
669             source="6"             source="6"
670               target="6"
671             classpath=""             classpath=""
672             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
673             includeAntRuntime="false"             includeAntRuntime="false"
# Line 677  Line 697 
697             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
698             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
699             source="6"             source="6"
700               target="6"
701             classpath=""             classpath=""
702             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
703             includeAntRuntime="false"             includeAntRuntime="false"
704             includeJavaRuntime="false"             includeJavaRuntime="false"
705             executable="${javac8}"             executable="${javac8}"
# Line 844  Line 865 
865             classpath=""             classpath=""
866             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
867             source="5"             source="5"
868               target="5"
869             includeAntRuntime="false"             includeAntRuntime="false"
870             includeJavaRuntime="false"             includeJavaRuntime="false"
871             executable="${javac7}"             executable="${javac7}"
# Line 933  Line 955 
955             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
956             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
957             source="6"             source="6"
958               target="6"
959             classpath=""             classpath=""
960             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
961             includeAntRuntime="false"             includeAntRuntime="false"
# Line 1027  Line 1050 
1050             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1051             classpath=""             classpath=""
1052             source="6"             source="6"
1053               target="6"
1054             includeAntRuntime="false"             includeAntRuntime="false"
1055             includeJavaRuntime="false"             includeJavaRuntime="false"
1056             executable="${javac7}"             executable="${javac7}"
# Line 1118  Line 1142 
1142             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1143             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1144             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1145               target="${build.jsr166e.java.version}"
1146             classpath=""             classpath=""
1147             includeAntRuntime="false"             includeAntRuntime="false"
1148             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1144  Line 1169 
1169             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1170             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1171             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1172               target="${build.jsr166e.java.version}"
1173             classpath=""             classpath=""
1174             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1175             includeAntRuntime="false"             includeAntRuntime="false"
1176             includeJavaRuntime="false"             includeJavaRuntime="false"
1177             executable="${javac8}"             executable="${javac8}"

Legend:
Removed from v.1.187  
changed lines
  Added in v.1.198

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