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.281 by jsr166, Sun Oct 7 03:56:13 2018 UTC vs.
Revision 1.290 by jsr166, Sun Dec 2 22:46:53 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 55 | Line 55
55  
56  
57    <!-- Compilation options -->
58  <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 203 | Line 202
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 <  <!-- But pin to jdk 10 until fix for -->
208 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
205 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
206 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
207  
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 391 | Line 388
388  
389    <!-- Main targets -->
390  
391 <  <property name="build.main.java.version" value="11"/>
392 <  <!-- Workaround "no nested properties in ant" -->
393 <  <macrodef name="define-build-main-properties">
394 <    <attribute name="v"/>
395 <    <sequential>
396 <      <property name="build.main.java"    value="${java@{v}}"/>
397 <      <property name="build.main.javac"   value="${javac@{v}}"/>
398 <      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
399 <      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
400 <      <condition property="build.main.javadoc"
401 <                 value="${javadoc12}"
402 <                 else="${javadoc@{v}}">
403 <        <matches pattern="^(9|10|11)$" string="@{v}"/>
404 <      </condition>
408 <    </sequential>
409 <  </macrodef>
410 <  <define-build-main-properties v="${build.main.java.version}"/>
391 >  <!-- Default values: may seem strange ... -->
392 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
393 >  <!-- But at build time, target jdk9, for maximal binary portability -->
394 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395 >    o override-methods=summary
396 >    o {@systemProperty ...}
397 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398 >    o 8202628: javadoc generates bad links in TestModules.java
399 >    -->
400 >  <property name="java.runtime.target" value="11"/>
401 >  <property name="build.main.java" value="${java11}"/>
402 >  <property name="build.main.javac" value="${javac9}"/>
403 >  <property name="build.main.javadoc" value="${javadoc12}"/>
404 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405  
406    <target name="dists"
407            depends="dist, 4jdk8dist"
# Line 439 | Line 433
433        <compilerarg value="--patch-module=java.base=${src.dir}"/>
434        <compilerarg value="-Xprefer:source"/>
435        <compilerarg value="-XDignore.symbol.file=true"/>
436 <      <compilerarg value="-Xlint:all"/>
436 >      <compilerarg value="-Xlint:all,-removal"/>
437        <compilerarg line="--doclint-format html5"/>
438        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
439        <compilerarg value="-Werror"/>
# Line 481 | Line 475
475   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"
477               packagenames="none"
478 <             link="${java11.api.url}"
478 >             link="${java.api.url}"
479               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"
481               sourcepath="${src.dir}"
482               classpath=""
483 <             source="11"
483 >             source="${build.main.javadoc.source}"
484               executable="${build.main.javadoc}">
485        <fileset dir="${src.dir}" defaultexcludes="yes">
486          <include name="**/*.java"/>
487        </fileset>
488 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
488 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>
491        <arg value="-html5"/>
492        <arg value="--patch-module=java.base=${src.dir}"/>
493 + <!-- old school frames via docs/index.html?overview-summary.html -->
494 +      <arg value="--frames"/>
495        <arg value="--override-methods=summary"/>
496        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
497        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 513 | Line 509
509            description="Puts all distributable products in single hierarchy"/>
510  
511  
516  <target name="release"
517          depends="dist"
518          description="Puts entire CVS tree, plus distribution productions, in a jar">
519
520    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
521
522    <jar basedir="${basedir}" destfile="${release.jar}">
523      <!-- <exclude name="build/**"/> -->
524      <exclude name="${release.jar}"/>
525      <exclude name="user.properties"/>
526      <exclude name="etc/notes/**"/>
527      <exclude name="src/emulation/**"/>
528      <exclude name="**/SyntaxTest.java"/>
529      <exclude name="**/SuperfluousAbstract.java"/>
530      <manifest>
531        <attribute name="Built-By" value="${user.name}"/>
532        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
533      </manifest>
534    </jar>
535  </target>
536
537
512    <target name="clean"
513            description="Removes all build products">
514      <delete dir="${build.dir}"/>
# Line 563 | Line 537
537            description="Runs tck tests for src/main directly">
538  
539      <run-tck-tests
540 <      target="${build.main.java.version}"
540 >      target="${java.runtime.target}"
541        workdir="${build.dir}"
542        classes="${product.jar}">
543        <javac-elements>
# Line 597 | Line 571
571            depends="jar"
572            description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests
574 <       target="${build.main.java.version}"
574 >       target="${java.runtime.target}"
575         workdir="${build.dir}"
576         classes="${product.jar}"/>
577    </target>
# Line 606 | Line 580
580            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
581            description="Runs tck and jtreg tests for src/main"/>
582  
583 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
584 <
585 < <!--     <antcall target="jtreg"> -->
612 < <!--       <param name="build.main.java.version" value="8"/> -->
613 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
614 < <!--     </antcall> -->
615 <
616 < <!--   </target> -->
617 <
618 <  <target name="test9101112"
619 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
583 >  <target name="test-version-permutations"
584 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
585 >  </target>
586  
587 +  <target name="test9">
588      <antcall target="clean"/>
589 <    <antcall target="test">
590 <      <param name="build.main.java.version" value="9"/>
624 <      <param name="build.main.java" value="${java9}"/>
589 >    <antcall>
590 >      <param name="java.runtime.target" value="9"/>
591        <param name="build.main.javac" value="${javac9}"/>
592 +      <param name="build.main.javadoc" value="${javadoc12}"/>
593 +      <param name="build.main.javadoc.source" value="9"/>
594 +      <target name="test"/>
595 +      <target name="docs"/>
596      </antcall>
597 +  </target>
598  
599 +  <target name="test10">
600      <antcall target="clean"/>
601 <    <antcall target="test">
602 <      <param name="build.main.java.version" value="10"/>
631 <      <param name="build.main.java" value="${java10}"/>
601 >    <antcall>
602 >      <param name="java.runtime.target" value="10"/>
603        <param name="build.main.javac" value="${javac10}"/>
604 +      <param name="build.main.javadoc" value="${javadoc12}"/>
605 +      <param name="build.main.javadoc.source" value="10"/>
606 +      <target name="test"/>
607 +      <target name="docs"/>
608      </antcall>
609 +  </target>
610  
611 +  <target name="test11">
612      <antcall target="clean"/>
613 <    <antcall target="test">
614 <      <param name="build.main.java.version" value="11"/>
638 <      <param name="build.main.java" value="${java11}"/>
613 >    <antcall>
614 >      <param name="java.runtime.target" value="11"/>
615        <param name="build.main.javac" value="${javac11}"/>
616 +      <param name="build.main.javadoc" value="${javadoc12}"/>
617 +      <param name="build.main.javadoc.source" value="11"/>
618 +      <target name="test"/>
619 +      <target name="docs"/>
620      </antcall>
621 +  </target>
622  
623 +  <target name="test12">
624      <antcall target="clean"/>
625 <    <antcall target="test">
626 <      <param name="build.main.java.version" value="12"/>
645 <      <param name="build.main.java" value="${java12}"/>
646 <      <param name="build.main.javac" value="${javac12}"/>
647 <    </antcall>
648 <    <antcall target="docs">
649 <      <param name="build.main.java.version" value="12"/>
650 <      <param name="build.main.java" value="${java12}"/>
625 >    <antcall>
626 >      <param name="java.runtime.target" value="12"/>
627        <param name="build.main.javac" value="${javac12}"/>
628        <param name="build.main.javadoc" value="${javadoc12}"/>
629 +      <param name="build.main.javadoc.source" value="12"/>
630 +      <target name="test"/>
631 +      <target name="docs"/>
632      </antcall>
633 +  </target>
634  
635 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
635 >  <target name="test9-11">
636      <antcall target="clean"/>
637 <
637 >    <antcall>
638 >      <param name="java.runtime.target" value="11"/>
639 >      <param name="build.main.javac" value="${javac9}"/>
640 >      <param name="build.main.javadoc" value="${javadoc12}"/>
641 >      <param name="build.main.javadoc.source" value="9"/>
642 >      <target name="test"/>
643 >      <target name="docs"/>
644 >    </antcall>
645    </target>
646  
647 +  <target name="test9-12">
648 +    <antcall target="clean"/>
649 +    <antcall>
650 +      <param name="java.runtime.target" value="12"/>
651 +      <param name="build.main.javac" value="${javac9}"/>
652 +      <param name="build.main.javadoc" value="${javadoc12}"/>
653 +      <param name="build.main.javadoc.source" value="9"/>
654 +      <target name="test"/>
655 +      <target name="docs"/>
656 +    </antcall>
657 +  </target>
658  
659  
660    <target name="configure-compiler">
# Line 679 | Line 677
677    </target>
678  
679  
682
683  <!-- Various demos and test programs -->
684
685
686  <!-- description="Benchmark from Doug Lea's AQS paper" -->
687  <target name="loops" depends="configure-compiler">
688
689    <mkdir dir="${build.loops.dir}"/>
690
691    <javac srcdir="${loops.src.dir}"
692          destdir="${build.loops.dir}"
693            debug="${build.debug}"
694       debuglevel="${build.debuglevel}"
695      deprecation="${build.deprecation}"
696           source="${build.sourcelevel}"
697           target="${build.sourcelevel}"
698         encoding="ASCII"
699             fork="true">
700
701      <compilerarg line="${build.args}"/>
702      <classpath refid="loops.classpath"/>
703      <compilerarg value="-XDignore.symbol.file=true"/>
704
705    </javac>
706
707    <java classname="ALoops" fork="true">
708      <classpath refid="loops.classpath"/>
709    </java>
710  </target>
711
712
680    <target name="compile-test-loops" depends="jar"
681            description="Compiles all the perf tests in src/test/loops">
682  
# Line 1413 | Line 1380
1380  
1381  
1382   <!-- ==============================================================
1383 <  Experimental errorprone support - https://errorprone.info
1383 >  Experimental errorprone support
1384 >  https://errorprone.info
1385 >  https://errorprone.info/docs/installation
1386 >  https://github.com/google/error-prone/issues/1143
1387   =================================================================== -->
1388 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1388 >  <path id="errorprone.processorpath.path">
1389 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1390 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1391 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1392 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1393 >  </path>
1394 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1395    <property name="errorprone.jsr166.user.flags" value=""/>
1396    <property name="errorprone.jsr166.flags"
1397              value="-Xep:HashtableContains:OFF
1398                     -Xep:JdkObsolete:OFF
1399                     -Xep:MissingOverride:OFF
1400                     -Xep:MissingFail:OFF
1401 +                   -Xep:ThreadPriorityCheck:OFF
1402                     -Xep:MixedArrayDimensions:ERROR
1403                     -Xep:RemoveUnusedImports:ERROR
1404                     -Xep:EmptyIf:ERROR
# Line 1430 | Line 1407
1407                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1408                     -Xep:RedundantThrows:ERROR
1409                     -Xep:IdentityBinaryExpression:WARN
1410 +                   -Xep:ConstructorInvokesOverridable:WARN
1411                     -Xep:MethodCanBeStatic:WARN
1412                     ${errorprone.jsr166.user.flags}"/>
1413    <!-- -Xep:WildcardImport:ERROR -->
# Line 1462 | Line 1440
1440        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1441        <compilerarg value="-J--illegal-access=permit"/>
1442        <compilerarg value="-XDcompilePolicy=simple"/>
1443 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1443 >      <compilerarg value="-processorpath"/>
1444 >      <compilerarg pathref="errorprone.processorpath.path"/>
1445        <compilerarg value="-Xplugin:ErrorProne
1446                            ${errorprone.jsr166.flags}"/>
1447        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1479 | Line 1458
1458      </jar>
1459  
1460      <run-tck-tests
1461 <      target="${build.main.java.version}"
1461 >      target="${java.runtime.target}"
1462        workdir="${build.dir}"
1463        classes="${product.jar}">
1464        <javac-elements>
1465          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466          <compilerarg value="-J--illegal-access=permit"/>
1467          <compilerarg value="-XDcompilePolicy=simple"/>
1468 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1468 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1469          <compilerarg value="-Xplugin:ErrorProne
1470                              ${errorprone.jsr166.flags}
1471                              ${errorprone.jsr166.test.flags}"/>
# Line 1502 | Line 1481
1481            description="Run errorprone over jtreg tests (experimental)">
1482  
1483      <run-jtreg-tests
1484 <       target="${build.main.java.version}"
1484 >       target="${java.runtime.target}"
1485         workdir="${build.dir}"
1486         classes="${product.jar}"
1487         verbose="all">
1488        <jtreg-elements>
1489          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1490          <arg value="-javacoption:-processorpath"/>
1491 <        <arg value="-javacoption:${errorprone.jar}"/>
1491 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1492          <arg value="-javacoption:-Xplugin:ErrorProne
1493                              ${errorprone.jsr166.flags}
1494                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines