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

Diff of /jsr166/build.xml

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

revision 1.289, Sun Dec 2 22:40:03 2018 UTC revision 1.290, Sun Dec 2 22:46:53 2018 UTC
# Line 202  Line 202 
202    <!-- <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"/> -->
203    <!-- <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"/> -->
204    <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"/>
205    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
206    <!-- But pin to jdk 10 until fix for -->    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
   <!-- 8211194: javadoc -link doesn't take module path into consideration -->  
   <property name="java.docroot.url"   value="${java10.docroot.url}"/>  
207    
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 393  Line 391 
391    <!-- Default values: may seem strange ... -->    <!-- Default values: may seem strange ... -->
392    <!-- At runtime, target latest LTS, i.e. jdk11 -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
393    <!-- But at build time, target jdk9, for maximal binary portability -->    <!-- But at build time, target jdk9, for maximal binary portability -->
394    <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395    <property name="build.main.java.version" value="11"/>      o override-methods=summary
396        o {@systemProperty ...}
397        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398        o 8202628: javadoc generates bad links in TestModules.java
399        -->
400      <property name="java.runtime.target" value="11"/>
401    <property name="build.main.java" value="${java11}"/>    <property name="build.main.java" value="${java11}"/>
402    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
403    <property name="build.main.javadoc" value="${javadoc12}"/>    <property name="build.main.javadoc" value="${javadoc12}"/>
404      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405    
406    <target name="dists"    <target name="dists"
407            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
# Line 471  Line 475 
475  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
477               packagenames="none"               packagenames="none"
478               link="${java11.api.url}"               link="${java.api.url}"
479               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"               access="${build.javadoc.access}"
481               sourcepath="${src.dir}"               sourcepath="${src.dir}"
482               classpath=""               classpath=""
483               source="11"               source="${build.main.javadoc.source}"
484               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
485        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
486          <include name="**/*.java"/>          <include name="**/*.java"/>
487        </fileset>        </fileset>
488        <arg line="-Xdocrootparent ${java10.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
491        <arg value="-html5"/>        <arg value="-html5"/>
# Line 533  Line 537 
537            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
538    
539      <run-tck-tests      <run-tck-tests
540        target="${build.main.java.version}"        target="${java.runtime.target}"
541        workdir="${build.dir}"        workdir="${build.dir}"
542        classes="${product.jar}">        classes="${product.jar}">
543        <javac-elements>        <javac-elements>
# Line 567  Line 571 
571            depends="jar"            depends="jar"
572            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests      <run-jtreg-tests
574         target="${build.main.java.version}"         target="${java.runtime.target}"
575         workdir="${build.dir}"         workdir="${build.dir}"
576         classes="${product.jar}"/>         classes="${product.jar}"/>
577    </target>    </target>
# Line 583  Line 587 
587    <target name="test9">    <target name="test9">
588      <antcall target="clean"/>      <antcall target="clean"/>
589      <antcall>      <antcall>
590        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="9"/>
       <param name="build.main.java" value="${java9}"/>  
591        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
592          <param name="build.main.javadoc" value="${javadoc12}"/>
593          <param name="build.main.javadoc.source" value="9"/>
594        <target name="test"/>        <target name="test"/>
595          <target name="docs"/>
596      </antcall>      </antcall>
597    </target>    </target>
598    
599    <target name="test10">    <target name="test10">
600      <antcall target="clean"/>      <antcall target="clean"/>
601      <antcall>      <antcall>
602        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="10"/>
       <param name="build.main.java" value="${java10}"/>  
603        <param name="build.main.javac" value="${javac10}"/>        <param name="build.main.javac" value="${javac10}"/>
604        <param name="build.main.javadoc" value="${javadoc10}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
605          <param name="build.main.javadoc.source" value="10"/>
606        <target name="test"/>        <target name="test"/>
607        <target name="docs"/>        <target name="docs"/>
608      </antcall>      </antcall>
# Line 605  Line 611 
611    <target name="test11">    <target name="test11">
612      <antcall target="clean"/>      <antcall target="clean"/>
613      <antcall>      <antcall>
614        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
615        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
616        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
617          <param name="build.main.javadoc.source" value="11"/>
618        <target name="test"/>        <target name="test"/>
619        <target name="docs"/>        <target name="docs"/>
620      </antcall>      </antcall>
# Line 617  Line 623 
623    <target name="test12">    <target name="test12">
624      <antcall target="clean"/>      <antcall target="clean"/>
625      <antcall>      <antcall>
626        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
627        <param name="build.main.javac" value="${javac12}"/>        <param name="build.main.javac" value="${javac12}"/>
628        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
629          <param name="build.main.javadoc.source" value="12"/>
630        <target name="test"/>        <target name="test"/>
631        <target name="docs"/>        <target name="docs"/>
632      </antcall>      </antcall>
# Line 629  Line 635 
635    <target name="test9-11">    <target name="test9-11">
636      <antcall target="clean"/>      <antcall target="clean"/>
637      <antcall>      <antcall>
638        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="11"/>
       <param name="build.main.java" value="${java11}"/>  
639        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
640        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
641          <param name="build.main.javadoc.source" value="9"/>
642        <target name="test"/>        <target name="test"/>
643        <target name="docs"/>        <target name="docs"/>
644      </antcall>      </antcall>
# Line 641  Line 647 
647    <target name="test9-12">    <target name="test9-12">
648      <antcall target="clean"/>      <antcall target="clean"/>
649      <antcall>      <antcall>
650        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
       <param name="build.main.java" value="${java12}"/>  
651        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
652        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
653          <param name="build.main.javadoc.source" value="9"/>
654        <target name="test"/>        <target name="test"/>
655        <target name="docs"/>        <target name="docs"/>
656      </antcall>      </antcall>
# Line 1452  Line 1458 
1458      </jar>      </jar>
1459    
1460      <run-tck-tests      <run-tck-tests
1461        target="${build.main.java.version}"        target="${java.runtime.target}"
1462        workdir="${build.dir}"        workdir="${build.dir}"
1463        classes="${product.jar}">        classes="${product.jar}">
1464        <javac-elements>        <javac-elements>
# Line 1475  Line 1481 
1481            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
1482    
1483      <run-jtreg-tests      <run-jtreg-tests
1484         target="${build.main.java.version}"         target="${java.runtime.target}"
1485         workdir="${build.dir}"         workdir="${build.dir}"
1486         classes="${product.jar}"         classes="${product.jar}"
1487         verbose="all">         verbose="all">

Legend:
Removed from v.1.289  
changed lines
  Added in v.1.290

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8