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

Diff of /jsr166/build.xml

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

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

Legend:
Removed from v.1.265  
changed lines
  Added in v.1.268

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27