/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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

Legend:
Removed from v.1.304  
changed lines
  Added in v.1.311

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27