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.247 by jsr166, Fri Jun 16 21:30:00 2017 UTC vs.
Revision 1.255 by jsr166, Thu Sep 28 01:17:47 2017 UTC

# Line 181 | Line 181
181    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
182  
183    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
184 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
185 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
189 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
184 >  <property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>
185 >  <property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>
186 >  <property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>
187 >  <property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>
188 >  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
189 >  <!-- The location of jdk9 early access docs -->
190 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
191    <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
192 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
193  
194    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 328 | Line 328
328      <attribute name="target"/>
329      <attribute name="workdir"/>
330      <attribute name="classes"/>
331 +    <attribute name="verbose" default="${jtreg.verbose}"/>
332      <attribute name="jtregflags" default=""/>
333 +    <element name="jtreg-elements" optional="true"/>
334  
335      <sequential>
336  
# Line 346 | Line 348
348             workDir="@{workdir}/JTwork">
349        <patternset refid="jdk@{target}.jtreg.tests"/>
350        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
351 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
352 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
351 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
352 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
353        <arg value="-agentvm"/>
354        <arg value="-noreport"/>
355 <      <arg value="-verbose:${jtreg.verbose}"/>
355 >      <arg value="-verbose:@{verbose}"/>
356        <arg value="-vmoptions:-esa -ea"/>
357        <arg value="-automatic"/>
358        <arg value="-k:!ignore"/>
359        <arg line="@{jtregflags}"/>
360        <arg line="${jtreg.flags}"/>
361 +      <jtreg-elements/>
362      </jtreg>
363      </sequential>
364    </macrodef>
# Line 597 | Line 600
600  
601   <!--   </target> -->
602  
603 < <!--   <target name="test89" -->
604 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
603 >  <target name="test910"
604 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
605  
606 < <!--     <antcall target="clean"/> -->
607 < <!--     <antcall target="test"> -->
608 < <!--       <param name="build.main.java.version" value="8"/> -->
609 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
607 < <!--     </antcall> -->
606 >    <antcall target="clean"/>
607 >    <antcall target="test">
608 >      <param name="build.main.java.version" value="9"/>
609 >    </antcall>
610  
611 < <!--     <antcall target="clean"/> -->
612 < <!--     <antcall target="test"> -->
613 < <!--       <param name="build.main.java.version" value="9"/> -->
614 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
613 < <!--     </antcall> -->
611 >    <antcall target="clean"/>
612 >    <antcall target="test">
613 >      <param name="build.main.java.version" value="10"/>
614 >    </antcall>
615  
616 < <!--   </target> -->
616 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
617 >    <antcall target="clean"/>
618 >
619 >  </target>
620  
621  
622  
# Line 1375 | Line 1379
1379  
1380   <!-- ==============================================================
1381    Experimental errorprone support - http://errorprone.info
1378 –  You may need to bring your own errorprone jar.
1382   =================================================================== -->
1383 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1384    <target name="errorprone"
1385            depends="clean, configure-compiler"
1386            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1402
1402             fork="true">
1403  
1404        <include name="**/*.java"/>
1405 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1402 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1403 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1404 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1405 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1406 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1407 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1408 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1409 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1410 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1405 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1406        <compilerarg value="-Xplugin:ErrorProne
1407                            -Xep:IdentityBinaryExpression:WARN
1408                            -Xep:MissingOverride:OFF
# Line 1417 | Line 1412
1412                            -Xep:MultipleTopLevelClasses:ERROR
1413                            -Xep:EmptyIf:ERROR
1414                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1420 –                          -Xep:ArgumentParameterSwap:ERROR
1415                            -Xep:RedundantThrows:ERROR
1416                            -Xep:MethodCanBeStatic:WARN"/>
1417        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1438 | Line 1432
1432        workdir="${build.dir}"
1433        classes="${product.jar}">
1434        <javac-elements>
1435 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1442 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1443 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1444 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1445 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1446 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1447 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1448 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1449 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1450 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1435 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1436          <compilerarg value="-Xplugin:ErrorProne
1437                              -Xep:IdentityBinaryExpression:WARN
1438                              -Xep:BoxedPrimitiveConstructor:OFF
# Line 1460 | Line 1445
1445                              -Xep:MultipleTopLevelClasses:ERROR
1446                              -Xep:EmptyIf:ERROR
1447                              -Xep:LongLiteralLowerCaseSuffix:ERROR
1463 –                            -Xep:ArgumentParameterSwap:ERROR
1448                              -Xep:RedundantThrows:ERROR
1449                              -Xep:MethodCanBeStatic:WARN"/>
1450          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
# Line 1468 | Line 1452
1452      </run-tck-tests>
1453    </target>
1454  
1455 +  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1456 +  <target name="errorprone-jtreg"
1457 +          depends="jar"
1458 +          description="Run errorprone over jtreg tests (experimental)">
1459 +
1460 +    <run-jtreg-tests
1461 +       target="${build.main.java.version}"
1462 +       workdir="${build.dir}"
1463 +       classes="${product.jar}"
1464 +       verbose="all">
1465 +      <jtreg-elements>
1466 +        <arg value="-javacoption:-processorpath"/>
1467 +        <arg value="-javacoption:${errorprone.jar}"/>
1468 +        <arg value="-javacoption:-Xplugin:ErrorProne
1469 +                            -Xep:IdentityBinaryExpression:WARN
1470 +                            -Xep:BoxedPrimitiveConstructor:OFF
1471 +                            -Xep:HashtableContains:OFF
1472 +                            -Xep:ModifyingCollectionWithItself:OFF
1473 +                            -Xep:MissingOverride:OFF
1474 +                            -Xep:MixedArrayDimensions:WARN
1475 +                            -Xep:RemoveUnusedImports:ERROR
1476 +                            -Xep:ClassName:ERROR
1477 +                            -Xep:MultipleTopLevelClasses:ERROR
1478 +                            -Xep:EmptyIf:ERROR
1479 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1480 +                            -Xep:RedundantThrows:ERROR
1481 +                            -Xep:MethodCanBeStatic:WARN"/>
1482 +      </jtreg-elements>
1483 +    </run-jtreg-tests>
1484 +  </target>
1485 +
1486  
1487   <!-- ==============================================================
1488    Running guava tests against jsr166 code
# Line 1522 | Line 1537
1537           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1538      <junit printsummary="true" showoutput="true" haltonfailure="true"
1539             jvm="${build.main.java}" fork="true">
1540 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1540 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1541        <formatter type="brief"/>
1542        <classpath>
1543          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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