ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.259 by jsr166, Mon Dec 18 21:07:18 2017 UTC vs.
Revision 1.260 by jsr166, Sun Dec 24 22:17:17 2017 UTC

# Line 21 | Line 21
21    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9
23    $HOME/jdk/jdk10
24 +  $HOME/jdk/jdk11
25    where each of the above is a JDK or a symlink to same, and
26    $HOME/jdk/src/jdk8
27    $HOME/jdk/src/jdk9
28    $HOME/jdk/src/jdk10
29 +  $HOME/jdk/src/jdk11
30    where each of the above is a complete JDK source tree
31    (e.g. mercurial forest) or a symlink to same.
32  
# Line 132 | Line 134
134    <defjdklocations v="8"/>
135    <defjdklocations v="9"/>
136    <defjdklocations v="10"/>
137 +  <defjdklocations v="11"/>
138  
139    <!-- Source locations -->
140    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 145
145    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150    <property name="lib.dir"              location="${basedir}/lib"/>
151    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 191 | Line 195
195    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196    <!-- Default jdk doc location (latest stable release seems best) -->
197    <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198 +  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199    <property name="java.docroot.url"   value="${java9.docroot.url}"/>
200  
201    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
# Line 200 | Line 205
205    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
210  
211    <!-- Define the "jtreg" task -->
# Line 299 | Line 305
305    </macrodef>
306  
307    <!-- Define jtreg test sets for different jdk versions -->
308 +  <fileset dir="${jtreg11.src.dir}">
309 +    <patternset id="jdk11.jtreg.tests">
310 +      <include name="**/*.java"/>
311 +    </patternset>
312 +  </fileset>
313 +
314    <fileset dir="${jtreg10.src.dir}">
315      <patternset id="jdk10.jtreg.tests">
316        <include name="**/*.java"/>
# Line 603 | Line 615
615  
616   <!--   </target> -->
617  
618 <  <target name="test910"
618 >  <target name="test91011"
619            description="Runs tck and jtreg tests for src/main for multiple java versions">
620  
621      <antcall target="clean"/>
# Line 616 | Line 628
628        <param name="build.main.java.version" value="10"/>
629      </antcall>
630  
631 +    <antcall target="clean"/>
632 +    <antcall target="test">
633 +      <param name="build.main.java.version" value="11"/>
634 +    </antcall>
635 +
636      <!-- Clean up to avoid obscure wrong class file version bugs -->
637      <antcall target="clean"/>
638  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines