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

Diff of /jsr166/build.xml

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

revision 1.300 by jsr166, Sat Jul 13 18:31:40 2019 UTC revision 1.303 by jsr166, Tue Sep 17 16:20:44 2019 UTC
# Line 20  Line 20 
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
   $HOME/jdk/jdk9  
   $HOME/jdk/jdk10  
23    $HOME/jdk/jdk11    $HOME/jdk/jdk11
24    $HOME/jdk/jdk12    $HOME/jdk/jdk12
25    $HOME/jdk/jdk13    $HOME/jdk/jdk13
26    $HOME/jdk/jdk14    $HOME/jdk/jdk14
27    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9  
   $HOME/jdk/src/jdk10  
29    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
31    $HOME/jdk/src/jdk13    $HOME/jdk/src/jdk13
# Line 42  Line 38 
38    for $N in 8 .. 14 ...    for $N in 8 .. 14 ...
39    
40    As of 2016-03, the sources in src/main are for jdk9+ only.    As of 2016-03, the sources in src/main are for jdk9+ only.
41      As of 2019-08, the sources in src/main are for jdk11+ only.
42  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
43    </description>    </description>
44    
# Line 135  Line 132 
132      </sequential>      </sequential>
133    </macrodef>    </macrodef>
134    
   <defjdklocations v="6"/>  
   <defjdklocations v="7"/>  
135    <defjdklocations v="8"/>    <defjdklocations v="8"/>
   <defjdklocations v="9"/>  
   <defjdklocations v="10"/>  
136    <defjdklocations v="11"/>    <defjdklocations v="11"/>
137    <defjdklocations v="12"/>    <defjdklocations v="12"/>
138    <defjdklocations v="13"/>    <defjdklocations v="13"/>
# Line 150  Line 143 
143    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
144    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
145    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>  
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
   <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>  
   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>  
147    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
148    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
149    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
150    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
152    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
153    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
154    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 202  Line 192 
192    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
193    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
194    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>  
   <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>  
195    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197      <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
198    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->  
   <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->  
199    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
200  <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->    <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
201    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>    <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
202    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
203    <!-- Default jdk doc location (latest stable LTS release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
204    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
205    
206    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>  
   <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>  
   <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>  
207    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
   <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>  
   <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>  
208    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
210    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
# Line 344  Line 326 
326    <defjtregtests v="13"/>    <defjtregtests v="13"/>
327    <defjtregtests v="12"/>    <defjtregtests v="12"/>
328    <defjtregtests v="11"/>    <defjtregtests v="11"/>
   <defjtregtests v="10"/>  
   <defjtregtests v="9"/>  
329    <defjtregtests v="8"/>    <defjtregtests v="8"/>
   <defjtregtests v="7"/>  
330    
331    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
332    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
# Line 407  Line 386 
386    <!-- Default values: may seem strange ... -->    <!-- Default values: may seem strange ... -->
387    <!-- At runtime, target latest LTS, i.e. jdk11 -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
388    <!-- But at build time, target jdk9, for maximal binary portability -->    <!-- But at build time, target jdk9, for maximal binary portability -->
389      <!-- ButButBut as of 2019-08, target jdk11 at build time -->
390    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
391      o override-methods=summary      o override-methods=summary
392      o {@systemProperty ...}      o {@systemProperty ...}
# Line 415  Line 395 
395      -->      -->
396    <property name="java.runtime.target" value="11"/>    <property name="java.runtime.target" value="11"/>
397    <property name="build.main.java" value="${java11}"/>    <property name="build.main.java" value="${java11}"/>
398    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac11}"/>
399    <property name="build.main.javadoc" value="${javadoc12}"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
400    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
401    
# Line 449  Line 429 
429        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
430        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
432    <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
433        <compilerarg value="-Xlint:all,-removal"/>        <compilerarg value="-Xlint:all,-removal"/>
434        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
435        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
# Line 600  Line 581 
581            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
582    
583    <target name="test-version-permutations"    <target name="test-version-permutations"
584            depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">            depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
585    </target>    </target>
586    
587    <target name="test9">    <!-- jdk9 is unsupported as of 2019-08 -->
588      <antcall target="clean"/>  <!--   <target name="test9"> -->
589      <antcall>  <!--     <antcall target="clean"/> -->
590        <param name="java.runtime.target" value="9"/>  <!--     <antcall> -->
591        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="java.runtime.target" value="9"/> -->
592        <param name="build.main.javadoc" value="${javadoc12}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
593        <param name="build.main.javadoc.source" value="9"/>  <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
594        <target name="test"/>  <!--       <param name="build.main.javadoc.source" value="9"/> -->
595        <target name="docs"/>  <!--       <target name="test"/> -->
596      </antcall>  <!--       <target name="docs"/> -->
597    </target>  <!--     </antcall> -->
598    <!--   </target> -->
599    
600    <target name="test10">    <!-- jdk10 is unsupported as of 2019-08 -->
601      <antcall target="clean"/>  <!--   <target name="test10"> -->
602      <antcall>  <!--     <antcall target="clean"/> -->
603        <param name="java.runtime.target" value="10"/>  <!--     <antcall> -->
604        <param name="build.main.javac" value="${javac10}"/>  <!--       <param name="java.runtime.target" value="10"/> -->
605        <param name="build.main.javadoc" value="${javadoc12}"/>  <!--       <param name="build.main.javac" value="${javac10}"/> -->
606        <param name="build.main.javadoc.source" value="10"/>  <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
607        <target name="test"/>  <!--       <param name="build.main.javadoc.source" value="10"/> -->
608        <target name="docs"/>  <!--       <target name="test"/> -->
609      </antcall>  <!--       <target name="docs"/> -->
610    </target>  <!--     </antcall> -->
611    <!--   </target> -->
612    
613    <target name="test11">    <target name="test11">
614      <antcall target="clean"/>      <antcall target="clean"/>
# Line 675  Line 658 
658      </antcall>      </antcall>
659    </target>    </target>
660    
661    <target name="test9-11">    <target name="test11-12">
     <antcall target="clean"/>  
     <antcall>  
       <param name="java.runtime.target" value="11"/>  
       <param name="build.main.javac" value="${javac9}"/>  
       <param name="build.main.javadoc" value="${javadoc12}"/>  
       <param name="build.main.javadoc.source" value="9"/>  
       <target name="test"/>  
       <target name="docs"/>  
     </antcall>  
   </target>  
   
   <target name="test9-12">  
662      <antcall target="clean"/>      <antcall target="clean"/>
663      <antcall>      <antcall>
664        <param name="java.runtime.target" value="12"/>        <param name="java.runtime.target" value="12"/>
665        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac11}"/>
666        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
667        <param name="build.main.javadoc.source" value="9"/>        <param name="build.main.javadoc.source" value="11"/>
668        <target name="test"/>        <target name="test"/>
669        <target name="docs"/>        <target name="docs"/>
670      </antcall>      </antcall>
671    </target>    </target>
672    
673    <target name="test9-13">    <target name="test11-13">
674      <antcall target="clean"/>      <antcall target="clean"/>
675      <antcall>      <antcall>
676        <param name="java.runtime.target" value="13"/>        <param name="java.runtime.target" value="13"/>
677        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac11}"/>
678        <param name="build.main.javadoc" value="${javadoc13}"/>        <param name="build.main.javadoc" value="${javadoc13}"/>
679        <param name="build.main.javadoc.source" value="9"/>        <param name="build.main.javadoc.source" value="11"/>
680        <target name="test"/>        <target name="test"/>
681        <target name="docs"/>        <target name="docs"/>
682      </antcall>      </antcall>
683    </target>    </target>
684    
685    <target name="test9-14">    <target name="test11-14">
686      <antcall target="clean"/>      <antcall target="clean"/>
687      <antcall>      <antcall>
688        <param name="java.runtime.target" value="14"/>        <param name="java.runtime.target" value="14"/>
689        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac11}"/>
690        <param name="build.main.javadoc" value="${javadoc14}"/>        <param name="build.main.javadoc" value="${javadoc14}"/>
691        <param name="build.main.javadoc.source" value="9"/>        <param name="build.main.javadoc.source" value="11"/>
692        <target name="test"/>        <target name="test"/>
693        <target name="docs"/>        <target name="docs"/>
694      </antcall>      </antcall>

Legend:
Removed from v.1.300  
changed lines
  Added in v.1.303

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