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.304 by jsr166, Sun Oct 6 17:34:58 2019 UTC vs.
Revision 1.313 by jsr166, Mon Apr 27 23:47:11 2020 UTC

# Line 23 | Line 23
23    $HOME/jdk/jdk12
24    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk11
29    $HOME/jdk/src/jdk12
30    $HOME/jdk/src/jdk13
31    $HOME/jdk/src/jdk14
32 +  $HOME/jdk/src/jdk15
33    where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...
37 <  for $N in 11 .. 14 ...
37 >  for $N in 11 .. 15 ...
38  
39    As of 2016-03, the sources in src/main are for jdk9+ only.
40    As of 2019-08, the sources in src/main are for jdk11+ only.
# Line 96 | Line 98
98    <defjdklocations v="12"/>
99    <defjdklocations v="13"/>
100    <defjdklocations v="14"/>
101 +  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 106 | Line 109
109    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 +  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 132 | Line 136
136    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 <  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
139 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141    <!-- Default jdk doc location (latest stable LTS release seems best) -->
142    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
# Line 141 | Line 146
146    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 +  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
# Line 242 | Line 248
248      </sequential>
249    </macrodef>
250  
251 +  <defjtregtests v="15"/>
252    <defjtregtests v="14"/>
253    <defjtregtests v="13"/>
254    <defjtregtests v="12"/>
# Line 271 | Line 278
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283        <arg value="-noreport"/>
284        <arg value="-verbose:@{verbose}"/>
# Line 344 | Line 352
352   <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353        <compilerarg value="-Xlint:all,-removal"/>
354        <compilerarg line="--doclint-format html5"/>
355 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
355 > <!--  Temporarily disable doclint, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->
356 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
357        <compilerarg value="-Xdoclint/package:java.util.*"/>
358        <compilerarg value="-Werror"/>
359        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 372 | Line 381
381    <target name="docs"
382            description="Builds javadocs for src/main to dist dir">
383  
384 <    <delete dir="${docs.dir}"/>
384 >    <delete dir="${docs.dir}" quiet="true"/>
385      <mkdir dir="${docs.dir}"/>
386  
387 +    <!-- old school frames via docs/index.html?overview-summary.html -->
388 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
389 +    <local name="use-frames"/>
390 +    <condition property="use-frames">
391 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
392 +    </condition>
393 +
394      <!-- the packagenames="none" hack below prevents scanning the -->
395      <!-- sourcepath for packages -->
396  
# Line 398 | Line 414
414        </fileset>
415        <arg line="-Xdocrootparent ${java.docroot.url}"/>
416        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417 +      <arg value="-quiet"/>
418        <arg value="-XDignore.symbol.file=true"/>
419        <arg value="-html5"/>
420        <arg value="--patch-module=java.base=${src.dir}"/>
421 < <!-- old school frames via docs/index.html?overview-summary.html -->
405 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
406 <      <arg value="--frames"/>
421 >      <arg value="--frames" if:set="use-frames"/>
422        <arg value="--override-methods=summary"/>
423        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
424        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 493 | Line 508
508            description="Runs tck and jtreg tests for src/main"/>
509  
510    <target name="test-version-permutations"
511 <          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
512 <  </target>
511 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
512 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
513  
514    <target name="test11">
500 –    <antcall target="clean"/>
515      <antcall>
516        <param name="java.runtime.target" value="11"/>
517        <param name="build.main.javac" value="${javac11}"/>
518        <param name="build.main.javadoc" value="${javadoc12}"/>
519        <param name="build.main.javadoc.source" value="11"/>
520 +      <target name="clean"/>
521        <target name="test"/>
522        <target name="docs"/>
523      </antcall>
524    </target>
525  
526    <target name="test12">
512 –    <antcall target="clean"/>
527      <antcall>
528        <param name="java.runtime.target" value="12"/>
529        <param name="build.main.javac" value="${javac12}"/>
530        <param name="build.main.javadoc" value="${javadoc12}"/>
531        <param name="build.main.javadoc.source" value="12"/>
532 +      <target name="clean"/>
533        <target name="test"/>
534        <target name="docs"/>
535      </antcall>
536    </target>
537  
538    <target name="test13">
524 –    <antcall target="clean"/>
539      <antcall>
540        <param name="java.runtime.target" value="13"/>
541        <param name="build.main.javac" value="${javac13}"/>
542        <param name="build.main.javadoc" value="${javadoc13}"/>
543        <param name="build.main.javadoc.source" value="13"/>
544 +      <target name="clean"/>
545        <target name="test"/>
546        <target name="docs"/>
547      </antcall>
548    </target>
549  
550    <target name="test14">
536 –    <antcall target="clean"/>
551      <antcall>
552        <param name="java.runtime.target" value="14"/>
553        <param name="build.main.javac" value="${javac14}"/>
554        <param name="build.main.javadoc" value="${javadoc14}"/>
555        <param name="build.main.javadoc.source" value="14"/>
556 +      <target name="clean"/>
557 +      <target name="test"/>
558 +      <target name="docs"/>
559 +    </antcall>
560 +  </target>
561 +
562 +  <target name="test15">
563 +    <antcall>
564 +      <param name="java.runtime.target" value="15"/>
565 +      <param name="build.main.javac" value="${javac15}"/>
566 +      <param name="build.main.javadoc" value="${javadoc15}"/>
567 +      <param name="build.main.javadoc.source" value="15"/>
568 +      <target name="clean"/>
569        <target name="test"/>
570        <target name="docs"/>
571      </antcall>
572    </target>
573  
574    <target name="test11-12">
548 –    <antcall target="clean"/>
575      <antcall>
576        <param name="java.runtime.target" value="12"/>
577        <param name="build.main.javac" value="${javac11}"/>
578        <param name="build.main.javadoc" value="${javadoc12}"/>
579        <param name="build.main.javadoc.source" value="11"/>
580 +      <target name="clean"/>
581        <target name="test"/>
582        <target name="docs"/>
583      </antcall>
584    </target>
585  
586    <target name="test11-13">
560 –    <antcall target="clean"/>
587      <antcall>
588        <param name="java.runtime.target" value="13"/>
589        <param name="build.main.javac" value="${javac11}"/>
590        <param name="build.main.javadoc" value="${javadoc13}"/>
591        <param name="build.main.javadoc.source" value="11"/>
592 +      <target name="clean"/>
593        <target name="test"/>
594        <target name="docs"/>
595      </antcall>
596    </target>
597  
598    <target name="test11-14">
572 –    <antcall target="clean"/>
599      <antcall>
600        <param name="java.runtime.target" value="14"/>
601        <param name="build.main.javac" value="${javac11}"/>
602        <param name="build.main.javadoc" value="${javadoc14}"/>
603        <param name="build.main.javadoc.source" value="11"/>
604 +      <target name="clean"/>
605 +      <target name="test"/>
606 +      <target name="docs"/>
607 +    </antcall>
608 +  </target>
609 +
610 +  <target name="test11-15">
611 +    <antcall>
612 +      <param name="java.runtime.target" value="15"/>
613 +      <param name="build.main.javac" value="${javac11}"/>
614 +      <param name="build.main.javadoc" value="${javadoc15}"/>
615 +      <param name="build.main.javadoc.source" value="11"/>
616 +      <target name="clean"/>
617        <target name="test"/>
618        <target name="docs"/>
619      </antcall>
# Line 657 | Line 696
696    https://github.com/google/error-prone/issues/1143
697   =================================================================== -->
698    <path id="errorprone.processorpath.path">
699 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
699 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
700      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
701      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
702      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
703 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
704    </path>
705    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
706    <property name="errorprone.jsr166.user.flags" value=""/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines