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

Diff of /jsr166/build.xml

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

revision 1.288 by jsr166, Sat Nov 24 17:39:35 2018 UTC revision 1.294 by jsr166, Mon Dec 31 07:05:54 2018 UTC
# Line 24  Line 24 
24    $HOME/jdk/jdk10    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12    $HOME/jdk/jdk12
27      $HOME/jdk/jdk13
28    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
29    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
33    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
34      $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
37    
38    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
40    for $N in 8 9 10 ...    for $N in 8 .. 13 ...
41    
42    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.
43  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 138  Line 140 
140    <defjdklocations v="10"/>    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>    <defjdklocations v="11"/>
142    <defjdklocations v="12"/>    <defjdklocations v="12"/>
143      <defjdklocations v="13"/>
144    
145    <!-- Source locations -->    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 150  Line 153 
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 202  Line 206 
206    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
207    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
208    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
209    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
210    <!-- But pin to jdk 10 until fix for -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
211    <!-- 8211194: javadoc -link doesn't take module path into consideration -->    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
   <property name="java.docroot.url"   value="${java10.docroot.url}"/>  
212    
213    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
214    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 216  Line 219 
219    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
220    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
221    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
222      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
223    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
224    
225    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 329  Line 333 
333      </sequential>      </sequential>
334    </macrodef>    </macrodef>
335    
336      <defjtregtests v="13"/>
337    <defjtregtests v="12"/>    <defjtregtests v="12"/>
338    <defjtregtests v="11"/>    <defjtregtests v="11"/>
339    <defjtregtests v="10"/>    <defjtregtests v="10"/>
# Line 340  Line 345 
345    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
346    
347    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
348      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
349      <attribute name="target"/>      <attribute name="target"/>
350      <attribute name="workdir"/>      <attribute name="workdir"/>
351      <attribute name="classes"/>      <attribute name="classes"/>
# Line 393  Line 398 
398    <!-- Default values: may seem strange ... -->    <!-- Default values: may seem strange ... -->
399    <!-- At runtime, target latest LTS, i.e. jdk11 -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
400    <!-- But at build time, target jdk9, for maximal binary portability -->    <!-- But at build time, target jdk9, for maximal binary portability -->
401    <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
402    <property name="build.main.java.version" value="11"/>      o override-methods=summary
403        o {@systemProperty ...}
404        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
405        o 8202628: javadoc generates bad links in TestModules.java
406        -->
407      <property name="java.runtime.target" value="11"/>
408    <property name="build.main.java" value="${java11}"/>    <property name="build.main.java" value="${java11}"/>
409    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
410    <property name="build.main.javadoc" value="${javadoc12}"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
411      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
412    
413    <target name="dists"    <target name="dists"
414            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
# Line 471  Line 482 
482  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
483      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
484               packagenames="none"               packagenames="none"
485               link="${java11.api.url}"               link="${java.api.url}"
486               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
487               access="${build.javadoc.access}"               access="${build.javadoc.access}"
488               sourcepath="${src.dir}"               sourcepath="${src.dir}"
489               classpath=""               classpath=""
490               source="11"               source="${build.main.javadoc.source}"
491               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
492    <!-- TODO: JDK-8214571 failonerror = "true" -->
493        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
494          <include name="**/*.java"/>          <include name="**/*.java"/>
495        </fileset>        </fileset>
496        <arg line="-Xdocrootparent ${java10.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
497        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
498        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
499        <arg value="-html5"/>        <arg value="-html5"/>
500        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
501    <!-- old school frames via docs/index.html?overview-summary.html -->
502        <arg value="--frames"/>        <arg value="--frames"/>
503        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
504        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532  Line 545 
545            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
546    
547      <run-tck-tests      <run-tck-tests
548        target="${build.main.java.version}"        target="${java.runtime.target}"
549        workdir="${build.dir}"        workdir="${build.dir}"
550        classes="${product.jar}">        classes="${product.jar}">
551        <javac-elements>        <javac-elements>
# Line 566  Line 579 
579            depends="jar"            depends="jar"
580            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
581      <run-jtreg-tests      <run-jtreg-tests
582         target="${build.main.java.version}"         target="${java.runtime.target}"
583         workdir="${build.dir}"         workdir="${build.dir}"
584         classes="${product.jar}"/>         classes="${product.jar}"/>
585    </target>    </target>
# Line 576  Line 589 
589            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
590    
591    <target name="test-version-permutations"    <target name="test-version-permutations"
592            depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">            depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
593    </target>    </target>
594    
595    <target name="test9">    <target name="test9">
596      <antcall target="clean"/>      <antcall target="clean"/>
597      <antcall>      <antcall>
598        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="9"/>
       <param name="build.main.java" value="${java9}"/>  
599        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
600          <param name="build.main.javadoc" value="${javadoc12}"/>
601          <param name="build.main.javadoc.source" value="9"/>
602        <target name="test"/>        <target name="test"/>
603          <target name="docs"/>
604      </antcall>      </antcall>
605    </target>    </target>
606    
607    <target name="test10">    <target name="test10">
608      <antcall target="clean"/>      <antcall target="clean"/>
609      <antcall>      <antcall>
610        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="10"/>
       <param name="build.main.java" value="${java10}"/>  
611        <param name="build.main.javac" value="${javac10}"/>        <param name="build.main.javac" value="${javac10}"/>
612        <param name="build.main.javadoc" value="${javadoc10}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
613          <param name="build.main.javadoc.source" value="10"/>
614        <target name="test"/>        <target name="test"/>
615        <target name="docs"/>        <target name="docs"/>
616      </antcall>      </antcall>
# Line 604  Line 619 
619    <target name="test11">    <target name="test11">
620      <antcall target="clean"/>      <antcall target="clean"/>
621      <antcall>      <antcall>
622        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
623        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
624        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
625          <param name="build.main.javadoc.source" value="11"/>
626        <target name="test"/>        <target name="test"/>
627        <target name="docs"/>        <target name="docs"/>
628      </antcall>      </antcall>
# Line 616  Line 631 
631    <target name="test12">    <target name="test12">
632      <antcall target="clean"/>      <antcall target="clean"/>
633      <antcall>      <antcall>
634        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
635        <param name="build.main.javac" value="${javac12}"/>        <param name="build.main.javac" value="${javac12}"/>
636        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
637          <param name="build.main.javadoc.source" value="12"/>
638          <target name="test"/>
639          <target name="docs"/>
640        </antcall>
641      </target>
642    
643      <target name="test13">
644        <antcall target="clean"/>
645        <antcall>
646          <param name="java.runtime.target" value="13"/>
647          <param name="build.main.javac" value="${javac13}"/>
648          <param name="build.main.javadoc" value="${javadoc13}"/>
649          <param name="build.main.javadoc.source" value="13"/>
650        <target name="test"/>        <target name="test"/>
651        <target name="docs"/>        <target name="docs"/>
652      </antcall>      </antcall>
# Line 628  Line 655 
655    <target name="test9-11">    <target name="test9-11">
656      <antcall target="clean"/>      <antcall target="clean"/>
657      <antcall>      <antcall>
658        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
659        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
660        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
661          <param name="build.main.javadoc.source" value="9"/>
662        <target name="test"/>        <target name="test"/>
663        <target name="docs"/>        <target name="docs"/>
664      </antcall>      </antcall>
# Line 640  Line 667 
667    <target name="test9-12">    <target name="test9-12">
668      <antcall target="clean"/>      <antcall target="clean"/>
669      <antcall>      <antcall>
670        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
671        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
672        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
673          <param name="build.main.javadoc.source" value="9"/>
674          <target name="test"/>
675          <target name="docs"/>
676        </antcall>
677      </target>
678    
679      <target name="test9-13">
680        <antcall target="clean"/>
681        <antcall>
682          <param name="java.runtime.target" value="13"/>
683          <param name="build.main.javac" value="${javac9}"/>
684          <param name="build.main.javadoc" value="${javadoc13}"/>
685          <param name="build.main.javadoc.source" value="9"/>
686        <target name="test"/>        <target name="test"/>
687        <target name="docs"/>        <target name="docs"/>
688      </antcall>      </antcall>
# Line 1451  Line 1490 
1490      </jar>      </jar>
1491    
1492      <run-tck-tests      <run-tck-tests
1493        target="${build.main.java.version}"        target="${java.runtime.target}"
1494        workdir="${build.dir}"        workdir="${build.dir}"
1495        classes="${product.jar}">        classes="${product.jar}">
1496        <javac-elements>        <javac-elements>
# Line 1474  Line 1513 
1513            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1514    
1515      <run-jtreg-tests      <run-jtreg-tests
1516         target="${build.main.java.version}"         target="${java.runtime.target}"
1517         workdir="${build.dir}"         workdir="${build.dir}"
1518         classes="${product.jar}"         classes="${product.jar}"
1519         verbose="all">         verbose="all">

Legend:
Removed from v.1.288  
changed lines
  Added in v.1.294

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