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.268 by jsr166, Wed Mar 21 20:19:24 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 191 | Line 192
192    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
193    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 <  <!-- The location of jdk9 early access docs (RIP) -->
195 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
196 >  <!-- The location of jdk early access docs (RIP) -->
197    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
198 <  <!-- Default jdk doc location (latest stable release seems best) -->
197 <  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198 >  <!-- <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}"/>
200 >  <!-- Default jdk doc location (latest stable release seems best) -->
201 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
202  
203    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
204    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 305 | Line 307
307    </macrodef>
308  
309    <!-- Define jtreg test sets for different jdk versions -->
310 <  <fileset dir="${jtreg11.src.dir}">
311 <    <patternset id="jdk11.jtreg.tests">
312 <      <include name="**/*.java"/>
313 <    </patternset>
314 <  </fileset>
315 <
316 <  <fileset dir="${jtreg10.src.dir}">
317 <    <patternset id="jdk10.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <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>
310 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
311 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
312 >  <property name="jtreg.test.pattern" value="**/*.java"/>
313 >  <macrodef name="defjtregtests">
314 >    <attribute name="v"/>
315 >    <sequential>
316 >      <fileset dir="${jtreg@{v}.src.dir}">
317 >        <patternset id="jdk@{v}.jtreg.tests">
318 >          <include name="${jtreg.test.pattern}"/>
319 >        </patternset>
320 >      </fileset>
321 >    </sequential>
322 >  </macrodef>
323  
324 <  <fileset dir="${jtreg7.src.dir}">
325 <    <patternset id="jdk7.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
324 >  <defjtregtests v="11"/>
325 >  <defjtregtests v="10"/>
326 >  <defjtregtests v="9"/>
327 >  <defjtregtests v="8"/>
328 >  <defjtregtests v="7"/>
329  
330    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331    <property name="jtreg.flags" value=""/>
# Line 399 | Line 391
391        <!-- Force javadoc version to be at least 10,
392             so we can use override-methods=summary -->
393        <condition property="build.main.javadoc"
394 <                 value="${javadoc10}"
394 >                 value="${javadoc11}"
395                   else="${javadoc@{v}}">
396          <equals arg1="@{v}" arg2="9"/>
397        </condition>
# Line 1398 | Line 1390
1390    Experimental errorprone support - http://errorprone.info
1391   =================================================================== -->
1392    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1393 +  <property name="errorprone.jsr166.user.flags" value=""/>
1394    <property name="errorprone.jsr166.flags"
1395              value="-Xep:HashtableContains:OFF
1396                     -Xep:JdkObsolete:OFF
# Line 1411 | Line 1404
1404                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1405                     -Xep:RedundantThrows:ERROR
1406                     -Xep:IdentityBinaryExpression:WARN
1407 <                   -Xep:MethodCanBeStatic:WARN"/>
1407 >                   -Xep:MethodCanBeStatic:WARN
1408 >                   ${errorprone.jsr166.user.flags}"/>
1409    <!-- -Xep:WildcardImport:ERROR -->
1410    <property name="errorprone.jsr166.test.flags"
1411              value="-Xep:StringSplitter:OFF

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines