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.269 by jsr166, Wed Mar 21 23:10:39 2018 UTC vs.
Revision 1.293 by jsr166, Thu Dec 13 01:15:07 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 23 | Line 23
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27 +  $HOME/jdk/jdk13
28    where each of the above is a JDK or a symlink to same, and
29    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11
33 +  $HOME/jdk/src/jdk12
34 +  $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.
37  
38    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...
40 <  for $N in 8 9 10 ...
40 >  for $N in 8 .. 13 ...
41  
42    As of 2016-03, the sources in src/main are for jdk9+ only.
43   ------------------------------------------------------------------------------
# Line 53 | Line 57
57  
58  
59    <!-- Compilation options -->
56  <property name="build.sourcelevel"    value="6"/>
60    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>
# Line 104 | Line 107
107      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
108        unless:set="have.java.base"/>
109      <local name="modules"/>
110 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
110 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>
112      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113      <path id="bootclasspath@{v}" unless:set="modules">
# Line 136 | Line 139
139    <defjdklocations v="9"/>
140    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>
142 +  <defjdklocations v="12"/>
143  
144    <!-- Source locations -->
145    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 147 | Line 151
151    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
152    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
153    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
154 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
156    <property name="lib.dir"              location="${basedir}/lib"/>
157    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 193 | Line 198
198    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
199    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
200    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
201 +  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
202    <!-- The location of jdk early access docs (RIP) -->
203    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
204    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
205 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
206 <  <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
205 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
206 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
207 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
208 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
209  
210    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 208 | Line 215
215    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
220  
221    <!-- Define the "jtreg" task -->
# Line 240 | Line 248
248  
249      <local name="modules"/>
250      <condition property="modules">
251 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
251 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252      </condition>
253  
254      <local name="use-doclint"/>
# Line 321 | Line 329
329      </sequential>
330    </macrodef>
331  
332 +  <defjtregtests v="12"/>
333    <defjtregtests v="11"/>
334    <defjtregtests v="10"/>
335    <defjtregtests v="9"/>
# Line 331 | Line 340
340    <property name="jtreg.flags" value=""/>
341  
342    <macrodef name="run-jtreg-tests">
343 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
343 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
344      <attribute name="target"/>
345      <attribute name="workdir"/>
346      <attribute name="classes"/>
# Line 346 | Line 355
355  
356      <local name="modules"/>
357      <condition property="modules">
358 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
358 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
359      </condition>
360  
361      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 381 | Line 390
390  
391    <!-- Main targets -->
392  
393 <  <property name="build.main.java.version" value="9"/>
394 <  <!-- Workaround "no nested properties in ant" -->
395 <  <macrodef name="define-build-main-properties">
396 <    <attribute name="v"/>
397 <    <sequential>
398 <      <property name="build.main.java"    value="${java@{v}}"/>
399 <      <property name="build.main.javac"   value="${javac@{v}}"/>
400 <      <!-- Force javadoc version to be at least 10,
401 <           so we can use override-methods=summary -->
402 <      <condition property="build.main.javadoc"
403 <                 value="${javadoc11}"
404 <                 else="${javadoc@{v}}">
405 <        <equals arg1="@{v}" arg2="9"/>
406 <      </condition>
398 <    </sequential>
399 <  </macrodef>
400 <  <define-build-main-properties v="${build.main.java.version}"/>
393 >  <!-- Default values: may seem strange ... -->
394 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
395 >  <!-- But at build time, target jdk9, for maximal binary portability -->
396 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
397 >    o override-methods=summary
398 >    o {@systemProperty ...}
399 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
400 >    o 8202628: javadoc generates bad links in TestModules.java
401 >    -->
402 >  <property name="java.runtime.target" value="11"/>
403 >  <property name="build.main.java" value="${java11}"/>
404 >  <property name="build.main.javac" value="${javac9}"/>
405 >  <property name="build.main.javadoc" value="${javadoc12}"/>
406 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
407  
408    <target name="dists"
409            depends="dist, 4jdk8dist"
410            description="Builds all public jars and docs"/>
411 <          <!--
406 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407 <          -->
411 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
412  
413    <target name="compile"
414            depends="configure-compiler"
# Line 431 | Line 435
435        <compilerarg value="--patch-module=java.base=${src.dir}"/>
436        <compilerarg value="-Xprefer:source"/>
437        <compilerarg value="-XDignore.symbol.file=true"/>
438 <      <compilerarg value="-Xlint:all"/>
438 >      <compilerarg value="-Xlint:all,-removal"/>
439        <compilerarg line="--doclint-format html5"/>
440        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
441        <compilerarg value="-Werror"/>
# Line 473 | Line 477
477   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
478      <javadoc destdir="${docs.dir}"
479               packagenames="none"
480 <             link="${java9.api.url}"
480 >             link="${java.api.url}"
481               overview="${src.dir}/intro.html"
482               access="${build.javadoc.access}"
483               sourcepath="${src.dir}"
484               classpath=""
485 <             source="9"
485 >             source="${build.main.javadoc.source}"
486               executable="${build.main.javadoc}">
487 + <!-- TODO: JDK-8214571 failonerror = "true" -->
488        <fileset dir="${src.dir}" defaultexcludes="yes">
489          <include name="**/*.java"/>
490        </fileset>
491 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
491 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
492        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
493        <arg value="-XDignore.symbol.file=true"/>
494        <arg value="-html5"/>
495        <arg value="--patch-module=java.base=${src.dir}"/>
496 + <!-- old school frames via docs/index.html?overview-summary.html -->
497 +      <arg value="--frames"/>
498        <arg value="--override-methods=summary"/>
499        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
500        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
501        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
502 < <!-- @apiNote tag currently unused -->
496 < <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
502 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
503   <!-- tags added in jdk9: currently unused -->
504   <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
505   <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 506 | Line 512
512            description="Puts all distributable products in single hierarchy"/>
513  
514  
509  <target name="release"
510          depends="dist"
511          description="Puts entire CVS tree, plus distribution productions, in a jar">
512
513    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
514
515    <jar basedir="${basedir}" destfile="${release.jar}">
516      <!-- <exclude name="build/**"/> -->
517      <exclude name="${release.jar}"/>
518      <exclude name="user.properties"/>
519      <exclude name="etc/notes/**"/>
520      <exclude name="src/emulation/**"/>
521      <exclude name="**/SyntaxTest.java"/>
522      <exclude name="**/SuperfluousAbstract.java"/>
523      <manifest>
524        <attribute name="Built-By" value="${user.name}"/>
525        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
526      </manifest>
527    </jar>
528  </target>
529
530
515    <target name="clean"
516            description="Removes all build products">
517      <delete dir="${build.dir}"/>
# Line 556 | Line 540
540            description="Runs tck tests for src/main directly">
541  
542      <run-tck-tests
543 <      target="${build.main.java.version}"
543 >      target="${java.runtime.target}"
544        workdir="${build.dir}"
545        classes="${product.jar}">
546        <javac-elements>
# Line 590 | Line 574
574            depends="jar"
575            description="Runs jtreg tests for src/main using the jtreg ant task">
576      <run-jtreg-tests
577 <       target="${build.main.java.version}"
577 >       target="${java.runtime.target}"
578         workdir="${build.dir}"
579         classes="${product.jar}"/>
580    </target>
# Line 599 | Line 583
583            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
584            description="Runs tck and jtreg tests for src/main"/>
585  
586 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
587 <
588 < <!--     <antcall target="jtreg"> -->
605 < <!--       <param name="build.main.java.version" value="8"/> -->
606 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
607 < <!--     </antcall> -->
608 <
609 < <!--   </target> -->
610 <
611 <  <target name="test91011"
612 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
586 >  <target name="test-version-permutations"
587 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
588 >  </target>
589  
590 +  <target name="test9">
591      <antcall target="clean"/>
592 <    <antcall target="test">
593 <      <param name="build.main.java.version" value="9"/>
592 >    <antcall>
593 >      <param name="java.runtime.target" value="9"/>
594 >      <param name="build.main.javac" value="${javac9}"/>
595 >      <param name="build.main.javadoc" value="${javadoc12}"/>
596 >      <param name="build.main.javadoc.source" value="9"/>
597 >      <target name="test"/>
598 >      <target name="docs"/>
599      </antcall>
600 +  </target>
601  
602 +  <target name="test10">
603      <antcall target="clean"/>
604 <    <antcall target="test">
605 <      <param name="build.main.java.version" value="10"/>
604 >    <antcall>
605 >      <param name="java.runtime.target" value="10"/>
606 >      <param name="build.main.javac" value="${javac10}"/>
607 >      <param name="build.main.javadoc" value="${javadoc12}"/>
608 >      <param name="build.main.javadoc.source" value="10"/>
609 >      <target name="test"/>
610 >      <target name="docs"/>
611      </antcall>
612 +  </target>
613  
614 +  <target name="test11">
615      <antcall target="clean"/>
616 <    <antcall target="test">
617 <      <param name="build.main.java.version" value="11"/>
616 >    <antcall>
617 >      <param name="java.runtime.target" value="11"/>
618 >      <param name="build.main.javac" value="${javac11}"/>
619 >      <param name="build.main.javadoc" value="${javadoc12}"/>
620 >      <param name="build.main.javadoc.source" value="11"/>
621 >      <target name="test"/>
622 >      <target name="docs"/>
623      </antcall>
624 +  </target>
625  
626 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
626 >  <target name="test12">
627      <antcall target="clean"/>
628 +    <antcall>
629 +      <param name="java.runtime.target" value="12"/>
630 +      <param name="build.main.javac" value="${javac12}"/>
631 +      <param name="build.main.javadoc" value="${javadoc12}"/>
632 +      <param name="build.main.javadoc.source" value="12"/>
633 +      <target name="test"/>
634 +      <target name="docs"/>
635 +    </antcall>
636 +  </target>
637  
638 +  <target name="test9-11">
639 +    <antcall target="clean"/>
640 +    <antcall>
641 +      <param name="java.runtime.target" value="11"/>
642 +      <param name="build.main.javac" value="${javac9}"/>
643 +      <param name="build.main.javadoc" value="${javadoc12}"/>
644 +      <param name="build.main.javadoc.source" value="9"/>
645 +      <target name="test"/>
646 +      <target name="docs"/>
647 +    </antcall>
648    </target>
649  
650 +  <target name="test9-12">
651 +    <antcall target="clean"/>
652 +    <antcall>
653 +      <param name="java.runtime.target" value="12"/>
654 +      <param name="build.main.javac" value="${javac9}"/>
655 +      <param name="build.main.javadoc" value="${javadoc12}"/>
656 +      <param name="build.main.javadoc.source" value="9"/>
657 +      <target name="test"/>
658 +      <target name="docs"/>
659 +    </antcall>
660 +  </target>
661  
662  
663    <target name="configure-compiler">
# Line 653 | Line 680
680    </target>
681  
682  
656
657  <!-- Various demos and test programs -->
658
659
660  <!-- description="Benchmark from Doug Lea's AQS paper" -->
661  <target name="loops" depends="configure-compiler">
662
663    <mkdir dir="${build.loops.dir}"/>
664
665    <javac srcdir="${loops.src.dir}"
666          destdir="${build.loops.dir}"
667            debug="${build.debug}"
668       debuglevel="${build.debuglevel}"
669      deprecation="${build.deprecation}"
670           source="${build.sourcelevel}"
671           target="${build.sourcelevel}"
672         encoding="ASCII"
673             fork="true">
674
675      <compilerarg line="${build.args}"/>
676      <classpath refid="loops.classpath"/>
677      <compilerarg value="-XDignore.symbol.file=true"/>
678
679    </javac>
680
681    <java classname="ALoops" fork="true">
682      <classpath refid="loops.classpath"/>
683    </java>
684  </target>
685
686
683    <target name="compile-test-loops" depends="jar"
684            description="Compiles all the perf tests in src/test/loops">
685  
# Line 1387 | Line 1383
1383  
1384  
1385   <!-- ==============================================================
1386 <  Experimental errorprone support - http://errorprone.info
1386 >  Experimental errorprone support
1387 >  https://errorprone.info
1388 >  https://errorprone.info/docs/installation
1389 >  https://github.com/google/error-prone/issues/1143
1390   =================================================================== -->
1391 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1391 >  <path id="errorprone.processorpath.path">
1392 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1393 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1394 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1395 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1396 >  </path>
1397 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1398    <property name="errorprone.jsr166.user.flags" value=""/>
1399    <property name="errorprone.jsr166.flags"
1400              value="-Xep:HashtableContains:OFF
1401                     -Xep:JdkObsolete:OFF
1402                     -Xep:MissingOverride:OFF
1403                     -Xep:MissingFail:OFF
1404 +                   -Xep:ThreadPriorityCheck:OFF
1405                     -Xep:MixedArrayDimensions:ERROR
1406                     -Xep:RemoveUnusedImports:ERROR
1407                     -Xep:EmptyIf:ERROR
# Line 1404 | Line 1410
1410                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1411                     -Xep:RedundantThrows:ERROR
1412                     -Xep:IdentityBinaryExpression:WARN
1413 +                   -Xep:ConstructorInvokesOverridable:WARN
1414                     -Xep:MethodCanBeStatic:WARN
1415                     ${errorprone.jsr166.user.flags}"/>
1416    <!-- -Xep:WildcardImport:ERROR -->
# Line 1433 | Line 1440
1440             fork="true">
1441  
1442        <include name="**/*.java"/>
1443 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1444 +      <compilerarg value="-J--illegal-access=permit"/>
1445        <compilerarg value="-XDcompilePolicy=simple"/>
1446 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1446 >      <compilerarg value="-processorpath"/>
1447 >      <compilerarg pathref="errorprone.processorpath.path"/>
1448        <compilerarg value="-Xplugin:ErrorProne
1449                            ${errorprone.jsr166.flags}"/>
1450        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1451 | Line 1461
1461      </jar>
1462  
1463      <run-tck-tests
1464 <      target="${build.main.java.version}"
1464 >      target="${java.runtime.target}"
1465        workdir="${build.dir}"
1466        classes="${product.jar}">
1467        <javac-elements>
1468 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1469 +        <compilerarg value="-J--illegal-access=permit"/>
1470          <compilerarg value="-XDcompilePolicy=simple"/>
1471 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1471 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1472          <compilerarg value="-Xplugin:ErrorProne
1473                              ${errorprone.jsr166.flags}
1474                              ${errorprone.jsr166.test.flags}"/>
# Line 1472 | Line 1484
1484            description="Run errorprone over jtreg tests (experimental)">
1485  
1486      <run-jtreg-tests
1487 <       target="${build.main.java.version}"
1487 >       target="${java.runtime.target}"
1488         workdir="${build.dir}"
1489         classes="${product.jar}"
1490         verbose="all">
1491        <jtreg-elements>
1492          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1493          <arg value="-javacoption:-processorpath"/>
1494 <        <arg value="-javacoption:${errorprone.jar}"/>
1494 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1495          <arg value="-javacoption:-Xplugin:ErrorProne
1496                              ${errorprone.jsr166.flags}
1497                              ${errorprone.jsr166.test.flags}
1498 +                            -Xep:MultipleTopLevelClasses:WARN
1499                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1500        </jtreg-elements>
1501      </run-jtreg-tests>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines