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.245 by jsr166, Fri Jun 16 20:50:16 2017 UTC vs.
Revision 1.259 by jsr166, Mon Dec 18 21:07:18 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 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
185 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
186 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
187 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
188 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
189 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
190 >  <!-- The location of jdk9 early access docs (RIP) -->
191 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
192    <!-- Default jdk doc location (latest stable release seems best) -->
193 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
194 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
195  
196    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
197    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 199
199    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
200    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
201    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
202 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
203    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
204  
205    <!-- Define the "jtreg" task -->
# Line 296 | Line 299
299    </macrodef>
300  
301    <!-- Define jtreg test sets for different jdk versions -->
302 +  <fileset dir="${jtreg10.src.dir}">
303 +    <patternset id="jdk10.jtreg.tests">
304 +      <include name="**/*.java"/>
305 +    </patternset>
306 +  </fileset>
307 +
308    <fileset dir="${jtreg9.src.dir}">
309      <patternset id="jdk9.jtreg.tests">
310        <include name="**/*.java"/>
# Line 322 | Line 331
331      <attribute name="target"/>
332      <attribute name="workdir"/>
333      <attribute name="classes"/>
334 +    <attribute name="verbose" default="${jtreg.verbose}"/>
335      <attribute name="jtregflags" default=""/>
336 +    <element name="jtreg-elements" optional="true"/>
337  
338      <sequential>
339  
# Line 340 | Line 351
351             workDir="@{workdir}/JTwork">
352        <patternset refid="jdk@{target}.jtreg.tests"/>
353        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
354 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
355 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
354 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
355 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
356        <arg value="-agentvm"/>
357        <arg value="-noreport"/>
358 <      <arg value="-verbose:${jtreg.verbose}"/>
358 >      <arg value="-verbose:@{verbose}"/>
359        <arg value="-vmoptions:-esa -ea"/>
360        <arg value="-automatic"/>
361        <arg value="-k:!ignore"/>
362        <arg line="@{jtregflags}"/>
363        <arg line="${jtreg.flags}"/>
364 +      <jtreg-elements/>
365      </jtreg>
366      </sequential>
367    </macrodef>
# Line 366 | Line 378
378    <!-- Main targets -->
379  
380    <property name="build.main.java.version" value="9"/>
381 <  <property name="build.main.javac" value="${javac9}"/>
381 >  <!-- Workaround "no nested properties in ant" -->
382 >  <macrodef name="define-build-main-properties">
383 >    <attribute name="v"/>
384 >    <sequential>
385 >      <property name="build.main.java"    value="${java@{v}}"/>
386 >      <property name="build.main.javac"   value="${javac@{v}}"/>
387 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
388 >    </sequential>
389 >  </macrodef>
390 >  <define-build-main-properties v="${build.main.java.version}"/>
391  
392    <target name="dists"
393            depends="dist, 4jdk8dist"
# Line 379 | Line 400
400            depends="configure-compiler"
401            description="Compiles src/main sources to build dir">
402  
382 –    <local name="modules"/>
383 –    <condition property="modules">
384 –      <and>
385 –        <available file="${jdk9.home}/jmods" type="dir"/>
386 –        <equals arg1="9" arg2="${build.main.java.version}"/>
387 –      </and>
388 –    </condition>
389 –
403      <local name="destdir"/>
404 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
404 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
405  
406      <mkdir dir="${destdir}"/>
407  
# Line 406 | Line 418
418             fork="true">
419  
420        <include name="**/*.java"/>
421 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
421 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
422        <compilerarg value="-Xprefer:source"/>
423        <compilerarg value="-XDignore.symbol.file=true"/>
424        <compilerarg value="-Xlint:all"/>
# Line 457 | Line 469
469               sourcepath="${src.dir}"
470               classpath=""
471               source="9"
472 <             executable="${javadoc9}">
472 >             executable="${build.main.javadoc}">
473        <fileset dir="${src.dir}" defaultexcludes="yes">
474          <include name="**/*.java"/>
475        </fileset>
# Line 591 | Line 603
603  
604   <!--   </target> -->
605  
606 < <!--   <target name="test89" -->
607 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
606 >  <target name="test910"
607 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
608  
609 < <!--     <antcall target="clean"/> -->
610 < <!--     <antcall target="test"> -->
611 < <!--       <param name="build.main.java.version" value="8"/> -->
612 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
601 < <!--     </antcall> -->
609 >    <antcall target="clean"/>
610 >    <antcall target="test">
611 >      <param name="build.main.java.version" value="9"/>
612 >    </antcall>
613  
614 < <!--     <antcall target="clean"/> -->
615 < <!--     <antcall target="test"> -->
616 < <!--       <param name="build.main.java.version" value="9"/> -->
617 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
607 < <!--     </antcall> -->
614 >    <antcall target="clean"/>
615 >    <antcall target="test">
616 >      <param name="build.main.java.version" value="10"/>
617 >    </antcall>
618  
619 < <!--   </target> -->
619 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
620 >    <antcall target="clean"/>
621 >
622 >  </target>
623  
624  
625  
# Line 674 | Line 687
687             includeAntRuntime="false"
688             includeJavaRuntime="false"
689             encoding="ASCII"
690 <           executable="${javac9}"
690 >           executable="${build.main.javac}"
691             fork="true">
692  
693        <include name="*.java"/>
# Line 1369 | Line 1382
1382  
1383   <!-- ==============================================================
1384    Experimental errorprone support - http://errorprone.info
1372 –  You may need to bring your own errorprone jar.
1385   =================================================================== -->
1386 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
1387    <target name="errorprone"
1388            depends="clean, configure-compiler"
1389            description="Run errorprone over jsr166 source code (experimental)">
# Line 1392 | Line 1405
1405             fork="true">
1406  
1407        <include name="**/*.java"/>
1408 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1396 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1397 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1398 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1399 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1400 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1401 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1402 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1404 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1408 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1409        <compilerarg value="-Xplugin:ErrorProne
1410                            -Xep:IdentityBinaryExpression:WARN
1411                            -Xep:MissingOverride:OFF
1412 <                          -Xep:MixedArrayDimensions:WARN
1412 >                          -Xep:MixedArrayDimensions:ERROR
1413                            -Xep:RemoveUnusedImports:ERROR
1414                            -Xep:ClassName:ERROR
1415                            -Xep:MultipleTopLevelClasses:ERROR
1416                            -Xep:EmptyIf:ERROR
1417                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1414 –                          -Xep:ArgumentParameterSwap:ERROR
1418                            -Xep:RedundantThrows:ERROR
1419                            -Xep:MethodCanBeStatic:WARN"/>
1420        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1432 | Line 1435
1435        workdir="${build.dir}"
1436        classes="${product.jar}">
1437        <javac-elements>
1438 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1436 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1437 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1438 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1439 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1440 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1441 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1442 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1444 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1438 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1439          <compilerarg value="-Xplugin:ErrorProne
1440                              -Xep:IdentityBinaryExpression:WARN
1441                              -Xep:BoxedPrimitiveConstructor:OFF
1442                              -Xep:HashtableContains:OFF
1443                              -Xep:ModifyingCollectionWithItself:OFF
1444                              -Xep:MissingOverride:OFF
1445 <                            -Xep:MixedArrayDimensions:WARN
1445 >                            -Xep:MissingFail:OFF
1446 >                            -Xep:JdkObsolete:OFF
1447 >                            -Xep:MixedArrayDimensions:ERROR
1448                              -Xep:RemoveUnusedImports:ERROR
1449                              -Xep:ClassName:ERROR
1450                              -Xep:MultipleTopLevelClasses:ERROR
1451                              -Xep:EmptyIf:ERROR
1452                              -Xep:LongLiteralLowerCaseSuffix:ERROR
1457 –                            -Xep:ArgumentParameterSwap:ERROR
1453                              -Xep:RedundantThrows:ERROR
1454                              -Xep:MethodCanBeStatic:WARN"/>
1455          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
# Line 1462 | Line 1457
1457      </run-tck-tests>
1458    </target>
1459  
1460 +  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1461 +  <target name="errorprone-jtreg"
1462 +          depends="jar"
1463 +          description="Run errorprone over jtreg tests (experimental)">
1464 +
1465 +    <run-jtreg-tests
1466 +       target="${build.main.java.version}"
1467 +       workdir="${build.dir}"
1468 +       classes="${product.jar}"
1469 +       verbose="all">
1470 +      <jtreg-elements>
1471 +        <arg value="-javacoption:-processorpath"/>
1472 +        <arg value="-javacoption:${errorprone.jar}"/>
1473 +        <arg value="-javacoption:-Xplugin:ErrorProne
1474 +                            -Xep:IdentityBinaryExpression:WARN
1475 +                            -Xep:BoxedPrimitiveConstructor:OFF
1476 +                            -Xep:HashtableContains:OFF
1477 +                            -Xep:ModifyingCollectionWithItself:OFF
1478 +                            -Xep:MissingOverride:OFF
1479 +                            -Xep:JdkObsolete:OFF
1480 +                            -Xep:NonAtomicVolatileUpdate:OFF
1481 +                            -Xep:MixedArrayDimensions:ERROR
1482 +                            -Xep:RemoveUnusedImports:ERROR
1483 +                            -Xep:ClassName:ERROR
1484 +                            -Xep:MultipleTopLevelClasses:ERROR
1485 +                            -Xep:EmptyIf:ERROR
1486 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1487 +                            -Xep:RedundantThrows:ERROR
1488 +                            -Xep:MethodCanBeStatic:WARN"/>
1489 +      </jtreg-elements>
1490 +    </run-jtreg-tests>
1491 +  </target>
1492 +
1493  
1494   <!-- ==============================================================
1495    Running guava tests against jsr166 code
# Line 1515 | Line 1543
1543      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1544           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1545      <junit printsummary="true" showoutput="true" haltonfailure="true"
1546 <           jvm="${java9}" fork="true">
1547 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1546 >           jvm="${build.main.java}" fork="true">
1547 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1548        <formatter type="brief"/>
1549        <classpath>
1550          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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