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.274 by jsr166, Fri Jun 22 18:55:33 2018 UTC vs.
Revision 1.286 by jsr166, Wed Nov 21 21:05:59 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    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 53 | Line 55
55  
56  
57    <!-- Compilation options -->
56  <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 136 | 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 147 | 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 193 | Line 196
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    <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"/>
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 -->
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 -->
# 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 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 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,
392 <           so we can use override-methods=summary -->
393 <      <condition property="build.main.javadoc"
394 <                 value="${javadoc11}"
395 <                 else="${javadoc@{v}}">
396 <        <equals arg1="@{v}" arg2="9"/>
397 <      </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, 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 <          <!--
406 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407 <          -->
405 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406  
407    <target name="compile"
408            depends="configure-compiler"
# Line 431 | 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 473 | 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 +      <arg value="--frames"/>
490        <arg value="--override-methods=summary"/>
491        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 505 | Line 504
504            description="Puts all distributable products in single hierarchy"/>
505  
506  
508  <target name="release"
509          depends="dist"
510          description="Puts entire CVS tree, plus distribution productions, in a jar">
511
512    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
513
514    <jar basedir="${basedir}" destfile="${release.jar}">
515      <!-- <exclude name="build/**"/> -->
516      <exclude name="${release.jar}"/>
517      <exclude name="user.properties"/>
518      <exclude name="etc/notes/**"/>
519      <exclude name="src/emulation/**"/>
520      <exclude name="**/SyntaxTest.java"/>
521      <exclude name="**/SuperfluousAbstract.java"/>
522      <manifest>
523        <attribute name="Built-By" value="${user.name}"/>
524        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
525      </manifest>
526    </jar>
527  </target>
528
529
507    <target name="clean"
508            description="Removes all build products">
509      <delete dir="${build.dir}"/>
# Line 598 | Line 575
575            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
576            description="Runs tck and jtreg tests for src/main"/>
577  
578 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
579 <
580 < <!--     <antcall target="jtreg"> -->
604 < <!--       <param name="build.main.java.version" value="8"/> -->
605 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
606 < <!--     </antcall> -->
607 <
608 < <!--   </target> -->
609 <
610 <  <target name="test91011"
611 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
578 >  <target name="test-version-permutations"
579 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
580 >  </target>
581  
582 +  <target name="test9">
583      <antcall target="clean"/>
584 <    <antcall target="test">
584 >    <antcall>
585        <param name="build.main.java.version" value="9"/>
586 +      <param name="build.main.java" value="${java9}"/>
587 +      <param name="build.main.javac" value="${javac9}"/>
588 +      <target name="test"/>
589      </antcall>
590 +  </target>
591  
592 +  <target name="test10">
593      <antcall target="clean"/>
594 <    <antcall target="test">
594 >    <antcall>
595        <param name="build.main.java.version" value="10"/>
596 +      <param name="build.main.java" value="${java10}"/>
597 +      <param name="build.main.javac" value="${javac10}"/>
598 +      <param name="build.main.javadoc" value="${javadoc10}"/>
599 +      <target name="test"/>
600 +      <target name="docs"/>
601      </antcall>
602 +  </target>
603  
604 +  <target name="test11">
605      <antcall target="clean"/>
606 <    <antcall target="test">
606 >    <antcall>
607        <param name="build.main.java.version" value="11"/>
608 +      <param name="build.main.java" value="${java11}"/>
609 +      <param name="build.main.javac" value="${javac11}"/>
610 +      <param name="build.main.javadoc" value="${javadoc11}"/>
611 +      <target name="test"/>
612 +      <target name="docs"/>
613      </antcall>
614 +  </target>
615  
616 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
616 >  <target name="test12">
617      <antcall target="clean"/>
618 +    <antcall>
619 +      <param name="build.main.java.version" value="12"/>
620 +      <param name="build.main.java" value="${java12}"/>
621 +      <param name="build.main.javac" value="${javac12}"/>
622 +      <param name="build.main.javadoc" value="${javadoc12}"/>
623 +      <target name="test"/>
624 +      <target name="docs"/>
625 +    </antcall>
626 +  </target>
627  
628 +  <target name="test9-11">
629 +    <antcall target="clean"/>
630 +    <antcall>
631 +      <param name="build.main.java.version" value="11"/>
632 +      <param name="build.main.java" value="${java11}"/>
633 +      <param name="build.main.javac" value="${javac9}"/>
634 +      <param name="build.main.javadoc" value="${javadoc11}"/>
635 +      <target name="test"/>
636 +      <target name="docs"/>
637 +    </antcall>
638    </target>
639  
640 +  <target name="test9-12">
641 +    <antcall target="clean"/>
642 +    <antcall>
643 +      <param name="build.main.java.version" value="12"/>
644 +      <param name="build.main.java" value="${java12}"/>
645 +      <param name="build.main.javac" value="${javac9}"/>
646 +      <param name="build.main.javadoc" value="${javadoc12}"/>
647 +      <target name="test"/>
648 +      <target name="docs"/>
649 +    </antcall>
650 +  </target>
651  
652  
653    <target name="configure-compiler">
# Line 652 | Line 670
670    </target>
671  
672  
655
656  <!-- Various demos and test programs -->
657
658
659  <!-- description="Benchmark from Doug Lea's AQS paper" -->
660  <target name="loops" depends="configure-compiler">
661
662    <mkdir dir="${build.loops.dir}"/>
663
664    <javac srcdir="${loops.src.dir}"
665          destdir="${build.loops.dir}"
666            debug="${build.debug}"
667       debuglevel="${build.debuglevel}"
668      deprecation="${build.deprecation}"
669           source="${build.sourcelevel}"
670           target="${build.sourcelevel}"
671         encoding="ASCII"
672             fork="true">
673
674      <compilerarg line="${build.args}"/>
675      <classpath refid="loops.classpath"/>
676      <compilerarg value="-XDignore.symbol.file=true"/>
677
678    </javac>
679
680    <java classname="ALoops" fork="true">
681      <classpath refid="loops.classpath"/>
682    </java>
683  </target>
684
685
673    <target name="compile-test-loops" depends="jar"
674            description="Compiles all the perf tests in src/test/loops">
675  
# Line 1386 | Line 1373
1373  
1374  
1375   <!-- ==============================================================
1376 <  Experimental errorprone support - http://errorprone.info
1376 >  Experimental errorprone support - https://errorprone.info
1377   =================================================================== -->
1378    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1379 +  <property name="errorprone.processorpath" value="${errorprone.jar}"/>
1380    <property name="errorprone.jsr166.user.flags" value=""/>
1381    <property name="errorprone.jsr166.flags"
1382              value="-Xep:HashtableContains:OFF
# Line 1435 | Line 1423
1423        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1424        <compilerarg value="-J--illegal-access=permit"/>
1425        <compilerarg value="-XDcompilePolicy=simple"/>
1426 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1426 >      <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1427        <compilerarg value="-Xplugin:ErrorProne
1428                            ${errorprone.jsr166.flags}"/>
1429        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1459 | Line 1447
1447          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1448          <compilerarg value="-J--illegal-access=permit"/>
1449          <compilerarg value="-XDcompilePolicy=simple"/>
1450 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1450 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1451          <compilerarg value="-Xplugin:ErrorProne
1452                              ${errorprone.jsr166.flags}
1453                              ${errorprone.jsr166.test.flags}"/>
# Line 1482 | Line 1470
1470        <jtreg-elements>
1471          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1472          <arg value="-javacoption:-processorpath"/>
1473 <        <arg value="-javacoption:${errorprone.jar}"/>
1473 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1474          <arg value="-javacoption:-Xplugin:ErrorProne
1475                              ${errorprone.jsr166.flags}
1476                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines