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

Diff of /jsr166/build.xml

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

revision 1.151 by jsr166, Sun Feb 16 14:25:46 2014 UTC revision 1.157 by jsr166, Tue Jul 8 00:01:39 2014 UTC
# Line 46  Line 46 
46    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
47    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
48    
49    <!-- Tck options; see JSR166TestCase.java -->    <!-- Tck options; see JSR166TestCase.java
50    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     Profiling a tck test class:
51       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52       Stress test a tck test class:
53       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
54      -->
55    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
56    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
57    <property name="jsr166.runsPerTest"      value="1"/>    <property name="jsr166.runsPerTest"      value="1"/>
58    <!-- Allow running an individual tck test class -->    <!-- Stress test an individual tck test class:
59    <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60      -->
61    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62    
63    <!-- Build locations -->    <!-- Build locations -->
# Line 157  Line 162 
162    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
163    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
164    
165    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
166    <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"/>
167    <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"/>
168    <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"/>
169      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
170    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
171    <!-- The expected canonical location does not yet exist as of 2014-02 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
172    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
173      <!-- Default jdk doc location (latest stable release seems best) -->
174    <property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
   <!-- No published jdk9 docs exist as of 2014-02 -->  
   <!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> -->  
175    
176    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
177    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
178      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
179      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
180      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
181      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
182      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
183    
184    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
185    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 190  Line 198 
198      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
199      <attribute name="workdir"/>      <attribute name="workdir"/>
200      <attribute name="classes"/>      <attribute name="classes"/>
201      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
202      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
203      <sequential>      <sequential>
204    
# Line 237  Line 245 
245    </macrodef>    </macrodef>
246    
247    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
248        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
249      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
250      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
251      <attribute name="target"/>      <attribute name="target"/>
# Line 332  Line 341 
341    
342      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
343               packagenames="none"               packagenames="none"
344               link="${jdkapi9docs.url}"               link="${java9.api.url}"
345               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
346               access="${build.javadoc.access}"               access="${build.javadoc.access}"
347               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
# Line 341  Line 350 
350        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
351          <include name="**/*.java"/>          <include name="**/*.java"/>
352        </fileset>        </fileset>
353          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
354        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
355        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
356        <arg value="-tag"/>        <arg value="-tag"/>
# Line 644  Line 654 
654    
655      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
656               packagenames="none"               packagenames="none"
657               link="${jdkapi7docs.url}"               link="${java7.api.url}"
658               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
659               access="${build.javadoc.access}"               access="${build.javadoc.access}"
660               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 653  Line 663 
663        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
664          <include name="**/*.java"/>          <include name="**/*.java"/>
665        </fileset>        </fileset>
666          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
667        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
668      </javadoc>      </javadoc>
669    </target>    </target>
# Line 732  Line 743 
743    
744      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
745               packagenames="jsr166x.*"               packagenames="jsr166x.*"
746               link="${jdkapidocs.url}"               link="${java.api.url}"
747               access="${build.javadoc.access}"               access="${build.javadoc.access}"
748               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
749               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
750               source="5"               source="5"
751               executable="${javadoc7}">               executable="${javadoc7}">
752          <arg line="-Xdocrootparent ${java.docroot.url}"/>
753        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
754    
755      </javadoc>      </javadoc>
# Line 817  Line 829 
829    
830      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
831               packagenames="jsr166y.*"               packagenames="jsr166y.*"
832               link="${jdkapidocs.url}"               link="${java.api.url}"
833               access="${build.javadoc.access}"               access="${build.javadoc.access}"
834               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
835               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
836               source="6"               source="6"
837               executable="${javadoc7}">               executable="${javadoc7}">
838          <arg line="-Xdocrootparent ${java.docroot.url}"/>
839        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
840    
841      </javadoc>      </javadoc>
# Line 903  Line 916 
916    
917      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
918               packagenames="extra166y.*"               packagenames="extra166y.*"
919               link="${jdkapidocs.url}"               link="${java.api.url}"
920               access="${build.javadoc.access}"               access="${build.javadoc.access}"
921               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
922               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
923               source="6"               source="6"
924               executable="${javadoc7}">               executable="${javadoc7}">
925          <arg line="-Xdocrootparent ${java.docroot.url}"/>
926        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
927    
928      </javadoc>      </javadoc>
# Line 1015  Line 1029 
1029    
1030      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1031               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1032               link="${jdkapidocs.url}"               link="${java.api.url}"
1033               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1034               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1035               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1036               executable="${javadoc7}">               executable="${javadoc7}">
1037          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1038        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1039    
1040      </javadoc>      </javadoc>

Legend:
Removed from v.1.151  
changed lines
  Added in v.1.157

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