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.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC vs.
Revision 1.289 by jsr166, Sun Dec 2 22:40:03 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 22 | Line 23
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10
31    $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
# Line 52 | Line 55
55  
56  
57    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
58    <property name="build.debug"          value="true"/>
59    <property name="build.debuglevel"     value="source,lines,vars"/>
60    <property name="build.deprecation"    value="false"/>
# Line 103 | Line 105
105      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106        unless:set="have.java.base"/>
107      <local name="modules"/>
108 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109      <local name="boot.jar.dir"/>
110      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111      <path id="bootclasspath@{v}" unless:set="modules">
# Line 135 | Line 137
137    <defjdklocations v="9"/>
138    <defjdklocations v="10"/>
139    <defjdklocations v="11"/>
140 +  <defjdklocations v="12"/>
141  
142    <!-- Source locations -->
143    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 146 | Line 149
149    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
151    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
154    <property name="lib.dir"              location="${basedir}/lib"/>
155    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 191 | Line 195
195    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
196    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198 <  <!-- The location of jdk9 early access docs (RIP) -->
198 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200 >  <!-- The location of jdk early access docs (RIP) -->
201    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 +  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203 +  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204 +  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205    <!-- Default jdk doc location (latest stable release seems best) -->
206 <  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
207 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
208 <  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
206 >  <!-- But pin to jdk 10 until fix for -->
207 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208 >  <property name="java.docroot.url"   value="${java10.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 206 | 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 238 | 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 305 | Line 315
315    </macrodef>
316  
317    <!-- Define jtreg test sets for different jdk versions -->
318 <  <fileset dir="${jtreg11.src.dir}">
319 <    <patternset id="jdk11.jtreg.tests">
320 <      <include name="**/*.java"/>
321 <    </patternset>
322 <  </fileset>
323 <
324 <  <fileset dir="${jtreg10.src.dir}">
325 <    <patternset id="jdk10.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
329 <
330 <  <fileset dir="${jtreg9.src.dir}">
321 <    <patternset id="jdk9.jtreg.tests">
322 <      <include name="**/*.java"/>
323 <    </patternset>
324 <  </fileset>
325 <
326 <  <fileset dir="${jtreg8.src.dir}">
327 <    <patternset id="jdk8.jtreg.tests">
328 <      <include name="**/*.java"/>
329 <    </patternset>
330 <  </fileset>
318 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320 >  <property name="jtreg.test.pattern" value="**/*.java"/>
321 >  <macrodef name="defjtregtests">
322 >    <attribute name="v"/>
323 >    <sequential>
324 >      <fileset dir="${jtreg@{v}.src.dir}">
325 >        <patternset id="jdk@{v}.jtreg.tests">
326 >          <include name="${jtreg.test.pattern}"/>
327 >        </patternset>
328 >      </fileset>
329 >    </sequential>
330 >  </macrodef>
331  
332 <  <fileset dir="${jtreg7.src.dir}">
333 <    <patternset id="jdk7.jtreg.tests">
334 <      <include name="**/*.java"/>
335 <    </patternset>
336 <  </fileset>
332 >  <defjtregtests v="12"/>
333 >  <defjtregtests v="11"/>
334 >  <defjtregtests v="10"/>
335 >  <defjtregtests v="9"/>
336 >  <defjtregtests v="8"/>
337 >  <defjtregtests v="7"/>
338  
339    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340    <property name="jtreg.flags" value=""/>
# Line 354 | 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 389 | 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,
400 <           so we can use override-methods=summary -->
401 <      <condition property="build.main.javadoc"
402 <                 value="${javadoc10}"
403 <                 else="${javadoc@{v}}">
404 <        <equals arg1="@{v}" arg2="9"/>
405 <      </condition>
406 <    </sequential>
407 <  </macrodef>
408 <  <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, so we can use override-methods=summary, and JDK-8202628 -->
397 >  <property name="build.main.java.version" value="11"/>
398 >  <property name="build.main.java" value="${java11}"/>
399 >  <property name="build.main.javac" value="${javac9}"/>
400 >  <property name="build.main.javadoc" value="${javadoc12}"/>
401  
402    <target name="dists"
403            depends="dist, 4jdk8dist"
404            description="Builds all public jars and docs"/>
405 <          <!--
414 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415 <          -->
405 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406  
407    <target name="compile"
408            depends="configure-compiler"
# Line 439 | Line 429
429        <compilerarg value="--patch-module=java.base=${src.dir}"/>
430        <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>
432 <      <compilerarg value="-Xlint:all"/>
432 >      <compilerarg value="-Xlint:all,-removal"/>
433        <compilerarg line="--doclint-format html5"/>
434        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
435        <compilerarg value="-Werror"/>
# Line 481 | Line 471
471   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
472      <javadoc destdir="${docs.dir}"
473               packagenames="none"
474 <             link="${java9.api.url}"
474 >             link="${java11.api.url}"
475               overview="${src.dir}/intro.html"
476               access="${build.javadoc.access}"
477               sourcepath="${src.dir}"
478               classpath=""
479 <             source="9"
479 >             source="11"
480               executable="${build.main.javadoc}">
481        <fileset dir="${src.dir}" defaultexcludes="yes">
482          <include name="**/*.java"/>
483        </fileset>
484 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
484 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
485        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
486        <arg value="-XDignore.symbol.file=true"/>
487        <arg value="-html5"/>
488        <arg value="--patch-module=java.base=${src.dir}"/>
489 + <!-- old school frames via docs/index.html?overview-summary.html -->
490 +      <arg value="--frames"/>
491        <arg value="--override-methods=summary"/>
492        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495 < <!-- @apiNote tag currently unused -->
504 < <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
495 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
496   <!-- tags added in jdk9: currently unused -->
497   <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498   <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 514 | Line 505
505            description="Puts all distributable products in single hierarchy"/>
506  
507  
517  <target name="release"
518          depends="dist"
519          description="Puts entire CVS tree, plus distribution productions, in a jar">
520
521    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
522
523    <jar basedir="${basedir}" destfile="${release.jar}">
524      <!-- <exclude name="build/**"/> -->
525      <exclude name="${release.jar}"/>
526      <exclude name="user.properties"/>
527      <exclude name="etc/notes/**"/>
528      <exclude name="src/emulation/**"/>
529      <exclude name="**/SyntaxTest.java"/>
530      <exclude name="**/SuperfluousAbstract.java"/>
531      <manifest>
532        <attribute name="Built-By" value="${user.name}"/>
533        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
534      </manifest>
535    </jar>
536  </target>
537
538
508    <target name="clean"
509            description="Removes all build products">
510      <delete dir="${build.dir}"/>
# Line 607 | Line 576
576            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
577            description="Runs tck and jtreg tests for src/main"/>
578  
579 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
580 <
581 < <!--     <antcall target="jtreg"> -->
613 < <!--       <param name="build.main.java.version" value="8"/> -->
614 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
615 < <!--     </antcall> -->
616 <
617 < <!--   </target> -->
618 <
619 <  <target name="test91011"
620 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
579 >  <target name="test-version-permutations"
580 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
581 >  </target>
582  
583 +  <target name="test9">
584      <antcall target="clean"/>
585 <    <antcall target="test">
585 >    <antcall>
586        <param name="build.main.java.version" value="9"/>
587 +      <param name="build.main.java" value="${java9}"/>
588 +      <param name="build.main.javac" value="${javac9}"/>
589 +      <target name="test"/>
590      </antcall>
591 +  </target>
592  
593 +  <target name="test10">
594      <antcall target="clean"/>
595 <    <antcall target="test">
595 >    <antcall>
596        <param name="build.main.java.version" value="10"/>
597 +      <param name="build.main.java" value="${java10}"/>
598 +      <param name="build.main.javac" value="${javac10}"/>
599 +      <param name="build.main.javadoc" value="${javadoc10}"/>
600 +      <target name="test"/>
601 +      <target name="docs"/>
602      </antcall>
603 +  </target>
604  
605 +  <target name="test11">
606      <antcall target="clean"/>
607 <    <antcall target="test">
607 >    <antcall>
608        <param name="build.main.java.version" value="11"/>
609 +      <param name="build.main.java" value="${java11}"/>
610 +      <param name="build.main.javac" value="${javac11}"/>
611 +      <param name="build.main.javadoc" value="${javadoc11}"/>
612 +      <target name="test"/>
613 +      <target name="docs"/>
614      </antcall>
615 +  </target>
616  
617 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
617 >  <target name="test12">
618      <antcall target="clean"/>
619 +    <antcall>
620 +      <param name="build.main.java.version" value="12"/>
621 +      <param name="build.main.java" value="${java12}"/>
622 +      <param name="build.main.javac" value="${javac12}"/>
623 +      <param name="build.main.javadoc" value="${javadoc12}"/>
624 +      <target name="test"/>
625 +      <target name="docs"/>
626 +    </antcall>
627 +  </target>
628  
629 +  <target name="test9-11">
630 +    <antcall target="clean"/>
631 +    <antcall>
632 +      <param name="build.main.java.version" value="11"/>
633 +      <param name="build.main.java" value="${java11}"/>
634 +      <param name="build.main.javac" value="${javac9}"/>
635 +      <param name="build.main.javadoc" value="${javadoc11}"/>
636 +      <target name="test"/>
637 +      <target name="docs"/>
638 +    </antcall>
639    </target>
640  
641 +  <target name="test9-12">
642 +    <antcall target="clean"/>
643 +    <antcall>
644 +      <param name="build.main.java.version" value="12"/>
645 +      <param name="build.main.java" value="${java12}"/>
646 +      <param name="build.main.javac" value="${javac9}"/>
647 +      <param name="build.main.javadoc" value="${javadoc12}"/>
648 +      <target name="test"/>
649 +      <target name="docs"/>
650 +    </antcall>
651 +  </target>
652  
653  
654    <target name="configure-compiler">
# Line 661 | Line 671
671    </target>
672  
673  
664
665  <!-- Various demos and test programs -->
666
667
668  <!-- description="Benchmark from Doug Lea's AQS paper" -->
669  <target name="loops" depends="configure-compiler">
670
671    <mkdir dir="${build.loops.dir}"/>
672
673    <javac srcdir="${loops.src.dir}"
674          destdir="${build.loops.dir}"
675            debug="${build.debug}"
676       debuglevel="${build.debuglevel}"
677      deprecation="${build.deprecation}"
678           source="${build.sourcelevel}"
679           target="${build.sourcelevel}"
680         encoding="ASCII"
681             fork="true">
682
683      <compilerarg line="${build.args}"/>
684      <classpath refid="loops.classpath"/>
685      <compilerarg value="-XDignore.symbol.file=true"/>
686
687    </javac>
688
689    <java classname="ALoops" fork="true">
690      <classpath refid="loops.classpath"/>
691    </java>
692  </target>
693
694
674    <target name="compile-test-loops" depends="jar"
675            description="Compiles all the perf tests in src/test/loops">
676  
# Line 1380 | Line 1359
1359  
1360   <!-- Find buglets that can be detected by static build tools -->
1361  
1362 <  <target name="lint">
1363 <    <antcall target="dists">
1364 <      <param name="build.javadoc.access" value="public"/>
1365 <    </antcall>
1366 <  </target>
1362 > <!--   <target name="lint"> -->
1363 > <!--     <antcall target="dists"> -->
1364 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1365 > <!--     </antcall> -->
1366 > <!--   </target> -->
1367  
1368   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1369 <  <target name="lint-private">
1369 >  <target name="doclint-private">
1370      <antcall target="dist">
1371        <param name="build.javadoc.access" value="private"/>
1372      </antcall>
# Line 1395 | Line 1374
1374  
1375  
1376   <!-- ==============================================================
1377 <  Experimental errorprone support - http://errorprone.info
1377 >  Experimental errorprone support
1378 >  https://errorprone.info
1379 >  https://errorprone.info/docs/installation
1380 >  https://github.com/google/error-prone/issues/1143
1381   =================================================================== -->
1382 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1382 >  <path id="errorprone.processorpath.path">
1383 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1384 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1385 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1386 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1387 >  </path>
1388 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1389 >  <property name="errorprone.jsr166.user.flags" value=""/>
1390    <property name="errorprone.jsr166.flags"
1391              value="-Xep:HashtableContains:OFF
1392                     -Xep:JdkObsolete:OFF
1393                     -Xep:MissingOverride:OFF
1394                     -Xep:MissingFail:OFF
1395 +                   -Xep:ThreadPriorityCheck:OFF
1396                     -Xep:MixedArrayDimensions:ERROR
1397                     -Xep:RemoveUnusedImports:ERROR
1398                     -Xep:EmptyIf:ERROR
# Line 1411 | Line 1401
1401                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1402                     -Xep:RedundantThrows:ERROR
1403                     -Xep:IdentityBinaryExpression:WARN
1404 <                   -Xep:MethodCanBeStatic:WARN"/>
1404 >                   -Xep:ConstructorInvokesOverridable:WARN
1405 >                   -Xep:MethodCanBeStatic:WARN
1406 >                   ${errorprone.jsr166.user.flags}"/>
1407    <!-- -Xep:WildcardImport:ERROR -->
1408    <property name="errorprone.jsr166.test.flags"
1409              value="-Xep:StringSplitter:OFF
# Line 1439 | Line 1431
1431             fork="true">
1432  
1433        <include name="**/*.java"/>
1434 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1435 +      <compilerarg value="-J--illegal-access=permit"/>
1436        <compilerarg value="-XDcompilePolicy=simple"/>
1437 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1437 >      <compilerarg value="-processorpath"/>
1438 >      <compilerarg pathref="errorprone.processorpath.path"/>
1439        <compilerarg value="-Xplugin:ErrorProne
1440                            ${errorprone.jsr166.flags}"/>
1441        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1461 | Line 1456
1456        workdir="${build.dir}"
1457        classes="${product.jar}">
1458        <javac-elements>
1459 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1460 +        <compilerarg value="-J--illegal-access=permit"/>
1461          <compilerarg value="-XDcompilePolicy=simple"/>
1462 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1462 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1463          <compilerarg value="-Xplugin:ErrorProne
1464                              ${errorprone.jsr166.flags}
1465                              ${errorprone.jsr166.test.flags}"/>
# Line 1485 | Line 1482
1482        <jtreg-elements>
1483          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1484          <arg value="-javacoption:-processorpath"/>
1485 <        <arg value="-javacoption:${errorprone.jar}"/>
1485 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1486          <arg value="-javacoption:-Xplugin:ErrorProne
1487                              ${errorprone.jsr166.flags}
1488                              ${errorprone.jsr166.test.flags}
1489 +                            -Xep:MultipleTopLevelClasses:WARN
1490                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1491        </jtreg-elements>
1492      </run-jtreg-tests>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines