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.254 by jsr166, Mon Sep 25 22:54:09 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 346 | Line 346
346             workDir="@{workdir}/JTwork">
347        <patternset refid="jdk@{target}.jtreg.tests"/>
348        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
349 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
350 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
349 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
350 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
351        <arg value="-agentvm"/>
352        <arg value="-noreport"/>
353        <arg value="-verbose:${jtreg.verbose}"/>
# Line 597 | Line 597
597  
598   <!--   </target> -->
599  
600 < <!--   <target name="test89" -->
601 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
600 >  <target name="test910"
601 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
602  
603 < <!--     <antcall target="clean"/> -->
604 < <!--     <antcall target="test"> -->
605 < <!--       <param name="build.main.java.version" value="8"/> -->
606 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
607 < <!--     </antcall> -->
603 >    <antcall target="clean"/>
604 >    <antcall target="test">
605 >      <param name="build.main.java.version" value="9"/>
606 >    </antcall>
607  
608 < <!--     <antcall target="clean"/> -->
609 < <!--     <antcall target="test"> -->
610 < <!--       <param name="build.main.java.version" value="9"/> -->
611 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
613 < <!--     </antcall> -->
608 >    <antcall target="clean"/>
609 >    <antcall target="test">
610 >      <param name="build.main.java.version" value="10"/>
611 >    </antcall>
612  
613 < <!--   </target> -->
613 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
614 >    <antcall target="clean"/>
615 >
616 >  </target>
617  
618  
619  
# Line 1375 | Line 1376
1376  
1377   <!-- ==============================================================
1378    Experimental errorprone support - http://errorprone.info
1378 –  You may need to bring your own errorprone jar.
1379   =================================================================== -->
1380 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1381    <target name="errorprone"
1382            depends="clean, configure-compiler"
1383            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1399
1399             fork="true">
1400  
1401        <include name="**/*.java"/>
1402 <      <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"/>
1402 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1403        <compilerarg value="-Xplugin:ErrorProne
1404                            -Xep:IdentityBinaryExpression:WARN
1405                            -Xep:MissingOverride:OFF
# Line 1417 | Line 1409
1409                            -Xep:MultipleTopLevelClasses:ERROR
1410                            -Xep:EmptyIf:ERROR
1411                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1420 –                          -Xep:ArgumentParameterSwap:ERROR
1412                            -Xep:RedundantThrows:ERROR
1413                            -Xep:MethodCanBeStatic:WARN"/>
1414        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1438 | Line 1429
1429        workdir="${build.dir}"
1430        classes="${product.jar}">
1431        <javac-elements>
1432 <        <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"/>
1432 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1433          <compilerarg value="-Xplugin:ErrorProne
1434                              -Xep:IdentityBinaryExpression:WARN
1435                              -Xep:BoxedPrimitiveConstructor:OFF
# Line 1460 | Line 1442
1442                              -Xep:MultipleTopLevelClasses:ERROR
1443                              -Xep:EmptyIf:ERROR
1444                              -Xep:LongLiteralLowerCaseSuffix:ERROR
1463 –                            -Xep:ArgumentParameterSwap:ERROR
1445                              -Xep:RedundantThrows:ERROR
1446                              -Xep:MethodCanBeStatic:WARN"/>
1447          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
# Line 1522 | Line 1503
1503           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1504      <junit printsummary="true" showoutput="true" haltonfailure="true"
1505             jvm="${build.main.java}" fork="true">
1506 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1506 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1507        <formatter type="brief"/>
1508        <classpath>
1509          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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