/[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.156 by jsr166, Wed Jun 25 08:29:01 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"/>
   
   <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>  
169    <!-- The expected canonical location does not yet exist as of 2014-02 -->    <!-- The expected canonical location does not yet exist as of 2014-02 -->
170    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
171      <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
   <property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>  
172    <!-- No published jdk9 docs exist as of 2014-02 -->    <!-- No published jdk9 docs exist as of 2014-02 -->
173    <!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
174      <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
175      <!-- Default jdk doc location (latest stable release seems best) -->
176      <property name="java.docroot.url"       value="${java7.docroot.url}"/>
177    
178    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
179    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
180      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
181      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
182      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
183      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
184      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
185    
186    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
187    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 190  Line 200 
200      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
201      <attribute name="workdir"/>      <attribute name="workdir"/>
202      <attribute name="classes"/>      <attribute name="classes"/>
203      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
204      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
205      <sequential>      <sequential>
206    
# Line 237  Line 247 
247    </macrodef>    </macrodef>
248    
249    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
250        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
251      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
252      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
253      <attribute name="target"/>      <attribute name="target"/>
# Line 332  Line 343 
343    
344      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
345               packagenames="none"               packagenames="none"
346               link="${jdkapi9docs.url}"               link="${java9.api.url}"
347               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
348               access="${build.javadoc.access}"               access="${build.javadoc.access}"
349               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
# Line 341  Line 352 
352        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
353          <include name="**/*.java"/>          <include name="**/*.java"/>
354        </fileset>        </fileset>
355          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
356        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
358        <arg value="-tag"/>        <arg value="-tag"/>
# Line 644  Line 656 
656    
657      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
658               packagenames="none"               packagenames="none"
659               link="${jdkapi7docs.url}"               link="${java7.api.url}"
660               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
661               access="${build.javadoc.access}"               access="${build.javadoc.access}"
662               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 653  Line 665 
665        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
666          <include name="**/*.java"/>          <include name="**/*.java"/>
667        </fileset>        </fileset>
668          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
669        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
670      </javadoc>      </javadoc>
671    </target>    </target>
# Line 732  Line 745 
745    
746      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
747               packagenames="jsr166x.*"               packagenames="jsr166x.*"
748               link="${jdkapidocs.url}"               link="${java.api.url}"
749               access="${build.javadoc.access}"               access="${build.javadoc.access}"
750               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
751               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
752               source="5"               source="5"
753               executable="${javadoc7}">               executable="${javadoc7}">
754          <arg line="-Xdocrootparent ${java.docroot.url}"/>
755        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
756    
757      </javadoc>      </javadoc>
# Line 817  Line 831 
831    
832      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
833               packagenames="jsr166y.*"               packagenames="jsr166y.*"
834               link="${jdkapidocs.url}"               link="${java.api.url}"
835               access="${build.javadoc.access}"               access="${build.javadoc.access}"
836               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
837               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
838               source="6"               source="6"
839               executable="${javadoc7}">               executable="${javadoc7}">
840          <arg line="-Xdocrootparent ${java.docroot.url}"/>
841        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
842    
843      </javadoc>      </javadoc>
# Line 903  Line 918 
918    
919      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
920               packagenames="extra166y.*"               packagenames="extra166y.*"
921               link="${jdkapidocs.url}"               link="${java.api.url}"
922               access="${build.javadoc.access}"               access="${build.javadoc.access}"
923               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
924               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
925               source="6"               source="6"
926               executable="${javadoc7}">               executable="${javadoc7}">
927          <arg line="-Xdocrootparent ${java.docroot.url}"/>
928        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
929    
930      </javadoc>      </javadoc>
# Line 1015  Line 1031 
1031    
1032      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1033               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1034               link="${jdkapidocs.url}"               link="${java.api.url}"
1035               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1036               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1037               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1038               executable="${javadoc7}">               executable="${javadoc7}">
1039          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1040        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1041    
1042      </javadoc>      </javadoc>

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

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