[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.149, Sat Jul 20 20:40:24 2013 UTC revision 1.153, Sat May 3 06:40:14 2014 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19      $HOME/jdk/jdk9
20    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
21    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
24      $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
 As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
27  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
28    </description>    </description>
29    
# Line 115  Line 116 
116    <defjdklocations v="6"/>    <defjdklocations v="6"/>
117    <defjdklocations v="7"/>    <defjdklocations v="7"/>
118    <defjdklocations v="8"/>    <defjdklocations v="8"/>
119      <defjdklocations v="9"/>
120    
121    <!-- Source locations -->    <!-- Source locations -->
122    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 155  Line 157 
157    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
158    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
159    
160    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
161    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
162    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
163    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
164      <!-- The expected canonical location does not yet exist as of 2014-02 -->
165    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166    <!-- The below does not yet exist as of 2013-01 -->    <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- No published jdk9 docs exist as of 2014-02 -->
168      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
169      <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
170      <!-- Default jdk doc location (latest stable release seems best) -->
171      <property name="java.docroot.url"       value="${java7.docroot.url}"/>
172    
173    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
175      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
176      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
177      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
178      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
179      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
180    
181    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
182    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 231  Line 242 
242    </macrodef>    </macrodef>
243    
244    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
245        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
247      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
248      <attribute name="target"/>      <attribute name="target"/>
# Line 269  Line 281 
281    
282    <!-- Main targets -->    <!-- Main targets -->
283    
284      <property name="build.main.java.version" value="9"/>
285      <property name="build.main.javac" value="${javac9}"/>
286    
287    <target name="dists"    <target name="dists"
288            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
289            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 287  Line 302 
302             classpath=""             classpath=""
303             includeAntRuntime="false"             includeAntRuntime="false"
304             includeJavaRuntime="false"             includeJavaRuntime="false"
305             executable="${javac8}"             executable="${build.main.javac}"
306             fork="true">             fork="true">
307    
308        <include name="**/*.java"/>        <include name="**/*.java"/>
# Line 323  Line 338 
338    
339      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
340               packagenames="none"               packagenames="none"
341               link="${jdkapi8docs.url}"               link="${java9.api.url}"
342               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
343               access="${build.javadoc.access}"               access="${build.javadoc.access}"
344               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
345               classpath=""               classpath=""
346               executable="${javadoc8}">               executable="${javadoc9}">
347        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
348          <include name="**/*.java"/>          <include name="**/*.java"/>
349        </fileset>        </fileset>
350          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
351        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
353        <arg value="-tag"/>        <arg value="-tag"/>
# Line 402  Line 418 
418            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
419    
420      <run-tck-tests      <run-tck-tests
421        target="8"        target="${build.main.java.version}"
422        workdir="${build.dir}"        workdir="${build.dir}"
423        classes="${product.jar}"/>        classes="${product.jar}"/>
424    </target>    </target>
# Line 411  Line 427 
427            depends="jar"            depends="jar"
428            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
429      <run-jtreg-tests      <run-jtreg-tests
430         target="8"         target="${build.main.java.version}"
431         workdir="${build.dir}"         workdir="${build.dir}"
432         classes="${product.jar}"/>         classes="${product.jar}"/>
433    </target>    </target>
# Line 421  Line 437 
437            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
438    </target>    </target>
439    
440      <target name="test89"
441              description="Runs tck and jtreg tests for main for multiple java versions">
442    
443        <antcall target="clean"/>
444        <antcall target="test">
445          <param name="build.main.java.version" value="8"/>
446          <param name="build.main.javac" value="${javac8}"/>
447        </antcall>
448    
449        <antcall target="clean"/>
450        <antcall target="test">
451          <param name="build.main.java.version" value="9"/>
452          <param name="build.main.javac" value="${javac9}"/>
453        </antcall>
454    
455      </target>
456    
457    
458    
459    <target name="configure-compiler">    <target name="configure-compiler">
# Line 552  Line 585 
585        <javac-elements>        <javac-elements>
586          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
587          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
588            <exclude name="*9Test.java"/>
589          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
590          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
591          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 617  Line 651 
651    
652      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
653               packagenames="none"               packagenames="none"
654               link="${jdkapi7docs.url}"               link="${java7.api.url}"
655               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
656               access="${build.javadoc.access}"               access="${build.javadoc.access}"
657               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 626  Line 660 
660        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
661          <include name="**/*.java"/>          <include name="**/*.java"/>
662        </fileset>        </fileset>
663          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
664        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
665      </javadoc>      </javadoc>
666    </target>    </target>
# Line 705  Line 740 
740    
741      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
742               packagenames="jsr166x.*"               packagenames="jsr166x.*"
743               link="${jdkapidocs.url}"               link="${java.api.url}"
744               access="${build.javadoc.access}"               access="${build.javadoc.access}"
745               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
746               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
747               source="5"               source="5"
748               executable="${javadoc7}">               executable="${javadoc7}">
749          <arg line="-Xdocrootparent ${java.docroot.url}"/>
750        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
751    
752      </javadoc>      </javadoc>
# Line 790  Line 826 
826    
827      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
828               packagenames="jsr166y.*"               packagenames="jsr166y.*"
829               link="${jdkapidocs.url}"               link="${java.api.url}"
830               access="${build.javadoc.access}"               access="${build.javadoc.access}"
831               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
832               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
833               source="6"               source="6"
834               executable="${javadoc7}">               executable="${javadoc7}">
835          <arg line="-Xdocrootparent ${java.docroot.url}"/>
836        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
837    
838      </javadoc>      </javadoc>
# Line 876  Line 913 
913    
914      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
915               packagenames="extra166y.*"               packagenames="extra166y.*"
916               link="${jdkapidocs.url}"               link="${java.api.url}"
917               access="${build.javadoc.access}"               access="${build.javadoc.access}"
918               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
919               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
920               source="6"               source="6"
921               executable="${javadoc7}">               executable="${javadoc7}">
922          <arg line="-Xdocrootparent ${java.docroot.url}"/>
923        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
924    
925      </javadoc>      </javadoc>
# Line 942  Line 980 
980      </javac>      </javac>
981    </target>    </target>
982    
983      <!-- jsr166e: find doclint errors -->
984      <target name="jsr166edoclint">
985    
986        <mkdir dir="${build.jsr166e.classes.dir}"/>
987    
988        <javac srcdir="${topsrc.dir}"
989               destdir="${build.jsr166e.classes.dir}"
990               debug="${build.debug}"
991               debuglevel="${build.debuglevel}"
992               deprecation="${build.deprecation}"
993               source="${build.jsr166e.java.version}"
994               classpath=""
995               bootclasspath="${bootclasspath7}"
996               includeAntRuntime="false"
997               includeJavaRuntime="false"
998               executable="${javac8}"
999               fork="true">
1000    
1001          <include name="jsr166e/**/*.java"/>
1002          <compilerarg value="-XDignore.symbol.file=true"/>
1003          <compilerarg value="-Xlint:all"/>
1004          <compilerarg value="-Xdoclint:all/protected"/>
1005    
1006        </javac>
1007      </target>
1008    
1009    
1010    <target name="jsr166ejar"    <target name="jsr166ejar"
1011            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 962  Line 1026 
1026    
1027      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1028               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1029               link="${jdkapidocs.url}"               link="${java.api.url}"
1030               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1031               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1032               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1033               executable="${javadoc7}">               executable="${javadoc7}">
1034          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1035        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1036    
1037      </javadoc>      </javadoc>

Legend:
Removed from v.1.149  
changed lines
  Added in v.1.153

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8