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

Diff of /jsr166/build.xml

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

revision 1.293 by jsr166, Thu Dec 13 01:15:07 2018 UTC revision 1.298 by jsr166, Wed May 22 17:36:58 2019 UTC
# Line 140  Line 140 
140    <defjdklocations v="10"/>    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>    <defjdklocations v="11"/>
142    <defjdklocations v="12"/>    <defjdklocations v="12"/>
143      <defjdklocations v="13"/>
144    
145    <!-- Source locations -->    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 152  Line 153 
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 199  Line 201 
201    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203    <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"/>
204      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
206    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208    <!-- <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"/> -->
209    <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"/> -->
210      <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211    <!-- Default jdk doc location (latest stable LTS release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
212    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
213    
# Line 216  Line 220 
220    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225    
226    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 329  Line 334 
334      </sequential>      </sequential>
335    </macrodef>    </macrodef>
336    
337      <defjtregtests v="13"/>
338    <defjtregtests v="12"/>    <defjtregtests v="12"/>
339    <defjtregtests v="11"/>    <defjtregtests v="11"/>
340    <defjtregtests v="10"/>    <defjtregtests v="10"/>
# Line 438  Line 444 
444        <compilerarg value="-Xlint:all,-removal"/>        <compilerarg value="-Xlint:all,-removal"/>
445        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
446        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447          <compilerarg value="-Xdoclint/package:java.util.*"/>
448        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
449        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 494  Line 501 
501        <arg value="-html5"/>        <arg value="-html5"/>
502        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
503  <!-- old school frames via docs/index.html?overview-summary.html -->  <!-- old school frames via docs/index.html?overview-summary.html -->
504    <!-- TODO: - -frames no longer a supported option in jdk13+ -->
505        <arg value="--frames"/>        <arg value="--frames"/>
506        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
507        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 584  Line 592 
592            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
593    
594    <target name="test-version-permutations"    <target name="test-version-permutations"
595            depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">            depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
596    </target>    </target>
597    
598    <target name="test9">    <target name="test9">
# Line 635  Line 643 
643      </antcall>      </antcall>
644    </target>    </target>
645    
646      <target name="test13">
647        <antcall target="clean"/>
648        <antcall>
649          <param name="java.runtime.target" value="13"/>
650          <param name="build.main.javac" value="${javac13}"/>
651          <param name="build.main.javadoc" value="${javadoc13}"/>
652          <param name="build.main.javadoc.source" value="13"/>
653          <target name="test"/>
654          <target name="docs"/>
655        </antcall>
656      </target>
657    
658    <target name="test9-11">    <target name="test9-11">
659      <antcall target="clean"/>      <antcall target="clean"/>
660      <antcall>      <antcall>
# Line 659  Line 679 
679      </antcall>      </antcall>
680    </target>    </target>
681    
682      <target name="test9-13">
683        <antcall target="clean"/>
684        <antcall>
685          <param name="java.runtime.target" value="13"/>
686          <param name="build.main.javac" value="${javac9}"/>
687          <param name="build.main.javadoc" value="${javadoc13}"/>
688          <param name="build.main.javadoc.source" value="9"/>
689          <target name="test"/>
690          <target name="docs"/>
691        </antcall>
692      </target>
693    
694    
695    <target name="configure-compiler">    <target name="configure-compiler">
696      <fail message="ant version too old">      <fail message="ant version too old">

Legend:
Removed from v.1.293  
changed lines
  Added in v.1.298

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