[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.197, Fri Mar 4 21:00:45 2016 UTC revision 1.210, Mon Apr 18 15:30:49 2016 UTC
# Line 7  Line 7 
7    
8    Usage: ant [target]    Usage: ant [target]
9    
10      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11      more details.
12    
13    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
15    
# Line 27  Line 30 
30    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
31    
32    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
33    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
35    
36    As of 2015-09, there is incomplete hacky support for jigsaw    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37    Build for jigsaw using something like:    target is currently broken.
   ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist  
   "docs" target is still broken.  
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 69  Line 70 
70    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72    
73      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77    
78    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 89  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98        <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99      <local name="have.java.base"/>      <local name="have.java.base"/>
100      <available property="have.java.base"      <available property="have.java.base"
101        file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>        file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103        if:set="have.java.base"/>        if:set="have.java.base"/>
104      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105        unless:set="have.java.base"/>        unless:set="have.java.base"/>
106      <local name="modules"/>      <local name="modules"/>
107      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 134  Line 141 
141    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
148    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
149    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
150    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149  Line 157 
157    <!-- Javadoc locations -->    <!-- Javadoc locations -->
158    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
159    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156  Line 165 
165    
166    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164  Line 174 
174    <!-- Jar locations -->    <!-- Jar locations -->
175    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 175  Line 186 
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189    <!-- The expected canonical location does not yet exist as of 2015-11 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# Line 209  Line 220 
220      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="classes"/>      <attribute name="classes"/>
223        <!--
224            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225        -->
226      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
228    
# Line 313  Line 327 
327    
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->  
     <mkdir dir="@{workdir}/JTreport/html"/>  
     <mkdir dir="@{workdir}/JTreport/text"/>  
330      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
331             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
332             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
# Line 350  Line 360 
360    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
361    
362    <target name="dists"    <target name="dists"
363            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
364            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
365    
366    <target name="compile"    <target name="compile"
# Line 393  Line 403 
403        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
404    
405      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
406    </target>    </target>
407    
408    
409    <target name="jar"    <target name="jar"
410            depends="compile"            depends="compile"
411            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
412    
413      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
414        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
# Line 427  Line 434 
434               link="${java9.api.url}"               link="${java9.api.url}"
435               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
436               access="${build.javadoc.access}"               access="${build.javadoc.access}"
437               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
438               classpath=""               classpath=""
439               executable="${javadoc9}">               executable="${javadoc9}">
440        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 445  Line 452 
452        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
453        <arg value="-tag"/>        <arg value="-tag"/>
454        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
455    <!-- tags added in jdk9 -->
456          <arg value="-tag"/>
457          <arg value="revised:X"/>
458          <arg value="-tag"/>
459          <arg value="spec:X"/>
460      </javadoc>      </javadoc>
461    </target>    </target>
462    
# Line 505  Line 517 
517    
518    <target name="tck"    <target name="tck"
519            depends="jar"            depends="jar"
520            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
521    
522      <run-tck-tests      <run-tck-tests
523        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 514  Line 526 
526    </target>    </target>
527    
528    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
529            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
530      <antcall target="tck">      <antcall target="tck">
531        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
532      </antcall>      </antcall>
533    </target>    </target>
534    
535    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
536            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
537      <antcall target="tck">      <antcall target="tck">
538        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
539      </antcall>      </antcall>
# Line 529  Line 541 
541    
542    <target name="jtreg"    <target name="jtreg"
543            depends="jar"            depends="jar"
544            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
545      <run-jtreg-tests      <run-jtreg-tests
546         target="${build.main.java.version}"         target="${build.main.java.version}"
547         workdir="${build.dir}"         workdir="${build.dir}"
# Line 537  Line 549 
549    </target>    </target>
550    
551    <target name="test"    <target name="test"
552            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
553            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
554    </target>    </target>
555    
556    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
557    
558      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
559        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
560        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
561      </antcall>  <!--     </antcall> -->
562    
563    </target>  <!--   </target> -->
564    
565    <target name="test89"  <!--   <target name="test89" -->
566            description="Runs tck and jtreg tests for main for multiple java versions">  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
567    
568      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
569      <antcall target="test">  <!--     <antcall target="test"> -->
570        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
571        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
572      </antcall>  <!--     </antcall> -->
573    
574      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
575      <antcall target="test">  <!--     <antcall target="test"> -->
576        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
577        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
578      </antcall>  <!--     </antcall> -->
579    
580    </target>  <!--   </target> -->
581    
582    
583    
# Line 595  Line 607 
607    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
608    
609    
610    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
611            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
612    
613      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
614    
# Line 648  Line 660 
660    </target>    </target>
661    
662    
663      <!-- jsr166 4jdk8 -->
664    
665      <target name="4jdk8compile"
666              depends="configure-compiler"
667              description="Compiles src/jdk8 sources, targeting jdk8">
668    
669        <mkdir dir="${build.4jdk8.classes.dir}"/>
670    
671        <javac srcdir="${4jdk8src.dir}"
672               destdir="${build.4jdk8.classes.dir}"
673               debug="${build.debug}"
674               debuglevel="${build.debuglevel}"
675               deprecation="${build.deprecation}"
676               source="8"
677               target="8"
678               classpath=""
679               bootclasspath="${bootclasspath8}"
680               includeAntRuntime="false"
681               includeJavaRuntime="false"
682               executable="${javac8}"
683               fork="true">
684    
685          <include name="**/*.java"/>
686          <compilerarg value="-Xprefer:source"/>
687          <compilerarg value="-XDignore.symbol.file=true"/>
688          <compilerarg value="-Xlint:all"/>
689          <compilerarg value="-Werror"/>
690          <compilerarg line="${build.args}"/>
691    
692        </javac>
693      </target>
694    
695      <target name="4jdk8doclint"
696              depends="configure-compiler"
697              description="Finds doclint warnings">
698    
699        <mkdir dir="${build.4jdk8.classes.dir}"/>
700    
701        <javac srcdir="${4jdk8src.dir}"
702               destdir="${build.4jdk8.classes.dir}"
703               debug="${build.debug}"
704               debuglevel="${build.debuglevel}"
705               deprecation="${build.deprecation}"
706               source="8"
707               target="8"
708               classpath=""
709               bootclasspath="${bootclasspath8}"
710               includeAntRuntime="false"
711               includeJavaRuntime="false"
712               executable="${javac8}"
713               fork="true">
714    
715          <include name="**/*.java"/>
716          <compilerarg value="-Xprefer:source"/>
717          <compilerarg value="-XDignore.symbol.file=true"/>
718          <compilerarg value="-Xlint:all"/>
719          <compilerarg value="-Xdoclint:all/protected"/>
720          <compilerarg line="${build.args}"/>
721    
722        </javac>
723      </target>
724    
725    
726      <target name="4jdk8jar"
727              depends="4jdk8compile"
728              description="Builds library jar from compiled sources">
729    
730        <jar destfile="${4jdk8product.jar}">
731          <fileset dir="${build.4jdk8.classes.dir}"/>
732          <manifest>
733            <attribute name="Built-By" value="${user.name}"/>
734            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
735          </manifest>
736        </jar>
737    
738      </target>
739    
740    
741      <target name="4jdk8-tck"
742              depends="4jdk8jar"
743              description="Runs tck tests for jsr166-4jdk8 directly">
744    
745        <run-tck-tests
746          target="8"
747          workdir="${build.4jdk8.dir}"
748          classes="${4jdk8product.jar}">
749          <javac-elements>
750            <!-- JDK9+ test classes -->
751            <exclude name="*9Test.java"/>
752            <exclude name="*10Test.java"/>
753          </javac-elements>
754        </run-tck-tests>
755      </target>
756    
757    
758      <target name="4jdk8-jtreg"
759              depends="4jdk8jar"
760              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
761        <run-jtreg-tests
762           target="8"
763           workdir="${build.4jdk8.dir}"
764           classes="${4jdk8product.jar}"/>
765      </target>
766    
767    
768      <target name="4jdk8-test"
769              depends="4jdk8-tck, 4jdk8-jtreg"
770              description="Runs tck and jtreg tests for jsr166-4jdk8">
771      </target>
772    
773    
774      <target name="4jdk8docs"
775              description="Builds javadocs for src/jdk8 to dist dir">
776    
777        <delete dir="${4jdk8docs.dir}"/>
778        <mkdir dir="${4jdk8docs.dir}"/>
779    
780        <javadoc destdir="${4jdk8docs.dir}"
781                 packagenames="none"
782                 link="${java8.api.url}"
783                 overview="${4jdk8src.dir}/intro.html"
784                 access="${build.javadoc.access}"
785                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
786                 classpath=""
787                 executable="${javadoc8}"
788                 failonerror = "true">
789          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
790            <include name="**/*.java"/>
791          </fileset>
792          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
793          <arg value="-XDignore.symbol.file=true"/>
794          <arg value="-tag"/>
795          <arg value="${javadoc.jls.option}"/>
796          <arg value="-tag"/>
797          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
798          <arg value="-tag"/>
799          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
800          <arg value="-tag"/>
801          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
802        </javadoc>
803      </target>
804    
805    
806      <target name="4jdk8dist"
807              depends="4jdk8dist-jar, 4jdk8dist-docs"
808              description="Puts all distributable products in single hierarchy"/>
809    
810    
811      <target name="4jdk8clean"
812              description="Removes all 4jdk8 build products">
813    
814        <delete dir="${build.4jdk8.dir}"/>
815    
816      </target>
817    
818    
819      <target name="4jdk8dist-jar"
820              depends="4jdk8clean, 4jdk8jar">
821        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
822      </target>
823    
824    
825      <target name="4jdk8dist-docs"
826              depends="4jdk8clean, 4jdk8docs">
827        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
828      </target>
829    
830    
831    
832    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
833    
834    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 752  Line 933 
933    </target>    </target>
934    
935    
936      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
937    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
938            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
939    
940      <junit printsummary="true"      <junit printsummary="true"
941             showoutput="true"             showoutput="true"
# Line 807  Line 988 
988               link="${java7.api.url}"               link="${java7.api.url}"
989               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
990               access="${build.javadoc.access}"               access="${build.javadoc.access}"
991               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
992               classpath=""               classpath=""
993               executable="${javadoc7}">               executable="${javadoc7}"
994                 failonerror = "true">
995        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
996          <include name="**/*.java"/>          <include name="**/*.java"/>
997        </fileset>        </fileset>
# Line 901  Line 1083 
1083               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1084               link="${java.api.url}"               link="${java.api.url}"
1085               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1086               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1087               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1088               source="5"               source="5"
1089               executable="${javadoc7}">               executable="${javadoc7}"
1090                 failonerror = "true">
1091        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1092        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1093    
# Line 993  Line 1176 
1176               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1177               link="${java.api.url}"               link="${java.api.url}"
1178               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1179               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1181               source="6"               source="6"
1182               executable="${javadoc7}">               executable="${javadoc7}"
1183                 failonerror = "true">
1184        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1185        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1186    
# Line 1086  Line 1270 
1270               packagenames="extra166y.*"               packagenames="extra166y.*"
1271               link="${java.api.url}"               link="${java.api.url}"
1272               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1273               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1274               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1275               source="6"               source="6"
1276               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1207  Line 1391 
1391               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1392               link="${java.api.url}"               link="${java.api.url}"
1393               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1394               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1396               executable="${javadoc7}">               executable="${javadoc7}"
1397                 failonerror = "true">
1398        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1399        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1400    

Legend:
Removed from v.1.197  
changed lines
  Added in v.1.210

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8