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.269 by jsr166, Wed Mar 21 23:10:39 2018 UTC vs.
Revision 1.275 by jsr166, Wed Jul 18 01:16:42 2018 UTC

# Line 23 | Line 23
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10
31    $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
# Line 104 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 136 | Line 138
138    <defjdklocations v="9"/>
139    <defjdklocations v="10"/>
140    <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 147 | Line 150
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 197 | Line 201
201    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203    <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
204 +  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
205    <!-- Default jdk doc location (latest stable release seems best) -->
206    <property name="java.docroot.url"   value="${java10.docroot.url}"/>
207  
# Line 208 | Line 213
213    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
218  
219    <!-- Define the "jtreg" task -->
# Line 240 | Line 246
246  
247      <local name="modules"/>
248      <condition property="modules">
249 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
249 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250      </condition>
251  
252      <local name="use-doclint"/>
# Line 321 | Line 327
327      </sequential>
328    </macrodef>
329  
330 +  <defjtregtests v="12"/>
331    <defjtregtests v="11"/>
332    <defjtregtests v="10"/>
333    <defjtregtests v="9"/>
# Line 346 | Line 353
353  
354      <local name="modules"/>
355      <condition property="modules">
356 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
356 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357      </condition>
358  
359      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 492 | Line 499
499        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
500        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
501        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
502 < <!-- @apiNote tag currently unused -->
496 < <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
502 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
503   <!-- tags added in jdk9: currently unused -->
504   <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
505   <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 608 | Line 614
614  
615   <!--   </target> -->
616  
617 <  <target name="test91011"
617 >  <target name="test9101112"
618            description="Runs tck and jtreg tests for src/main for multiple java versions">
619  
620      <antcall target="clean"/>
# Line 626 | Line 632
632        <param name="build.main.java.version" value="11"/>
633      </antcall>
634  
635 +    <antcall target="clean"/>
636 +    <antcall target="test">
637 +      <param name="build.main.java.version" value="12"/>
638 +    </antcall>
639 +
640      <!-- Clean up to avoid obscure wrong class file version bugs -->
641      <antcall target="clean"/>
642  
# Line 1389 | Line 1400
1400   <!-- ==============================================================
1401    Experimental errorprone support - http://errorprone.info
1402   =================================================================== -->
1403 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1403 >  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1404    <property name="errorprone.jsr166.user.flags" value=""/>
1405    <property name="errorprone.jsr166.flags"
1406              value="-Xep:HashtableContains:OFF
# Line 1433 | Line 1444
1444             fork="true">
1445  
1446        <include name="**/*.java"/>
1447 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1448 +      <compilerarg value="-J--illegal-access=permit"/>
1449        <compilerarg value="-XDcompilePolicy=simple"/>
1450        <compilerarg line="-processorpath ${errorprone.jar}"/>
1451        <compilerarg value="-Xplugin:ErrorProne
# Line 1455 | Line 1468
1468        workdir="${build.dir}"
1469        classes="${product.jar}">
1470        <javac-elements>
1471 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1472 +        <compilerarg value="-J--illegal-access=permit"/>
1473          <compilerarg value="-XDcompilePolicy=simple"/>
1474          <compilerarg line="-processorpath ${errorprone.jar}"/>
1475          <compilerarg value="-Xplugin:ErrorProne
# Line 1483 | Line 1498
1498          <arg value="-javacoption:-Xplugin:ErrorProne
1499                              ${errorprone.jsr166.flags}
1500                              ${errorprone.jsr166.test.flags}
1501 +                            -Xep:MultipleTopLevelClasses:WARN
1502                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1503        </jtreg-elements>
1504      </run-jtreg-tests>

Diff Legend

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