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

Diff of /jsr166/build.xml

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

revision 1.188 by jsr166, Mon Oct 12 01:53:54 2015 UTC revision 1.194 by jsr166, Wed Dec 16 02:29: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 310  Line 310 
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"
# Line 386  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 596  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 651  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 680  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 847  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 936  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 1030  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 1121  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 1147  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.188  
changed lines
  Added in v.1.194

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