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

Diff of /jsr166/build.xml

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

revision 1.295 by jsr166, Sun Mar 24 00:44:14 2019 UTC revision 1.299 by jsr166, Fri Jun 14 20:10:53 2019 UTC
# Line 25  Line 25 
25    $HOME/jdk/jdk11    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12    $HOME/jdk/jdk12
27    $HOME/jdk/jdk13    $HOME/jdk/jdk13
28      $HOME/jdk/jdk14
29    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
30    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
31    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
# Line 32  Line 33 
33    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
34    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
35    $HOME/jdk/src/jdk13    $HOME/jdk/src/jdk13
36      $HOME/jdk/src/jdk14
37    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
38    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
39    
40    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
41    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
42    for $N in 8 .. 13 ...    for $N in 8 .. 14 ...
43    
44    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.
45  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 141  Line 143 
143    <defjdklocations v="11"/>    <defjdklocations v="11"/>
144    <defjdklocations v="12"/>    <defjdklocations v="12"/>
145    <defjdklocations v="13"/>    <defjdklocations v="13"/>
146      <defjdklocations v="14"/>
147    
148    <!-- Source locations -->    <!-- Source locations -->
149    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 154  Line 157 
157    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
159    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
160      <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
161    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
162    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
163    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 208  Line 212 
212    <!-- <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"/> -->
213  <!--   <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"/> -->
214    <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"/>
215      <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216    <!-- Default jdk doc location (latest stable LTS release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
217    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
218    
# Line 221  Line 226 
226    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
228    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
229      <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
230    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
231    
232    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 334  Line 340 
340      </sequential>      </sequential>
341    </macrodef>    </macrodef>
342    
343      <defjtregtests v="14"/>
344    <defjtregtests v="13"/>    <defjtregtests v="13"/>
345    <defjtregtests v="12"/>    <defjtregtests v="12"/>
346    <defjtregtests v="11"/>    <defjtregtests v="11"/>
# Line 444  Line 451 
451        <compilerarg value="-Xlint:all,-removal"/>        <compilerarg value="-Xlint:all,-removal"/>
452        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
453        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
454          <compilerarg value="-Xdoclint/package:java.util.*"/>
455        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
456        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
457        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 500  Line 508 
508        <arg value="-html5"/>        <arg value="-html5"/>
509        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
510  <!-- old school frames via docs/index.html?overview-summary.html -->  <!-- old school frames via docs/index.html?overview-summary.html -->
511    <!-- TODO: - -frames no longer a supported option in jdk13+ -->
512        <arg value="--frames"/>        <arg value="--frames"/>
513        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
514        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 590  Line 599 
599            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
600    
601    <target name="test-version-permutations"    <target name="test-version-permutations"
602            depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">            depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
603    </target>    </target>
604    
605    <target name="test9">    <target name="test9">
# Line 653  Line 662 
662      </antcall>      </antcall>
663    </target>    </target>
664    
665      <target name="test14">
666        <antcall target="clean"/>
667        <antcall>
668          <param name="java.runtime.target" value="14"/>
669          <param name="build.main.javac" value="${javac14}"/>
670          <param name="build.main.javadoc" value="${javadoc14}"/>
671          <param name="build.main.javadoc.source" value="14"/>
672          <target name="test"/>
673          <target name="docs"/>
674        </antcall>
675      </target>
676    
677    <target name="test9-11">    <target name="test9-11">
678      <antcall target="clean"/>      <antcall target="clean"/>
679      <antcall>      <antcall>
# Line 689  Line 710 
710      </antcall>      </antcall>
711    </target>    </target>
712    
713      <target name="test9-14">
714        <antcall target="clean"/>
715        <antcall>
716          <param name="java.runtime.target" value="14"/>
717          <param name="build.main.javac" value="${javac9}"/>
718          <param name="build.main.javadoc" value="${javadoc14}"/>
719          <param name="build.main.javadoc.source" value="9"/>
720          <target name="test"/>
721          <target name="docs"/>
722        </antcall>
723      </target>
724    
725    
726    <target name="configure-compiler">    <target name="configure-compiler">
727      <fail message="ant version too old">      <fail message="ant version too old">

Legend:
Removed from v.1.295  
changed lines
  Added in v.1.299

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