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.267 by jsr166, Tue Feb 27 21:18:06 2018 UTC vs.
Revision 1.276 by jsr166, Wed Sep 26 06:40:33 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 192 | Line 196
196    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 <  <!-- The location of jdk9 early access docs (RIP) -->
199 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 >  <!-- The location of jdk early access docs (RIP) -->
202    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 +  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 +  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 +  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <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"/>
200 <  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
207 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
208  
209    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 207 | Line 214
214    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
216    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
217 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
218    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
219  
220    <!-- Define the "jtreg" task -->
# Line 239 | Line 247
247  
248      <local name="modules"/>
249      <condition property="modules">
250 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
250 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251      </condition>
252  
253      <local name="use-doclint"/>
# Line 320 | Line 328
328      </sequential>
329    </macrodef>
330  
331 +  <defjtregtests v="12"/>
332    <defjtregtests v="11"/>
333    <defjtregtests v="10"/>
334    <defjtregtests v="9"/>
# Line 345 | Line 354
354  
355      <local name="modules"/>
356      <condition property="modules">
357 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
357 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
358      </condition>
359  
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 390 | Line 399
399        <!-- Force javadoc version to be at least 10,
400             so we can use override-methods=summary -->
401        <condition property="build.main.javadoc"
402 <                 value="${javadoc10}"
402 >                 value="${javadoc11}"
403                   else="${javadoc@{v}}">
404          <equals arg1="@{v}" arg2="9"/>
405        </condition>
# Line 491 | Line 500
500        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503 < <!-- @apiNote tag currently unused -->
495 < <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
503 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
504   <!-- tags added in jdk9: currently unused -->
505   <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506   <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 607 | Line 615
615  
616   <!--   </target> -->
617  
618 <  <target name="test91011"
618 >  <target name="test9101112"
619            description="Runs tck and jtreg tests for src/main for multiple java versions">
620  
621      <antcall target="clean"/>
# Line 625 | Line 633
633        <param name="build.main.java.version" value="11"/>
634      </antcall>
635  
636 +    <antcall target="clean"/>
637 +    <antcall target="test">
638 +      <param name="build.main.java.version" value="12"/>
639 +    </antcall>
640 +
641      <!-- Clean up to avoid obscure wrong class file version bugs -->
642      <antcall target="clean"/>
643  
# Line 1371 | Line 1384
1384  
1385   <!-- Find buglets that can be detected by static build tools -->
1386  
1387 <  <target name="lint">
1388 <    <antcall target="dists">
1389 <      <param name="build.javadoc.access" value="public"/>
1390 <    </antcall>
1391 <  </target>
1387 > <!--   <target name="lint"> -->
1388 > <!--     <antcall target="dists"> -->
1389 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1390 > <!--     </antcall> -->
1391 > <!--   </target> -->
1392  
1393   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1394 <  <target name="lint-private">
1394 >  <target name="doclint-private">
1395      <antcall target="dist">
1396        <param name="build.javadoc.access" value="private"/>
1397      </antcall>
# Line 1388 | Line 1401
1401   <!-- ==============================================================
1402    Experimental errorprone support - http://errorprone.info
1403   =================================================================== -->
1404 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1404 >  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1405    <property name="errorprone.jsr166.user.flags" value=""/>
1406    <property name="errorprone.jsr166.flags"
1407              value="-Xep:HashtableContains:OFF
# Line 1432 | Line 1445
1445             fork="true">
1446  
1447        <include name="**/*.java"/>
1448 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1449 +      <compilerarg value="-J--illegal-access=permit"/>
1450        <compilerarg value="-XDcompilePolicy=simple"/>
1451        <compilerarg line="-processorpath ${errorprone.jar}"/>
1452        <compilerarg value="-Xplugin:ErrorProne
# Line 1454 | Line 1469
1469        workdir="${build.dir}"
1470        classes="${product.jar}">
1471        <javac-elements>
1472 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1473 +        <compilerarg value="-J--illegal-access=permit"/>
1474          <compilerarg value="-XDcompilePolicy=simple"/>
1475          <compilerarg line="-processorpath ${errorprone.jar}"/>
1476          <compilerarg value="-Xplugin:ErrorProne
# Line 1482 | Line 1499
1499          <arg value="-javacoption:-Xplugin:ErrorProne
1500                              ${errorprone.jsr166.flags}
1501                              ${errorprone.jsr166.test.flags}
1502 +                            -Xep:MultipleTopLevelClasses:WARN
1503                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1504        </jtreg-elements>
1505      </run-jtreg-tests>

Diff Legend

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