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.305 by jsr166, Sun Oct 6 17:51:03 2019 UTC vs.
Revision 1.316 by jsr166, Fri Jun 19 17:40:45 2020 UTC

# Line 23 | Line 23
23    $HOME/jdk/jdk12
24    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28    where each of the above is a JDK or a symlink to same, and
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31    $HOME/jdk/src/jdk13
32    $HOME/jdk/src/jdk14
33 +  $HOME/jdk/src/jdk15
34 +  $HOME/jdk/src/jdk16
35    where each of the above is a JDK source tree or a symlink to same.
36  
37    Alternatively, define ant variables thus:
38    ant -Djdk$N.home=... -Djdk$N.src.home=...
39 <  for $N in 11 .. 14 ...
39 >  for $N in 11 .. 16 ...
40  
41    As of 2016-03, the sources in src/main are for jdk9+ only.
42    As of 2019-08, the sources in src/main are for jdk11+ only.
# Line 96 | Line 100
100    <defjdklocations v="12"/>
101    <defjdklocations v="13"/>
102    <defjdklocations v="14"/>
103 +  <defjdklocations v="15"/>
104 +  <defjdklocations v="16"/>
105  
106    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 106 | Line 112
112    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
113    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115 +  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
116 +  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
117    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
118    <property name="lib.dir"              location="${basedir}/lib"/>
119    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 132 | Line 140
140    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
141    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143 <  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
143 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
145 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
146    <!-- Default jdk doc location (latest stable LTS release seems best) -->
147    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
148  
# Line 141 | Line 151
151    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
152    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154 +  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
155 +  <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
156    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
157  
158    <!-- Define the "jtreg" task -->
# Line 242 | Line 254
254      </sequential>
255    </macrodef>
256  
257 +  <defjtregtests v="16"/>
258 +  <defjtregtests v="15"/>
259    <defjtregtests v="14"/>
260    <defjtregtests v="13"/>
261    <defjtregtests v="12"/>
# Line 271 | Line 285
285        <patternset refid="jdk@{target}.jtreg.tests"/>
286        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
287        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
288 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
289        <arg value="-agentvm"/>
290        <arg value="-noreport"/>
291        <arg value="-verbose:@{verbose}"/>
# Line 344 | Line 359
359   <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360        <compilerarg value="-Xlint:all,-removal"/>
361        <compilerarg line="--doclint-format html5"/>
362 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
362 > <!--  Temporarily disable doclint for private elements, due to -->
363 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
365 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366 >      <compilerarg value="-Xdoclint:all/protected"/>
367        <compilerarg value="-Xdoclint/package:java.util.*"/>
368        <compilerarg value="-Werror"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 372 | Line 391
391    <target name="docs"
392            description="Builds javadocs for src/main to dist dir">
393  
394 <    <delete dir="${docs.dir}"/>
394 >    <delete dir="${docs.dir}" quiet="true"/>
395      <mkdir dir="${docs.dir}"/>
396  
397      <!-- old school frames via docs/index.html?overview-summary.html -->
# Line 401 | Line 420
420               executable="${build.main.javadoc}">
421   <!-- TODO: JDK-8214571 failonerror = "true" -->
422        <fileset dir="${src.dir}" defaultexcludes="yes">
423 <        <include name="**/*.java"/>
423 >        <include name="java/**/*.java"/>
424        </fileset>
425        <arg line="-Xdocrootparent ${java.docroot.url}"/>
426        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
427 +      <arg value="-quiet"/>
428        <arg value="-XDignore.symbol.file=true"/>
429        <arg value="-html5"/>
430        <arg value="--patch-module=java.base=${src.dir}"/>
# Line 498 | Line 518
518            description="Runs tck and jtreg tests for src/main"/>
519  
520    <target name="test-version-permutations"
521 <          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
522 <  </target>
521 >          depends="test11, test12, test13, test14, test15, test16,
522 >          test11-12, test11-13, test11-14, test11-15, test11-16,
523 >          clean, test, docs"
524 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
525  
526    <target name="test11">
505 –    <antcall target="clean"/>
527      <antcall>
528        <param name="java.runtime.target" value="11"/>
529        <param name="build.main.javac" value="${javac11}"/>
530        <param name="build.main.javadoc" value="${javadoc12}"/>
531        <param name="build.main.javadoc.source" value="11"/>
532 +      <target name="clean"/>
533        <target name="test"/>
534        <target name="docs"/>
535      </antcall>
536    </target>
537  
538    <target name="test12">
517 –    <antcall target="clean"/>
539      <antcall>
540        <param name="java.runtime.target" value="12"/>
541        <param name="build.main.javac" value="${javac12}"/>
542        <param name="build.main.javadoc" value="${javadoc12}"/>
543        <param name="build.main.javadoc.source" value="12"/>
544 +      <target name="clean"/>
545        <target name="test"/>
546        <target name="docs"/>
547      </antcall>
548    </target>
549  
550    <target name="test13">
529 –    <antcall target="clean"/>
551      <antcall>
552        <param name="java.runtime.target" value="13"/>
553        <param name="build.main.javac" value="${javac13}"/>
554        <param name="build.main.javadoc" value="${javadoc13}"/>
555        <param name="build.main.javadoc.source" value="13"/>
556 +      <target name="clean"/>
557        <target name="test"/>
558        <target name="docs"/>
559      </antcall>
560    </target>
561  
562    <target name="test14">
541 –    <antcall target="clean"/>
563      <antcall>
564        <param name="java.runtime.target" value="14"/>
565        <param name="build.main.javac" value="${javac14}"/>
566        <param name="build.main.javadoc" value="${javadoc14}"/>
567        <param name="build.main.javadoc.source" value="14"/>
568 +      <target name="clean"/>
569 +      <target name="test"/>
570 +      <target name="docs"/>
571 +    </antcall>
572 +  </target>
573 +
574 +  <target name="test15">
575 +    <antcall>
576 +      <param name="java.runtime.target" value="15"/>
577 +      <param name="build.main.javac" value="${javac15}"/>
578 +      <param name="build.main.javadoc" value="${javadoc15}"/>
579 +      <param name="build.main.javadoc.source" value="15"/>
580 +      <target name="clean"/>
581 +      <target name="test"/>
582 +      <target name="docs"/>
583 +    </antcall>
584 +  </target>
585 +
586 +  <target name="test16">
587 +    <antcall>
588 +      <param name="java.runtime.target" value="16"/>
589 +      <param name="build.main.javac" value="${javac16}"/>
590 +      <param name="build.main.javadoc" value="${javadoc16}"/>
591 +      <param name="build.main.javadoc.source" value="16"/>
592 +      <target name="clean"/>
593        <target name="test"/>
594        <target name="docs"/>
595      </antcall>
596    </target>
597  
598    <target name="test11-12">
553 –    <antcall target="clean"/>
599      <antcall>
600        <param name="java.runtime.target" value="12"/>
601        <param name="build.main.javac" value="${javac11}"/>
602        <param name="build.main.javadoc" value="${javadoc12}"/>
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-13">
565 –    <antcall target="clean"/>
611      <antcall>
612        <param name="java.runtime.target" value="13"/>
613        <param name="build.main.javac" value="${javac11}"/>
614        <param name="build.main.javadoc" value="${javadoc13}"/>
615        <param name="build.main.javadoc.source" value="11"/>
616 +      <target name="clean"/>
617        <target name="test"/>
618        <target name="docs"/>
619      </antcall>
620    </target>
621  
622    <target name="test11-14">
577 –    <antcall target="clean"/>
623      <antcall>
624        <param name="java.runtime.target" value="14"/>
625        <param name="build.main.javac" value="${javac11}"/>
626        <param name="build.main.javadoc" value="${javadoc14}"/>
627        <param name="build.main.javadoc.source" value="11"/>
628 +      <target name="clean"/>
629 +      <target name="test"/>
630 +      <target name="docs"/>
631 +    </antcall>
632 +  </target>
633 +
634 +  <target name="test11-15">
635 +    <antcall>
636 +      <param name="java.runtime.target" value="15"/>
637 +      <param name="build.main.javac" value="${javac11}"/>
638 +      <param name="build.main.javadoc" value="${javadoc15}"/>
639 +      <param name="build.main.javadoc.source" value="11"/>
640 +      <target name="clean"/>
641 +      <target name="test"/>
642 +      <target name="docs"/>
643 +    </antcall>
644 +  </target>
645 +
646 +  <target name="test11-16">
647 +    <antcall>
648 +      <param name="java.runtime.target" value="16"/>
649 +      <param name="build.main.javac" value="${javac11}"/>
650 +      <param name="build.main.javadoc" value="${javadoc16}"/>
651 +      <param name="build.main.javadoc.source" value="11"/>
652 +      <target name="clean"/>
653        <target name="test"/>
654        <target name="docs"/>
655      </antcall>
# Line 662 | Line 732
732    https://github.com/google/error-prone/issues/1143
733   =================================================================== -->
734    <path id="errorprone.processorpath.path">
735 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
735 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
736      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
737      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
738      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
739 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
740    </path>
741    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
742    <property name="errorprone.jsr166.user.flags" value=""/>

Diff Legend

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