/[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.195 by jsr166, Thu Dec 17 23:55:06 2015 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 289  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 299  Line 302 
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"/>      <local name="modules"/>
309      <condition property="modules">      <condition property="modules">
310        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/jmods" type="dir"/>
# Line 307  Line 313 
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"
# Line 316  Line 324 
324        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
325        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
326        <arg value="-agentvm"/>        <arg value="-agentvm"/>
327        <arg value="-verbose:nopass,fail,error"/>        <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 383  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 593  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 648  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 677  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 844  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 933  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 1027  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 1118  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 1144  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.187  
changed lines
  Added in v.1.195

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