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

Diff of /jsr166/build.xml

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

revision 1.293, Thu Dec 13 01:15:07 2018 UTC revision 1.294, Mon Dec 31 07:05:54 2018 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 204  Line 206 
206    <!-- <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"/> -->
207    <!-- <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"/> -->
208    <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"/>
209      <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
210    <!-- Default jdk doc location (latest stable LTS release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
211    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
212    
# Line 216  Line 219 
219    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
220    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
221    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
222      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
223    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
224    
225    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 329  Line 333 
333      </sequential>      </sequential>
334    </macrodef>    </macrodef>
335    
336      <defjtregtests v="13"/>
337    <defjtregtests v="12"/>    <defjtregtests v="12"/>
338    <defjtregtests v="11"/>    <defjtregtests v="11"/>
339    <defjtregtests v="10"/>    <defjtregtests v="10"/>
# Line 584  Line 589 
589            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
590    
591    <target name="test-version-permutations"    <target name="test-version-permutations"
592            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">
593    </target>    </target>
594    
595    <target name="test9">    <target name="test9">
# Line 635  Line 640 
640      </antcall>      </antcall>
641    </target>    </target>
642    
643      <target name="test13">
644        <antcall target="clean"/>
645        <antcall>
646          <param name="java.runtime.target" value="13"/>
647          <param name="build.main.javac" value="${javac13}"/>
648          <param name="build.main.javadoc" value="${javadoc13}"/>
649          <param name="build.main.javadoc.source" value="13"/>
650          <target name="test"/>
651          <target name="docs"/>
652        </antcall>
653      </target>
654    
655    <target name="test9-11">    <target name="test9-11">
656      <antcall target="clean"/>      <antcall target="clean"/>
657      <antcall>      <antcall>
# Line 659  Line 676 
676      </antcall>      </antcall>
677    </target>    </target>
678    
679      <target name="test9-13">
680        <antcall target="clean"/>
681        <antcall>
682          <param name="java.runtime.target" value="13"/>
683          <param name="build.main.javac" value="${javac9}"/>
684          <param name="build.main.javadoc" value="${javadoc13}"/>
685          <param name="build.main.javadoc.source" value="9"/>
686          <target name="test"/>
687          <target name="docs"/>
688        </antcall>
689      </target>
690    
691    
692    <target name="configure-compiler">    <target name="configure-compiler">
693      <fail message="ant version too old">      <fail message="ant version too old">

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8