[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.154, Mon Jun 16 15:55:54 2014 UTC revision 1.164, Wed May 20 06:13:09 2015 UTC
# Line 24  Line 24 
24    $HOME/jdk/src/jdk9    $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.
27    
28      Alternatively, define ant variables thus:
29      ant -Djdk$N.home=...
30      for $N in 6 7 8 9 ...
31  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
32    </description>    </description>
33    
# Line 46  Line 50 
50    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
51    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
52    
53    <!-- Tck options; see JSR166TestCase.java -->    <!-- Tck options; see JSR166TestCase.java
54    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     To profile a single tck test class:
55       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56       To stress test a single tck test class:
57       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58      -->
59    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
61    <property name="jsr166.runsPerTest"      value="1"/>    <property name="jsr166.runsPerTest"      value="1"/>
   <!-- Allow running an individual tck test class -->  
   <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->  
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63    
64    <!-- Build locations -->    <!-- Build locations -->
# Line 161  Line 167 
167    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168    <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"/>
169    <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"/>
170    <!-- The expected canonical location does not yet exist as of 2014-02 -->    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171    <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->    <!-- The expected canonical location does not yet exist as of 2014-07 -->
   <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>  
   <!-- No published jdk9 docs exist as of 2014-02 -->  
172    <!-- <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"/> -->
173    <property name="java9.docroot.url"      value="${java8.docroot.url}"/>    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
175    <property name="java.docroot.url"       value="${java7.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176    
177    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 195  Line 199 
199      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>      <attribute name="workdir"/>
201      <attribute name="classes"/>      <attribute name="classes"/>
202      <attribute name="jvmflags" default="-ea -esa"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
204      <sequential>      <sequential>
205    
# Line 209  Line 213 
213             source="@{compile-target}"             source="@{compile-target}"
214             target="@{compile-target}"             target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 218  Line 221 
221        <include name="*.java"/>        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226        <javac-elements/>        <javac-elements/>
227    
# Line 229  Line 233 
233            fork="true">            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
236    
237            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240            </syspropertyset>
241    
242          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 309  Line 319 
319        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
320        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
321        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
322          <compilerarg value="-Werror"/>
323        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
324        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
325        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 412  Line 423 
423      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
424    </target>    </target>
425    
426      <target name="tck" depends="test-tck" description="alias for test-tck"/>
427    <target name="test-tck"    <target name="test-tck"
428            depends="jar"            depends="jar"
429            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 423  Line 434 
434        classes="${product.jar}"/>        classes="${product.jar}"/>
435    </target>    </target>
436    
437      <target name="test-tck-parallelism-1"
438              description="Runs test-tck with given common pool parallelism">
439        <antcall target="test-tck">
440          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
441        </antcall>
442      </target>
443    
444      <target name="test-tck-parallelism-0"
445              description="Runs test-tck with given common pool parallelism">
446        <antcall target="test-tck">
447          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
448        </antcall>
449      </target>
450    
451      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
452    <target name="test-jtreg"    <target name="test-jtreg"
453            depends="jar"            depends="jar"
454            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
# Line 433  Line 459 
459    </target>    </target>
460    
461    <target name="test"    <target name="test"
462            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
463            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
464    </target>    </target>
465    
# Line 528  Line 554 
554        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
555        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
556        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
557          <compilerarg value="-Werror"/>
558        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
559    
560      </javac>      </javac>
# Line 715  Line 742 
742        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
743        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
744        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
745          <compilerarg value="-Werror"/>
746        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
747    
748      </javac>      </javac>
# Line 801  Line 829 
829        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
830        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
831        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
832          <compilerarg value="-Werror"/>
833        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
834    
835      </javac>      </javac>
# Line 888  Line 917 
917        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
918        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
919        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
920          <compilerarg value="-Werror"/>
921        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
922    
923      </javac>      </javac>
# Line 975  Line 1005 
1005        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1006        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1007        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1008          <compilerarg value="-Werror"/>
1009        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1010    
1011      </javac>      </javac>
# Line 1001  Line 1032 
1032        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1033        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1034        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1035          <compilerarg value="-Werror"/>
1036        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1037    
1038      </javac>      </javac>
# Line 1104  Line 1136 
1136    
1137    <target name="lint">    <target name="lint">
1138      <antcall target="dists">      <antcall target="dists">
1139          <param name="build.javadoc.access" value="public"/>
1140        </antcall>
1141      </target>
1142    
1143    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1144      <target name="lint-private">
1145        <antcall target="dist">
1146        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1147      </antcall>      </antcall>
1148    </target>    </target>

Legend:
Removed from v.1.154  
changed lines
  Added in v.1.164

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8