ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.129 by jsr166, Wed Jan 23 07:17:13 2013 UTC vs.
Revision 1.180 by jsr166, Sun Sep 13 03:41:53 2015 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless">
3  
4    <description>
5   ------------------------------------------------------------------------------
# Line 16 | Line 17
17    $HOME/jdk/jdk6
18    $HOME/jdk/jdk7
19    $HOME/jdk/jdk8
20 +  $HOME/jdk/jdk9
21    where each of the above is a JDK or a symlink to same, and
22    $HOME/jdk/src/jdk6
23    $HOME/jdk/src/jdk7
24    $HOME/jdk/src/jdk8
25 +  $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.
28 +
29 +  Alternatively, define ant variables thus:
30 +  ant -Djdk$N.home=...
31 +  for $N in 6 7 8 9 ...
32   ------------------------------------------------------------------------------
33    </description>
34  
35 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
35 >  <!-- Display main targets by running 'ant -projecthelp' -->
36 >  <target name="usage">
37      <java classname="org.apache.tools.ant.Main">
38        <arg value="-projecthelp" />
39      </java>
40    </target>
41  
42 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43  
44    <!-- User-specific settings -->
45    <property file="user.properties"/>
# Line 41 | Line 50
50    <property name="build.debug"          value="true"/>
51    <property name="build.debuglevel"     value="source,lines,vars"/>
52    <property name="build.deprecation"    value="false"/>
53 +  <property name="build.javadoc.access" value="protected"/>
54 +
55 +  <!-- Tck options; see JSR166TestCase.java
56 +   To profile a single tck test class:
57 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58 +   To stress test a single tck test class:
59 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60 +  -->
61 +  <property name="jsr166.profileTests"     value="false"/>
62 +  <property name="jsr166.profileThreshold" value="100"/>
63 +  <property name="jsr166.runsPerTest"      value="1"/>
64 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65  
66    <!-- Build locations -->
67    <property name="build.dir"                   location="build"/>
# Line 74 | Line 95
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
98 >    <available property="jdk@{v}.have.java.base"
99 >      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101 >      if:set="jdk@{v}.have.java.base"/>
102 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103 >      unless:set="jdk@{v}.have.java.base"/>
104      <local name="boot.jar.dir"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">
# Line 103 | Line 129
129    <defjdklocations v="6"/>
130    <defjdklocations v="7"/>
131    <defjdklocations v="8"/>
132 +  <defjdklocations v="9"/>
133  
134    <!-- Source locations -->
135    <property name="src.dir"              location="${basedir}/src/main"/>
136    <property name="test.src.dir"         location="${basedir}/src/test"/>
137    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
138    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
139 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
140 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
141 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
142 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
143    <property name="lib.dir"              location="${basedir}/lib"/>
144    <property name="dist.dir"             location="${basedir}/dist"/>
145    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 143 | Line 173
173    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
174    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
175  
176 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
177 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
178 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
179 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
180 <
181 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
182 <  <!-- The below does not yet exist as of 2013-01 -->
183 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
176 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
177 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
178 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
179 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
180 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
181 >  <!-- The expected canonical location does not yet exist as of 2014-07 -->
182 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
183 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
184 >  <!-- Default jdk doc location (latest stable release seems best) -->
185 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
186  
187 <  <!-- Default jdk api doc location (latest stable release seems best) -->
188 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
187 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
188 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
189 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
190 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
191 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
192 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
193 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
194  
195    <!-- Define the "jtreg" task -->
196    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 168 | Line 205
205  
206    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
171    <attribute name="source" default="6"/>
208      <attribute name="target"/>
209 +    <attribute name="compile-target" default="@{target}"/>
210      <attribute name="workdir"/>
211      <attribute name="classes"/>
212 <    <attribute name="jvmflags" default=""/>
212 >    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213 >    <element name="javac-elements" optional="true"/>
214      <sequential>
215  
216      <mkdir dir="@{workdir}/tck-classes"/>
# Line 182 | Line 220
220             debug="${build.debug}"
221             debuglevel="${build.debuglevel}"
222             deprecation="${build.deprecation}"
223 <           source="@{source}"
223 >           source="@{compile-target}"
224 >           target="@{compile-target}"
225             classpath="${junit.jar}"
187           bootclasspath="@{classes}:${bootclasspath@{source}}"
226             includeAntRuntime="false"
227             includeJavaRuntime="false"
228 <           executable="${javac@{target}}"
228 >           executable="${javac@{compile-target}}"
229             fork="true">
230  
231        <include name="*.java"/>
232        <compilerarg value="-XDignore.symbol.file=true"/>
233        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
234 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
235        <compilerarg line="${build.args}"/>
236 +      <javac-elements/>
237  
238      </javac>
239  
240 <    <java classname="JSR166TestCase"
240 >    <java classname="${jsr166.tckTestClass}"
241            failonerror="true"
242            jvm="${java@{target}}"
243            fork="true">
244          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245          <jvmarg line="@{jvmflags}"/>
246 +
247 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250 +        </syspropertyset>
251 +
252 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
255          <classpath>
256            <pathelement location="${junit.jar}"/>
257            <pathelement location="@{workdir}/tck-classes"/>
# Line 212 | Line 261
261      </sequential>
262    </macrodef>
263  
264 +  <!-- Define jtreg test sets for different jdk versions -->
265 +  <fileset dir="${jtreg9.src.dir}">
266 +    <patternset id="jdk9.jtreg.tests">
267 +      <include name="**/*.java"/>
268 +    </patternset>
269 +  </fileset>
270 +
271 +  <fileset dir="${jtreg8.src.dir}">
272 +    <patternset id="jdk8.jtreg.tests">
273 +      <include name="**/*.java"/>
274 +      <exclude name="**/SpliteratorCharacteristics.java"/>
275 +      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276 +      <exclude name="**/GCDuringIteration.java"/>
277 +    </patternset>
278 +  </fileset>
279 +
280 +  <fileset dir="${jtreg7.src.dir}">
281 +    <patternset id="jdk7.jtreg.tests">
282 +      <include name="**/*.java"/>
283 +    </patternset>
284 +  </fileset>
285 +
286 +  <macrodef name="run-jtreg-tests">
287 +    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288 +    <attribute name="source" default="7"/>
289 +    <attribute name="target"/>
290 +    <attribute name="workdir"/>
291 +    <attribute name="classes"/>
292 +    <attribute name="jtregflags" default=""/>
293 +    <sequential>
294 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
295 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
296 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
297 +    <mkdir dir="@{workdir}/JTreport"/>
298 +    <jtreg dir="${jtreg@{target}.src.dir}"
299 +           jdk="${jdk@{target}.home}"
300 +           workDir="@{workdir}/JTwork"
301 +           reportDir="@{workdir}/JTreport">
302 +      <patternset refid="jdk@{target}.jtreg.tests"/>
303 +      <arg value="-Xbootclasspath/p:@{classes}"/>
304 +      <arg value="-agentvm"/>
305 +      <arg value="-v:nopass,fail"/>
306 +      <arg value="-vmoptions:-esa -ea"/>
307 +      <arg value="-automatic"/>
308 +      <arg value="-k:!ignore"/>
309 +      <arg line="@{jtregflags}"/>
310 +    </jtreg>
311 +    </sequential>
312 +  </macrodef>
313 +
314    <!-- ALoops classpath -->
315    <path id="loops.classpath">
316      <pathelement location="${build.loops.dir}"/>
# Line 223 | Line 322
322  
323    <!-- Main targets -->
324  
325 +  <property name="build.main.java.version" value="9"/>
326 +  <property name="build.main.javac" value="${javac9}"/>
327 +
328    <target name="dists"
329            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
330            description="Builds all public jars and docs"/>
# Line 241 | Line 343
343             classpath=""
344             includeAntRuntime="false"
345             includeJavaRuntime="false"
346 <           executable="${javac8}"
346 >           executable="${build.main.javac}"
347             fork="true">
348  
349        <include name="**/*.java"/>
350 +      <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352        <compilerarg value="-Xlint:all"/>
353 +      <compilerarg value="-Werror"/>
354 +      <compilerarg value="-Xdoclint:all/protected"/>
355 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356        <compilerarg line="${build.args}"/>
357  
358      </javac>
# Line 259 | Line 365
365  
366      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>
368 +      <manifest>
369 +        <attribute name="Built-By" value="${user.name}"/>
370 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
371 +      </manifest>
372      </jar>
373    </target>
374  
375  
266  <target name="test"
267          depends="configure-tests, report-tests"
268          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
269
270
376    <target name="docs"
377            description="Builds javadocs for src/main to dist dir">
378  
# Line 279 | Line 384
384  
385      <javadoc destdir="${docs.dir}"
386               packagenames="none"
387 <             link="${jdkapi8docs.url}"
387 >             link="${java9.api.url}"
388               overview="${src.dir}/intro.html"
389 <             sourcepath="${src.dir}:${jdk8src.dir}"
389 >             access="${build.javadoc.access}"
390 >             sourcepath="${src.dir}:${jdk9src.dir}"
391               classpath=""
392 <             executable="${javadoc8}">
392 >             executable="${javadoc9}">
393        <fileset dir="${src.dir}" defaultexcludes="yes">
394          <include name="**/*.java"/>
395        </fileset>
396 +      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
397 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
398        <arg value="-XDignore.symbol.file=true"/>
399        <arg value="-tag"/>
400        <arg value="${javadoc.jls.option}"/>
401 +      <arg value="-tag"/>
402 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
403 +      <arg value="-tag"/>
404 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
405 +      <arg value="-tag"/>
406 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
407      </javadoc>
408    </target>
409  
# Line 313 | Line 427
427        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>
430 +      <manifest>
431 +        <attribute name="Built-By" value="${user.name}"/>
432 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
433 +      </manifest>
434      </jar>
435    </target>
436  
# Line 328 | Line 446
446    <target name="dist-clean"
447            description="Removes all build and distribution products">
448  
449 +    <delete dir="${build.dir}"/>
450      <delete dir="${dist.dir}"/>
451  
452    </target>
453  
454  
336  <!-- Internal targets -->
337
338
455    <target name="dist-jar"
456            depends="clean, jar">
457      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 346 | Line 462
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>
464  
465 +  <target name="tck"
466 +          depends="jar"
467 +          description="Runs tck tests for main directly">
468  
469 <  <target name="compile-tests"
470 <          depends="jar">
471 <
472 <    <mkdir dir="${build.testcases.dir}"/>
473 <
474 <    <javac srcdir="${tck.src.dir}"
475 <           destdir="${build.testcases.dir}"
476 <           debug="${build.debug}"
477 <           debuglevel="${build.debuglevel}"
478 <           deprecation="${build.deprecation}"
479 <           source="6"
480 <           classpath="${junit.jar}"
481 <           bootclasspath="@{product.jar}:${bootclasspath6}"
482 <           includeAntRuntime="false"
483 <           includeJavaRuntime="false"
484 <           executable="${javac8}"
485 <           fork="true">
486 <
487 <      <include name="**/*.java"/>
488 <      <compilerarg value="-XDignore.symbol.file=true"/>
489 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
490 <      <compilerarg line="${build.args}"/>
491 <
492 <    </javac>
493 <
494 <    <javac srcdir="${test.src.dir}"
495 <           destdir="${build.testcases.dir}"
377 <           debug="${build.debug}"
378 <           debuglevel="${build.debuglevel}"
379 <           deprecation="${build.deprecation}"
380 <           source="6"
381 <           classpath=""
382 <           bootclasspath="@{product.jar}:${bootclasspath6}"
383 <           includeAntRuntime="false"
384 <           includeJavaRuntime="false"
385 <           executable="${javac8}"
386 <           fork="true">
387 <
388 <      <include name="jsr166/test/**/*.java"/>
389 <      <compilerarg value="-XDignore.symbol.file=true"/>
390 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
391 <      <compilerarg line="${build.args}"/>
392 <
393 <    </javac>
394 <
395 < <!--
396 <    <javac srcdir="${jtreg.src.dir}"
397 <          destdir="${build.testcases.dir}"
398 <            debug="${build.debug}"
399 <       debuglevel="${build.debuglevel}"
400 <      deprecation="${build.deprecation}"
401 <           source="${build.sourcelevel}"
402 <             fork="true">
403 <
404 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
405 <      <compilerarg value="-XDignore.symbol.file=true"/>
406 <      <compilerarg line="${build.args}"/>
407 <
408 <    </javac>
409 < -->
410 <
469 >    <run-tck-tests
470 >      target="${build.main.java.version}"
471 >      workdir="${build.dir}"
472 >      classes="${product.jar}"/>
473 >  </target>
474 >
475 >  <target name="tck-parallelism-1"
476 >          description="Runs tck with given common pool parallelism">
477 >    <antcall target="tck">
478 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479 >    </antcall>
480 >  </target>
481 >
482 >  <target name="tck-parallelism-0"
483 >          description="Runs tck with given common pool parallelism">
484 >    <antcall target="tck">
485 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486 >    </antcall>
487 >  </target>
488 >
489 >  <target name="jtreg"
490 >          depends="jar"
491 >          description="Runs jtreg tests for main using the jtreg ant task">
492 >    <run-jtreg-tests
493 >       target="${build.main.java.version}"
494 >       workdir="${build.dir}"
495 >       classes="${product.jar}"/>
496    </target>
497  
498 +  <target name="test"
499 +          depends="tck, tck-parallelism-1, jtreg"
500 +          description="Runs tck and jtreg tests for main">
501 +  </target>
502  
503 <  <target name="run-tests"
415 <          depends="compile-tests">
416 <
417 <    <!-- May be overridden by user.properties -->
418 <    <property name="testcase" value="*"/>
419 <
420 <    <mkdir dir="${build.reports.dir}"/>
421 <
422 <    <junit printsummary="true"
423 <             showoutput="true"
424 <          errorProperty="junit.failed"
425 <        failureProperty="junit.failed"
426 <                    dir="${build.reports.dir}"
427 <                    jvm="${java8}"
428 <                   fork="true">
429 <
430 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
431 <      <jvmarg value="-server"/>
432 <      <jvmarg value="-showversion"/>
433 <
434 <      <classpath refid="test.classpath"/>
435 <
436 <      <formatter type="xml"/>
437 <
438 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
439 <        <fileset dir="${tck.src.dir}">
440 <          <include name="**/${testcase}Test.java"/>
441 <        </fileset>
442 <      </batchtest>
443 <
444 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
445 <        <fileset dir="${test.src.dir}">
446 <          <include name="jsr166/test/**/${testcase}Test.java"/>
447 <        </fileset>
448 <      </batchtest>
449 <
450 < <!--
451 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
452 <        <fileset dir="${jtreg.src.dir}">
453 <          <include name="**/${testcase}Test.java"/>
454 <        </fileset>
455 <      </batchtest>
456 < -->
503 >  <target name="jtreg8" description="Runs jtreg tests with jdk8">
504  
505 <    </junit>
505 >    <antcall target="jtreg">
506 >      <param name="build.main.java.version" value="8"/>
507 >      <param name="build.main.javac" value="${javac8}"/>
508 >    </antcall>
509  
510    </target>
511  
512 +  <target name="test89"
513 +          description="Runs tck and jtreg tests for main for multiple java versions">
514  
515 <  <target name="report-tests"
516 <          depends="run-tests">
517 <
518 <    <!-- Sets junit.report.format to frames if redirection is present,
519 <         otherwise sets it to noframes. -->
468 <    <available property="junit.report.format"
469 <                  value="frames"
470 <              classname="org.apache.xalan.lib.Redirect"
471 <    />
472 <    <property name="junit.report.format" value="noframes"/>
473 <
474 <    <junitreport todir="${build.reports.dir}">
475 <      <fileset dir="${build.reports.dir}">
476 <        <include name="TEST-*.xml"/>
477 <      </fileset>
478 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
479 <      />
480 <    </junitreport>
515 >    <antcall target="clean"/>
516 >    <antcall target="test">
517 >      <param name="build.main.java.version" value="8"/>
518 >      <param name="build.main.javac" value="${javac8}"/>
519 >    </antcall>
520  
521 <    <fail message="Test Cases Failed" if="junit.failed"/>
521 >    <antcall target="clean"/>
522 >    <antcall target="test">
523 >      <param name="build.main.java.version" value="9"/>
524 >      <param name="build.main.javac" value="${javac9}"/>
525 >    </antcall>
526  
527    </target>
528  
529  
530 +
531    <target name="configure-compiler">
532 +    <fail message="ant version too old">
533 +      <condition>
534 +        <not> <antversion atleast="1.9.1"/> </not>
535 +      </condition>
536 +    </fail>
537  
538      <property name="unchecked.option" value="-Xlint:unchecked"/>
539  
# Line 501 | Line 550
550    </target>
551  
552  
504  <target name="configure-tests"
505       depends="configure-compiler">
506
507    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
508    <available property="junit.available"
509               classname="junit.framework.Protectable"/>
510
511    <!-- Xalan -->
512    <available property="xalan.available"
513               classname="org.apache.xalan.Version"/>
514
515
516    <!-- Ant 1.6beta and later don't need or want this check -->
517    <!--
518    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
519          unless="junit.available"/>
520
521    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
522          unless="xalan.available"/>
523    -->
524
525  </target>
526
553  
554    <!-- Various demos and test programs -->
555  
# Line 554 | Line 580
580    </target>
581  
582  
583 +  <target name="compile-test-loops" depends="jar"
584 +          description="compile all the perf tests in src/test/loops">
585 +
586 +    <mkdir dir="${build.dir}/test/loops"/>
587 +
588 +    <javac srcdir="${basedir}/src/test/loops"
589 +           destdir="${build.dir}/test/loops"
590 +           debug="${build.debug}"
591 +           debuglevel="${build.debuglevel}"
592 +           deprecation="${build.deprecation}"
593 +           includeAntRuntime="false"
594 +           includeJavaRuntime="false"
595 +           executable="${javac9}"
596 +           fork="true">
597 +
598 +      <include name="*.java"/>
599 +      <compilerarg value="-XDignore.symbol.file=true"/>
600 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
601 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
602 +      <compilerarg line="${build.args}"/>
603 +
604 +    </javac>
605 +
606 +  </target>
607 +
608 +
609    <!-- jsr166 4jdk7 -->
610  
611    <target name="4jdk7compile"
# Line 576 | Line 628
628             fork="true">
629  
630        <include name="**/*.java"/>
631 +      <compilerarg value="-Xprefer:source"/>
632        <compilerarg value="-XDignore.symbol.file=true"/>
633        <compilerarg value="-Xlint:all"/>
634 +      <compilerarg value="-Werror"/>
635 +      <compilerarg line="${build.args}"/>
636 +
637 +    </javac>
638 +  </target>
639 +
640 +  <target name="4jdk7doclint"
641 +          depends="configure-compiler"
642 +          description="Finds doclint warnings">
643 +
644 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
645 +
646 +    <javac srcdir="${4jdk7src.dir}"
647 +           destdir="${build.4jdk7.classes.dir}"
648 +           debug="${build.debug}"
649 +           debuglevel="${build.debuglevel}"
650 +           deprecation="${build.deprecation}"
651 +           source="6"
652 +           classpath=""
653 +           bootclasspath="${bootclasspath7}"
654 +           includeAntRuntime="false"
655 +           includeJavaRuntime="false"
656 +           executable="${javac8}"
657 +           fork="true">
658 +
659 +      <include name="**/*.java"/>
660 +      <compilerarg value="-Xprefer:source"/>
661 +      <compilerarg value="-XDignore.symbol.file=true"/>
662 +      <compilerarg value="-Xlint:all"/>
663 +      <compilerarg value="-Xdoclint:all/protected"/>
664        <compilerarg line="${build.args}"/>
665  
666      </javac>
# Line 590 | Line 673
673  
674      <jar destfile="${4jdk7product.jar}">
675        <fileset dir="${build.4jdk7.classes.dir}"/>
676 +      <manifest>
677 +        <attribute name="Built-By" value="${user.name}"/>
678 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
679 +      </manifest>
680      </jar>
681  
682    </target>
683  
684  
685 <  <target name="4jdk7-test-tck"
685 >  <target name="4jdk7-tck"
686            depends="4jdk7jar"
687            description="Runs tck tests for jsr166-4jdk7 directly">
688  
689      <run-tck-tests
690        target="7"
691        workdir="${build.4jdk7.dir}"
692 <      classes="${4jdk7product.jar}"/>
692 >      classes="${4jdk7product.jar}">
693 >      <javac-elements>
694 >        <!-- JDK8+ test classes -->
695 >        <exclude name="*8Test.java"/>
696 >        <exclude name="*9Test.java"/>
697 >        <exclude name="*10Test.java"/>
698 >        <exclude name="DoubleAccumulatorTest.java"/>
699 >        <exclude name="DoubleAdderTest.java"/>
700 >        <exclude name="LongAccumulatorTest.java"/>
701 >        <exclude name="LongAdderTest.java"/>
702 >        <exclude name="CompletableFutureTest.java"/>
703 >        <exclude name="SplittableRandomTest.java"/>
704 >        <exclude name="StampedLockTest.java"/>
705 >        <exclude name="SubmissionPublisherTest.java"/>
706 >      </javac-elements>
707 >    </run-tck-tests>
708    </target>
709  
710  
711 <  <target name="4jdk7-test-tck-junit"
711 >  <target name="4jdk7-tck-junit"
712            depends="4jdk7compile"
713            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
714  
# Line 628 | Line 730
730  
731        <formatter type="brief"/>
732  
733 <      <test name="JSR166TestCase" haltonfailure="no">
733 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
734        </test>
735  
736      </junit>
737    </target>
738  
739 <  <target name="4jdk7-test-jtreg"
740 <          depends="4jdk7compile"
739 >  <target name="4jdk7-jtreg"
740 >          depends="4jdk7jar"
741            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
742 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
743 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
744 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
745 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
644 <    <jtreg dir="${jtreg.src.dir}"
645 <           jdk="${jdk7.home}"
646 <           workDir="${build.4jdk7.dir}/JTwork"
647 <           reportDir="${build.4jdk7.dir}/JTreport">
648 <
649 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
650 <      <arg value="-agentvm"/>
651 <      <arg value="-v:nopass,fail"/>
652 <      <arg value="-vmoptions:-esa -ea"/>
653 <      <arg value="-automatic"/>
654 <      <arg value="-k:!ignore"/>
655 <    </jtreg>
742 >    <run-jtreg-tests
743 >       target="7"
744 >       workdir="${build.4jdk7.dir}"
745 >       classes="${4jdk7product.jar}"/>
746    </target>
747  
748  
749    <target name="4jdk7-test"
750 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
750 >          depends="4jdk7-tck, 4jdk7-jtreg"
751            description="Runs tck and jtreg tests for jsr166-4jdk7">
752    </target>
753  
# Line 670 | Line 760
760  
761      <javadoc destdir="${4jdk7docs.dir}"
762               packagenames="none"
763 <             link="${jdkapi7docs.url}"
763 >             link="${java7.api.url}"
764               overview="${4jdk7src.dir}/intro.html"
765 +             access="${build.javadoc.access}"
766               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
767               classpath=""
768               executable="${javadoc7}">
769        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
770          <include name="**/*.java"/>
771        </fileset>
772 +      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
773        <arg value="-XDignore.symbol.file=true"/>
774      </javadoc>
775    </target>
# Line 696 | Line 788
788    </target>
789  
790  
699  <target name="4jdk7dist-clean"
700          description="Removes all build and distribution products">
701
702  </target>
703
791    <target name="4jdk7dist-jar"
792            depends="4jdk7clean, 4jdk7jar">
793      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 737 | Line 824
824        <include name="jsr166x/**/*.java"/>
825        <compilerarg value="-XDignore.symbol.file=true"/>
826        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
827 +      <compilerarg value="-Werror"/>
828        <compilerarg line="${build.args}"/>
829  
830      </javac>
# Line 749 | Line 837
837  
838      <jar destfile="${jsr166x.jar}">
839        <fileset dir="${build.jsr166x.classes.dir}"/>
840 +      <manifest>
841 +        <attribute name="Built-By" value="${user.name}"/>
842 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
843 +      </manifest>
844      </jar>
845  
846    </target>
# Line 762 | Line 854
854  
855      <javadoc destdir="${jsr166xdocs.dir}"
856               packagenames="jsr166x.*"
857 <             link="${jdkapidocs.url}"
857 >             link="${java.api.url}"
858 >             access="${build.javadoc.access}"
859               sourcepath="${topsrc.dir}:${jdk6src.dir}"
860               bootclasspath="${bootclasspath6}"
861               source="5"
862               executable="${javadoc7}">
863 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
864        <arg value="-XDignore.symbol.file=true"/>
865  
866      </javadoc>
# Line 786 | Line 880
880    </target>
881  
882  
789  <target name="jsr166xdist-clean"
790          description="Removes all build and distribution products">
791
792  </target>
793
794
883    <target name="jsr166xdist-jar"
884            depends="jsr166xclean, jsr166xjar">
885      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 827 | Line 915
915        <include name="jsr166y/**/*.java"/>
916        <compilerarg value="-XDignore.symbol.file=true"/>
917        <compilerarg value="-Xlint:all"/>
918 +      <compilerarg value="-Werror"/>
919        <compilerarg line="${build.args}"/>
920  
921      </javac>
# Line 839 | Line 928
928  
929      <jar destfile="${jsr166y.jar}" index="true">
930        <fileset dir="${build.jsr166y.classes.dir}"/>
931 +      <manifest>
932 +        <attribute name="Built-By" value="${user.name}"/>
933 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934 +      </manifest>
935      </jar>
936  
937    </target>
# Line 852 | Line 945
945  
946      <javadoc destdir="${jsr166ydocs.dir}"
947               packagenames="jsr166y.*"
948 <             link="${jdkapidocs.url}"
948 >             link="${java.api.url}"
949 >             access="${build.javadoc.access}"
950               sourcepath="${topsrc.dir}:${jdk6src.dir}"
951               bootclasspath="${bootclasspath6}"
952               source="6"
953               executable="${javadoc7}">
954 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
955        <arg value="-XDignore.symbol.file=true"/>
956  
957      </javadoc>
# Line 876 | Line 971
971    </target>
972  
973  
879  <target name="jsr166ydist-clean"
880          description="Removes all build and distribution products">
881
882  </target>
883
974    <target name="jsr166ydist-jar"
975            depends="jsr166yclean, jsr166yjar">
976      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 917 | Line 1007
1007        <include name="extra166y/**/*.java"/>
1008        <compilerarg value="-XDignore.symbol.file=true"/>
1009        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1010 +      <compilerarg value="-Werror"/>
1011        <compilerarg line="${build.args}"/>
1012  
1013      </javac>
# Line 929 | Line 1020
1020  
1021      <jar destfile="${extra166y.jar}" index="true">
1022        <fileset dir="${build.extra166y.classes.dir}"/>
1023 +      <manifest>
1024 +        <attribute name="Built-By" value="${user.name}"/>
1025 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1026 +      </manifest>
1027      </jar>
1028  
1029    </target>
# Line 942 | Line 1037
1037  
1038      <javadoc destdir="${extra166ydocs.dir}"
1039               packagenames="extra166y.*"
1040 <             link="${jdkapidocs.url}"
1040 >             link="${java.api.url}"
1041 >             access="${build.javadoc.access}"
1042               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1043               bootclasspath="${bootclasspath6}"
1044               source="6"
1045               executable="${javadoc7}">
1046 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1047        <arg value="-XDignore.symbol.file=true"/>
1048  
1049      </javadoc>
# Line 966 | Line 1063
1063    </target>
1064  
1065  
969  <target name="extra166ydist-clean"
970          description="Removes all build and distribution products">
971
972  </target>
973
1066    <target name="extra166ydist-jar"
1067            depends="extra166yclean, extra166yjar">
1068      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 983 | Line 1075
1075  
1076    <!-- jsr166e -->
1077  
1078 +  <property name="build.jsr166e.java.version" value="6"/>
1079 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1080 +
1081    <target name="jsr166ecompile"
1082            depends="configure-compiler"
1083            description="Compiles jsr166e sources">
# Line 994 | Line 1089
1089             debug="${build.debug}"
1090             debuglevel="${build.debuglevel}"
1091             deprecation="${build.deprecation}"
1092 <           source="7"
1092 >           source="${build.jsr166e.java.version}"
1093             classpath=""
1094             includeAntRuntime="false"
1095             includeJavaRuntime="false"
1096 <           executable="${javac7}"
1096 >           executable="${build.jsr166e.javac}"
1097             fork="true">
1098  
1099        <include name="jsr166e/**/*.java"/>
1100        <compilerarg value="-XDignore.symbol.file=true"/>
1101        <compilerarg value="-Xlint:all"/>
1102 +      <compilerarg value="-Werror"/>
1103        <compilerarg line="${build.args}"/>
1104  
1105      </javac>
1106    </target>
1107  
1108 +  <!-- jsr166e: find doclint errors -->
1109 +  <target name="jsr166edoclint">
1110 +
1111 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1112 +
1113 +    <javac srcdir="${topsrc.dir}"
1114 +           destdir="${build.jsr166e.classes.dir}"
1115 +           debug="${build.debug}"
1116 +           debuglevel="${build.debuglevel}"
1117 +           deprecation="${build.deprecation}"
1118 +           source="${build.jsr166e.java.version}"
1119 +           classpath=""
1120 +           bootclasspath="${bootclasspath7}"
1121 +           includeAntRuntime="false"
1122 +           includeJavaRuntime="false"
1123 +           executable="${javac8}"
1124 +           fork="true">
1125 +
1126 +      <include name="jsr166e/**/*.java"/>
1127 +      <compilerarg value="-XDignore.symbol.file=true"/>
1128 +      <compilerarg value="-Xlint:all"/>
1129 +      <compilerarg value="-Werror"/>
1130 +      <compilerarg value="-Xdoclint:all/protected"/>
1131 +
1132 +    </javac>
1133 +  </target>
1134 +
1135  
1136    <target name="jsr166ejar"
1137            depends="jsr166ecompile"
# Line 1016 | Line 1139
1139  
1140      <jar destfile="${jsr166e.jar}" index="true">
1141        <fileset dir="${build.jsr166e.classes.dir}"/>
1142 +      <manifest>
1143 +        <attribute name="Built-By" value="${user.name}"/>
1144 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1145 +      </manifest>
1146      </jar>
1147  
1148    </target>
# Line 1029 | Line 1156
1156  
1157      <javadoc destdir="${jsr166edocs.dir}"
1158               packagenames="jsr166e.*"
1159 <             link="${jdkapidocs.url}"
1160 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1161 <             source="7"
1159 >             link="${java.api.url}"
1160 >             access="${build.javadoc.access}"
1161 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1162 >             source="${build.jsr166e.java.version}"
1163               executable="${javadoc7}">
1164 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1165        <arg value="-XDignore.symbol.file=true"/>
1166  
1167      </javadoc>
1168    </target>
1169  
1170  
1171 <  <target name="jsr166e-test-tck"
1172 <          depends="jsr166ejar"
1173 <          description="Runs tck tests for jsr166e">
1171 >  <target name="jsr166e-tck-one-java-version"
1172 >          depends="jsr166ejar">
1173 >
1174 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1175  
1176      <run-tck-tests
1177        tck.src.dir="${test.src.dir}/tck-jsr166e"
1178 <      source="7"
1049 <      target="8"
1178 >      target="${build.jsr166e.java.version}"
1179        workdir="${build.jsr166e.dir}"
1180        classes="${jsr166e.jar}"/>
1181    </target>
1182  
1183 +  <target name="jsr166e-tck"
1184 +          description="Runs tck tests for jsr166e for multiple java versions">
1185 +
1186 + <!--     <antcall target="clean"/> -->
1187 + <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1188 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1189 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1190 + <!--     </antcall> -->
1191 +
1192 +    <antcall target="clean"/>
1193 +    <antcall target="jsr166e-tck-one-java-version">
1194 +      <param name="build.jsr166e.java.version" value="7"/>
1195 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1196 +    </antcall>
1197 +
1198 +    <antcall target="clean"/>
1199 +    <antcall target="jsr166e-tck-one-java-version">
1200 +      <param name="build.jsr166e.java.version" value="6"/>
1201 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1202 +    </antcall>
1203 +  </target>
1204 +
1205 +
1206 +  <target name="jsr166e-test"
1207 +          depends="jsr166e-tck"
1208 +          description="Runs all tests for jsr166e">
1209 +  </target>
1210  
1211    <target name="jsr166edist"
1212            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1063 | Line 1219
1219    </target>
1220  
1221  
1066  <target name="jsr166edist-clean"
1067          description="Removes all build and distribution products">
1068
1069  </target>
1070
1222    <target name="jsr166edist-jar"
1223            depends="jsr166eclean, jsr166ejar">
1224      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1078 | Line 1229
1229      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1230    </target>
1231  
1232 +
1233 + <!-- Find buglets that can be detected by static build tools -->
1234 +
1235 +  <target name="lint">
1236 +    <antcall target="dists">
1237 +      <param name="build.javadoc.access" value="public"/>
1238 +    </antcall>
1239 +  </target>
1240 +
1241 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1242 +  <target name="lint-private">
1243 +    <antcall target="dist">
1244 +      <param name="build.javadoc.access" value="private"/>
1245 +    </antcall>
1246 +  </target>
1247 +
1248 +
1249   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines