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

Diff of /jsr166/build.xml

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

revision 1.264 by jsr166, Wed Jan 24 01:11:10 2018 UTC revision 1.272 by jsr166, Sun Jun 3 16:16:47 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 396  Line 388 
388      <sequential>      <sequential>
389        <property name="build.main.java"    value="${java@{v}}"/>        <property name="build.main.java"    value="${java@{v}}"/>
390        <property name="build.main.javac"   value="${javac@{v}}"/>        <property name="build.main.javac"   value="${javac@{v}}"/>
391        <property name="build.main.javadoc" value="${javadoc@{v}}"/>        <!-- Force javadoc version to be at least 10,
392               so we can use override-methods=summary -->
393          <condition property="build.main.javadoc"
394                     value="${javadoc11}"
395                     else="${javadoc@{v}}">
396            <equals arg1="@{v}" arg2="9"/>
397          </condition>
398      </sequential>      </sequential>
399    </macrodef>    </macrodef>
400    <define-build-main-properties v="${build.main.java.version}"/>    <define-build-main-properties v="${build.main.java.version}"/>
# Line 490  Line 488 
488        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
489        <arg value="-html5"/>        <arg value="-html5"/>
490        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
491        <arg value="-tag"/>        <arg value="--override-methods=summary"/>
492        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495  <!--       <arg value="apiNote:a:API Note:"/> -->  <!-- @apiNote tag currently unused -->
496        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
       <arg value="implSpec:a:Implementation Requirements:"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
497  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
498  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
499  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
500      </javadoc>      </javadoc>
501    </target>    </target>
502    
# Line 845  Line 838 
838        </fileset>        </fileset>
839        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
840        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
841        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
842        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
843  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
844  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
845  <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
846      </javadoc>      </javadoc>
847    </target>    </target>
848    
# Line 1383  Line 1372 
1372    
1373  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1374    
1375    <target name="lint">  <!--   <target name="lint"> -->
1376      <antcall target="dists">  <!--     <antcall target="dists"> -->
1377        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1378      </antcall>  <!--     </antcall> -->
1379    </target>  <!--   </target> -->
1380    
1381  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1382    <target name="lint-private">    <target name="doclint-private">
1383      <antcall target="dist">      <antcall target="dist">
1384        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1385      </antcall>      </antcall>
# Line 1400  Line 1389 
1389  <!-- ==============================================================  <!-- ==============================================================
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.3.1.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 1414  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
# Line 1442  Line 1433 
1433             fork="true">             fork="true">
1434    
1435        <include name="**/*.java"/>        <include name="**/*.java"/>
1436          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1437          <compilerarg value="-J--illegal-access=permit"/>
1438        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1439        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg line="-processorpath ${errorprone.jar}"/>
1440        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
# Line 1464  Line 1457 
1457        workdir="${build.dir}"        workdir="${build.dir}"
1458        classes="${product.jar}">        classes="${product.jar}">
1459        <javac-elements>        <javac-elements>
1460            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1461            <compilerarg value="-J--illegal-access=permit"/>
1462          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1463          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.jar}"/>
1464          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
# Line 1492  Line 1487 
1487          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1488                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1489                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}
1490                                -Xep:MultipleTopLevelClasses:WARN
1491                              -Xep:NonAtomicVolatileUpdate:OFF"/>                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1492        </jtreg-elements>        </jtreg-elements>
1493      </run-jtreg-tests>      </run-jtreg-tests>

Legend:
Removed from v.1.264  
changed lines
  Added in v.1.272

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