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.242 by jsr166, Sat Apr 1 21:47:32 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 296 | Line 296
296    </macrodef>
297  
298    <!-- Define jtreg test sets for different jdk versions -->
299 +  <fileset dir="${jtreg10.src.dir}">
300 +    <patternset id="jdk10.jtreg.tests">
301 +      <include name="**/*.java"/>
302 +    </patternset>
303 +  </fileset>
304 +
305    <fileset dir="${jtreg9.src.dir}">
306      <patternset id="jdk9.jtreg.tests">
307        <include name="**/*.java"/>
# Line 319 | Line 325
325  
326    <macrodef name="run-jtreg-tests">
327      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
322 –    <attribute name="source" default="7"/>
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 341 | 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 367 | Line 375
375    <!-- Main targets -->
376  
377    <property name="build.main.java.version" value="9"/>
378 <  <property name="build.main.javac" value="${javac9}"/>
378 >  <!-- Workaround "no nested properties in ant" -->
379 >  <macrodef name="define-build-main-properties">
380 >    <attribute name="v"/>
381 >    <sequential>
382 >      <property name="build.main.java"    value="${java@{v}}"/>
383 >      <property name="build.main.javac"   value="${javac@{v}}"/>
384 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
385 >    </sequential>
386 >  </macrodef>
387 >  <define-build-main-properties v="${build.main.java.version}"/>
388  
389    <target name="dists"
390            depends="dist, 4jdk8dist"
# Line 380 | Line 397
397            depends="configure-compiler"
398            description="Compiles src/main sources to build dir">
399  
383 –    <local name="modules"/>
384 –    <condition property="modules">
385 –      <and>
386 –        <available file="${jdk9.home}/jmods" type="dir"/>
387 –        <equals arg1="9" arg2="${build.main.java.version}"/>
388 –      </and>
389 –    </condition>
390 –
400      <local name="destdir"/>
401 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
393 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
401 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
402  
403      <mkdir dir="${destdir}"/>
404  
# Line 407 | Line 415
415             fork="true">
416  
417        <include name="**/*.java"/>
418 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
418 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
419        <compilerarg value="-Xprefer:source"/>
420        <compilerarg value="-XDignore.symbol.file=true"/>
421        <compilerarg value="-Xlint:all"/>
422 <      <compilerarg value="-Werror"/>
422 >      <compilerarg line="--doclint-format html5"/>
423        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
424 +      <compilerarg value="-Werror"/>
425        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
426        <compilerarg line="${build.args}"/>
427  
# Line 456 | Line 465
465               access="${build.javadoc.access}"
466               sourcepath="${src.dir}"
467               classpath=""
468 <             executable="${javadoc9}">
468 >             source="9"
469 >             executable="${build.main.javadoc}">
470        <fileset dir="${src.dir}" defaultexcludes="yes">
471          <include name="**/*.java"/>
472        </fileset>
473        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
474        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
475        <arg value="-XDignore.symbol.file=true"/>
476 +      <arg value="-html5"/>
477        <arg value="--patch-module=java.base=${src.dir}"/>
478        <arg value="-tag"/>
479        <arg value="${javadoc.jls.option}"/>
# Line 589 | 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}"/> -->
599 < <!--     </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}"/> -->
605 < <!--     </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 672 | Line 684
684             includeAntRuntime="false"
685             includeJavaRuntime="false"
686             encoding="ASCII"
687 <           executable="${javac9}"
687 >           executable="${build.main.javac}"
688             fork="true">
689  
690        <include name="*.java"/>
# Line 805 | Line 817
817               access="${build.javadoc.access}"
818               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
819               classpath=""
820 +             source="8"
821               executable="${javadoc8}"
822               failonerror = "true">
823        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 1366 | Line 1379
1379  
1380   <!-- ==============================================================
1381    Experimental errorprone support - http://errorprone.info
1369 –  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 1389 | 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"/>
1393 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1394 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1395 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1396 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1397 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1398 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1399 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1400 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1401 <      <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 1408 | Line 1412
1412                            -Xep:MultipleTopLevelClasses:ERROR
1413                            -Xep:EmptyIf:ERROR
1414                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1411 –                          -Xep:ArgumentParameterSwap:ERROR
1415                            -Xep:RedundantThrows:ERROR
1416                            -Xep:MethodCanBeStatic:WARN"/>
1417        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1429 | 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"/>
1433 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1434 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1435 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1436 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1437 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1438 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1439 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1440 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1441 <        <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 1451 | Line 1445
1445                              -Xep:MultipleTopLevelClasses:ERROR
1446                              -Xep:EmptyIf:ERROR
1447                              -Xep:LongLiteralLowerCaseSuffix:ERROR
1454 –                            -Xep:ArgumentParameterSwap:ERROR
1448                              -Xep:RedundantThrows:ERROR
1449                              -Xep:MethodCanBeStatic:WARN"/>
1450          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
# Line 1459 | 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 1512 | Line 1536
1536      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1537           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1538      <junit printsummary="true" showoutput="true" haltonfailure="true"
1539 <           jvm="${java9}" fork="true">
1540 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1539 >           jvm="${build.main.java}" fork="true">
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