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.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC vs.
Revision 1.275 by jsr166, Wed Jul 18 01:16:42 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 22 | 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 103 | 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 135 | 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 146 | 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 191 | 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 >  <!-- The location of jdk early access docs (RIP) -->
201    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 <  <!-- Default jdk doc location (latest stable release seems best) -->
197 <  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/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="java.docroot.url"   value="${java9.docroot.url}"/>
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  
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 206 | 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 238 | 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 305 | Line 313
313    </macrodef>
314  
315    <!-- Define jtreg test sets for different jdk versions -->
316 <  <fileset dir="${jtreg11.src.dir}">
317 <    <patternset id="jdk11.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg10.src.dir}">
323 <    <patternset id="jdk10.jtreg.tests">
324 <      <include name="**/*.java"/>
325 <    </patternset>
326 <  </fileset>
327 <
328 <  <fileset dir="${jtreg9.src.dir}">
321 <    <patternset id="jdk9.jtreg.tests">
322 <      <include name="**/*.java"/>
323 <    </patternset>
324 <  </fileset>
325 <
326 <  <fileset dir="${jtreg8.src.dir}">
327 <    <patternset id="jdk8.jtreg.tests">
328 <      <include name="**/*.java"/>
329 <    </patternset>
330 <  </fileset>
316 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
317 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
318 >  <property name="jtreg.test.pattern" value="**/*.java"/>
319 >  <macrodef name="defjtregtests">
320 >    <attribute name="v"/>
321 >    <sequential>
322 >      <fileset dir="${jtreg@{v}.src.dir}">
323 >        <patternset id="jdk@{v}.jtreg.tests">
324 >          <include name="${jtreg.test.pattern}"/>
325 >        </patternset>
326 >      </fileset>
327 >    </sequential>
328 >  </macrodef>
329  
330 <  <fileset dir="${jtreg7.src.dir}">
331 <    <patternset id="jdk7.jtreg.tests">
332 <      <include name="**/*.java"/>
333 <    </patternset>
334 <  </fileset>
330 >  <defjtregtests v="12"/>
331 >  <defjtregtests v="11"/>
332 >  <defjtregtests v="10"/>
333 >  <defjtregtests v="9"/>
334 >  <defjtregtests v="8"/>
335 >  <defjtregtests v="7"/>
336  
337    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
338    <property name="jtreg.flags" value=""/>
# Line 354 | 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 399 | Line 398
398        <!-- Force javadoc version to be at least 10,
399             so we can use override-methods=summary -->
400        <condition property="build.main.javadoc"
401 <                 value="${javadoc10}"
401 >                 value="${javadoc11}"
402                   else="${javadoc@{v}}">
403          <equals arg1="@{v}" arg2="9"/>
404        </condition>
# Line 500 | 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 -->
504 < <!--  <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 616 | 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 634 | 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 1380 | Line 1383
1383  
1384   <!-- Find buglets that can be detected by static build tools -->
1385  
1386 <  <target name="lint">
1387 <    <antcall target="dists">
1388 <      <param name="build.javadoc.access" value="public"/>
1389 <    </antcall>
1390 <  </target>
1386 > <!--   <target name="lint"> -->
1387 > <!--     <antcall target="dists"> -->
1388 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1389 > <!--     </antcall> -->
1390 > <!--   </target> -->
1391  
1392   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1393 <  <target name="lint-private">
1393 >  <target name="doclint-private">
1394      <antcall target="dist">
1395        <param name="build.javadoc.access" value="private"/>
1396      </antcall>
# Line 1397 | 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
1407                     -Xep:JdkObsolete:OFF
# Line 1411 | Line 1415
1415                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1416                     -Xep:RedundantThrows:ERROR
1417                     -Xep:IdentityBinaryExpression:WARN
1418 <                   -Xep:MethodCanBeStatic:WARN"/>
1418 >                   -Xep:MethodCanBeStatic:WARN
1419 >                   ${errorprone.jsr166.user.flags}"/>
1420    <!-- -Xep:WildcardImport:ERROR -->
1421    <property name="errorprone.jsr166.test.flags"
1422              value="-Xep:StringSplitter:OFF
# Line 1439 | 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 1461 | 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 1489 | 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