[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.155, Mon Jun 16 18:01:38 2014 UTC revision 1.165, Wed Jun 17 01:55:44 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 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 241  Line 251 
251      </sequential>      </sequential>
252    </macrodef>    </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265        </patternset>
266      </fileset>
267    
268      <fileset dir="${jtreg.src.dir}">
269        <patternset id="jdk7.jtreg.tests">
270          <include name="**/*.java"/>
271          <exclude name="util/Collection/CollectionDefaults.java"/>
272          <exclude name="util/List/ListDefaults.java"/>
273          <exclude name="util/Spliterator/**/*.java"/>
274          <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277        </patternset>
278      </fileset>
279    
280    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
281      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 258  Line 294 
294             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
295             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
296             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
297          <patternset refid="jdk@{target}.jtreg.tests"/>
298        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
299        <arg value="-agentvm"/>        <arg value="-agentvm"/>
300        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 309  Line 345 
345        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
346        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
347        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
348          <compilerarg value="-Werror"/>
349        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 412  Line 449 
449      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>    </target>
451    
452      <target name="tck" depends="test-tck" description="alias for test-tck"/>
453    <target name="test-tck"    <target name="test-tck"
454            depends="jar"            depends="jar"
455            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 423  Line 460 
460        classes="${product.jar}"/>        classes="${product.jar}"/>
461    </target>    </target>
462    
463      <target name="test-tck-parallelism-1"
464              description="Runs test-tck with given common pool parallelism">
465        <antcall target="test-tck">
466          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
467        </antcall>
468      </target>
469    
470      <target name="test-tck-parallelism-0"
471              description="Runs test-tck with given common pool parallelism">
472        <antcall target="test-tck">
473          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474        </antcall>
475      </target>
476    
477      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478    <target name="test-jtreg"    <target name="test-jtreg"
479            depends="jar"            depends="jar"
480            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 485 
485    </target>    </target>
486    
487    <target name="test"    <target name="test"
488            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
489            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
490    </target>    </target>
491    
# Line 444  Line 496 
496      <antcall target="test">      <antcall target="test">
497        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
498        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
499          <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500      </antcall>      </antcall>
501    
502      <antcall target="clean"/>      <antcall target="clean"/>
# Line 528  Line 581 
581        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
582        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
583        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
584          <compilerarg value="-Werror"/>
585        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
586    
587      </javac>      </javac>
# Line 632  Line 686 
686      <run-jtreg-tests      <run-jtreg-tests
687         target="7"         target="7"
688         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
689         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
690    </target>    </target>
691    
692    
# Line 715  Line 768 
768        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
769        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
770        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
771          <compilerarg value="-Werror"/>
772        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
773    
774      </javac>      </javac>
# Line 801  Line 855 
855        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
856        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
857        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
858          <compilerarg value="-Werror"/>
859        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
860    
861      </javac>      </javac>
# Line 888  Line 943 
943        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
944        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
945        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
946          <compilerarg value="-Werror"/>
947        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
948    
949      </javac>      </javac>
# Line 975  Line 1031 
1031        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1032        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1033        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1034          <compilerarg value="-Werror"/>
1035        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1036    
1037      </javac>      </javac>
# Line 1001  Line 1058 
1058        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1059        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1060        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1061          <compilerarg value="-Werror"/>
1062        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1063    
1064      </javac>      </javac>
# Line 1104  Line 1162 
1162    
1163    <target name="lint">    <target name="lint">
1164      <antcall target="dists">      <antcall target="dists">
1165          <param name="build.javadoc.access" value="public"/>
1166        </antcall>
1167      </target>
1168    
1169    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1170      <target name="lint-private">
1171        <antcall target="dist">
1172        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1173      </antcall>      </antcall>
1174    </target>    </target>

Legend:
Removed from v.1.155  
changed lines
  Added in v.1.165

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8