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.190 by jsr166, Thu Nov 5 17:18:53 2015 UTC vs.
Revision 1.224 by jsr166, Thu Nov 24 01:58:04 2016 UTC

# Line 7 | Line 7
7  
8    Usage: ant [target]
9  
10 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11 +  more details.
12 +
13    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.
15  
# Line 27 | Line 30
30    (e.g. mercurial forest) or a symlink to same.
31  
32    Alternatively, define ant variables thus:
33 <  ant -Djdk$N.home=...
33 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...
35  
36 <  As of 2015-09, there is incomplete hacky support for jigsaw
37 <  Build for jigsaw using something like:
35 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
36 >  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 >  target is currently broken.
38   ------------------------------------------------------------------------------
39    </description>
40  
41 <  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />
# Line 62 | Line 63
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>
65  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66  
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71  
72 +  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73 +  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74 +  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75 +  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76 +
77    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 85 | Line 90
90    <macrodef name="defjdklocations">
91      <attribute name="v"/>
92      <sequential>
93 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
94 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
95 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
96 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
93 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
94 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
95 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
96 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
97 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98      <local name="have.java.base"/>
99      <available property="have.java.base"
100 <      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
100 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102        if:set="have.java.base"/>
103 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104        unless:set="have.java.base"/>
105      <local name="modules"/>
106      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 134 | Line 140
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
143 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150 +  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149 | Line 156
156    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 +  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156 | Line 164
164  
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 +  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164 | Line 173
173    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176 +  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 175 | Line 185
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
188 >  <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
190 >  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193  
# Line 209 | Line 219
219      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>
221      <attribute name="classes"/>
222 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
222 >    <!--
223 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224 >    -->
225 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>
227  
228      <sequential>
# Line 231 | Line 244
244             classpath="${junit.jar}"
245             includeAntRuntime="false"
246             includeJavaRuntime="false"
247 +           encoding="ASCII"
248             executable="${javac@{compile-target}}"
249             fork="true">
250  
# Line 238 | Line 252
252        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255 <      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
255 >      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>
257        <javac-elements/>
258  
# Line 249 | Line 263
263            jvm="${java@{target}}"
264            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <        <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
266 >        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>
268 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
270  
271 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
271 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272          <syspropertyset id="system-properties-used-by-tck">
273            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274            <propertyref prefix="jsr166."/>
275 +          <propertyref name="test.timeout.factor"/>
276          </syspropertyset>
277  
278          <classpath>
# Line 289 | Line 306
306      </patternset>
307    </fileset>
308  
309 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
310 +  <property name="jtreg.flags" value=""/>
311 +
312    <macrodef name="run-jtreg-tests">
313      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314      <attribute name="source" default="7"/>
# Line 308 | Line 328
328      </condition>
329  
330      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311    <delete dir="@{workdir}/JTreport" quiet="true"/>
312    <mkdir dir="@{workdir}/JTwork/scratch"/>
313    <mkdir dir="@{workdir}/JTreport"/>
331      <jtreg dir="${jtreg@{target}.src.dir}"
332             jdk="${jdk@{target}.home}"
333 <           workDir="@{workdir}/JTwork"
317 <           reportDir="@{workdir}/JTreport">
333 >           workDir="@{workdir}/JTwork">
334        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336 <      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
336 >      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
337 >      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
338        <arg value="-agentvm"/>
339 +      <arg value="-noreport"/>
340        <arg value="-verbose:${jtreg.verbose}"/>
341        <arg value="-vmoptions:-esa -ea"/>
342        <arg value="-automatic"/>
343        <arg value="-k:!ignore"/>
344        <arg line="@{jtregflags}"/>
345 +      <arg line="${jtreg.flags}"/>
346      </jtreg>
347      </sequential>
348    </macrodef>
# Line 343 | Line 362
362    <property name="build.main.javac" value="${javac9}"/>
363  
364    <target name="dists"
365 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
365 >          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366            description="Builds all public jars and docs"/>
367  
368    <target name="compile"
# Line 372 | Line 391
391             classpath=""
392             includeAntRuntime="false"
393             includeJavaRuntime="false"
394 +           encoding="ASCII"
395             executable="${build.main.javac}"
396             fork="true">
397  
# Line 391 | Line 411
411  
412    <target name="jar"
413            depends="compile"
414 <          description="Builds library jar from compiled sources">
415 <
414 >          description="Builds library jar for src/main from compiled sources">
415 >    <local name="subdir"/>
416 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
417      <jar destfile="${product.jar}">
418 <      <fileset dir="${build.classes.dir}"/>
418 >      <fileset dir="${build.classes.dir}${subdir}"/>
419        <manifest>
420          <attribute name="Built-By" value="${user.name}"/>
421          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 412 | Line 433
433      <!-- the packagenames="none" hack below prevents scanning the -->
434      <!-- sourcepath for packages -->
435  
436 + <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
437 + <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
438      <javadoc destdir="${docs.dir}"
439               packagenames="none"
440               link="${java9.api.url}"
441               overview="${src.dir}/intro.html"
442               access="${build.javadoc.access}"
443 <             sourcepath="${src.dir}:${jdk9src.dir}"
443 >             sourcepath="${src.dir}"
444               classpath=""
445               executable="${javadoc9}">
446        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 426 | Line 449
449        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
450        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
451        <arg value="-XDignore.symbol.file=true"/>
452 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
452 >      <arg value="-Xmodule:java.base"/>
453        <arg value="-tag"/>
454        <arg value="${javadoc.jls.option}"/>
455 + <!-- @apiNote currently unused -->
456 + <!--       <arg value="-tag"/> -->
457 + <!--       <arg value="apiNote:a:API Note:"/> -->
458        <arg value="-tag"/>
459 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
459 >      <arg value="implSpec:a:Implementation Requirements:"/>
460        <arg value="-tag"/>
461 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
462 <      <arg value="-tag"/>
463 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
461 >      <arg value="implNote:a:Implementation Note:"/>
462 > <!-- tags added in jdk9: currently unused -->
463 > <!--       <arg value="-tag"/> -->
464 > <!--       <arg value="revised:X"/> -->
465 > <!--       <arg value="-tag"/> -->
466 > <!--       <arg value="spec:X"/> -->
467      </javadoc>
468    </target>
469  
# Line 495 | Line 524
524  
525    <target name="tck"
526            depends="jar"
527 <          description="Runs tck tests for main directly">
527 >          description="Runs tck tests for src/main directly">
528  
529      <run-tck-tests
530        target="${build.main.java.version}"
# Line 504 | Line 533
533    </target>
534  
535    <target name="tck-parallelism-1"
536 <          description="Runs tck with given common pool parallelism">
536 >          description="Runs tck with common pool parallelism 1">
537      <antcall target="tck">
538        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
539      </antcall>
540    </target>
541  
542    <target name="tck-parallelism-0"
543 <          description="Runs tck with given common pool parallelism">
543 >          description="Runs tck with common pool parallelism 0">
544      <antcall target="tck">
545        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
546      </antcall>
547    </target>
548  
549 +  <target name="tck-security-manager"
550 +          description="Runs tck with a security manager">
551 +    <antcall target="tck">
552 +      <param name="jsr166.useSecurityManager" value="true"/>
553 +    </antcall>
554 +  </target>
555 +
556    <target name="jtreg"
557            depends="jar"
558 <          description="Runs jtreg tests for main using the jtreg ant task">
558 >          description="Runs jtreg tests for src/main using the jtreg ant task">
559      <run-jtreg-tests
560         target="${build.main.java.version}"
561         workdir="${build.dir}"
# Line 527 | Line 563
563    </target>
564  
565    <target name="test"
566 <          depends="tck, tck-parallelism-1, jtreg"
567 <          description="Runs tck and jtreg tests for main">
566 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
567 >          description="Runs tck and jtreg tests for src/main">
568    </target>
569  
570 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
570 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
571  
572 <    <antcall target="jtreg">
573 <      <param name="build.main.java.version" value="8"/>
574 <      <param name="build.main.javac" value="${javac8}"/>
575 <    </antcall>
572 > <!--     <antcall target="jtreg"> -->
573 > <!--       <param name="build.main.java.version" value="8"/> -->
574 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
575 > <!--     </antcall> -->
576  
577 <  </target>
577 > <!--   </target> -->
578  
579 <  <target name="test89"
580 <          description="Runs tck and jtreg tests for main for multiple java versions">
579 > <!--   <target name="test89" -->
580 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
581  
582 <    <antcall target="clean"/>
583 <    <antcall target="test">
584 <      <param name="build.main.java.version" value="8"/>
585 <      <param name="build.main.javac" value="${javac8}"/>
586 <    </antcall>
582 > <!--     <antcall target="clean"/> -->
583 > <!--     <antcall target="test"> -->
584 > <!--       <param name="build.main.java.version" value="8"/> -->
585 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
586 > <!--     </antcall> -->
587  
588 <    <antcall target="clean"/>
589 <    <antcall target="test">
590 <      <param name="build.main.java.version" value="9"/>
591 <      <param name="build.main.javac" value="${javac9}"/>
592 <    </antcall>
588 > <!--     <antcall target="clean"/> -->
589 > <!--     <antcall target="test"> -->
590 > <!--       <param name="build.main.java.version" value="9"/> -->
591 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
592 > <!--     </antcall> -->
593  
594 <  </target>
594 > <!--   </target> -->
595  
596  
597  
# Line 585 | Line 621
621    <!-- Various demos and test programs -->
622  
623  
624 <  <target name="loops" depends="configure-compiler"
625 <          description="Benchmark from Doug Lea's AQS paper">
624 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
625 >  <target name="loops" depends="configure-compiler">
626  
627      <mkdir dir="${build.loops.dir}"/>
628  
# Line 596 | Line 632
632         debuglevel="${build.debuglevel}"
633        deprecation="${build.deprecation}"
634             source="${build.sourcelevel}"
635 +           target="${build.sourcelevel}"
636 +         encoding="ASCII"
637               fork="true">
638  
639        <compilerarg line="${build.args}"/>
# Line 623 | Line 661
661             deprecation="${build.deprecation}"
662             includeAntRuntime="false"
663             includeJavaRuntime="false"
664 +           encoding="ASCII"
665             executable="${javac9}"
666             fork="true">
667  
# Line 637 | Line 676
676    </target>
677  
678  
679 +  <!-- jsr166 4jdk8 -->
680 +
681 +  <target name="4jdk8compile"
682 +          depends="configure-compiler"
683 +          description="Compiles src/jdk8 sources, targeting jdk8">
684 +
685 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
686 +
687 +    <javac srcdir="${4jdk8src.dir}"
688 +           destdir="${build.4jdk8.classes.dir}"
689 +           debug="${build.debug}"
690 +           debuglevel="${build.debuglevel}"
691 +           deprecation="${build.deprecation}"
692 +           source="8"
693 +           target="8"
694 +           classpath=""
695 +           bootclasspath="${bootclasspath8}"
696 +           includeAntRuntime="false"
697 +           includeJavaRuntime="false"
698 +           encoding="ASCII"
699 +           executable="${javac8}"
700 +           fork="true">
701 +
702 +      <include name="**/*.java"/>
703 +      <compilerarg value="-Xprefer:source"/>
704 +      <compilerarg value="-XDignore.symbol.file=true"/>
705 +      <compilerarg value="-Xlint:all"/>
706 +      <compilerarg value="-Werror"/>
707 +      <compilerarg line="${build.args}"/>
708 +
709 +    </javac>
710 +  </target>
711 +
712 +  <target name="4jdk8doclint"
713 +          depends="configure-compiler"
714 +          description="Finds doclint warnings">
715 +
716 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
717 +
718 +    <javac srcdir="${4jdk8src.dir}"
719 +           destdir="${build.4jdk8.classes.dir}"
720 +           debug="${build.debug}"
721 +           debuglevel="${build.debuglevel}"
722 +           deprecation="${build.deprecation}"
723 +           source="8"
724 +           target="8"
725 +           classpath=""
726 +           bootclasspath="${bootclasspath8}"
727 +           includeAntRuntime="false"
728 +           includeJavaRuntime="false"
729 +           encoding="ASCII"
730 +           executable="${javac8}"
731 +           fork="true">
732 +
733 +      <include name="**/*.java"/>
734 +      <compilerarg value="-Xprefer:source"/>
735 +      <compilerarg value="-XDignore.symbol.file=true"/>
736 +      <compilerarg value="-Xlint:all"/>
737 +      <compilerarg value="-Xdoclint:all/protected"/>
738 +      <compilerarg line="${build.args}"/>
739 +
740 +    </javac>
741 +  </target>
742 +
743 +
744 +  <target name="4jdk8jar"
745 +          depends="4jdk8compile"
746 +          description="Builds library jar from compiled sources">
747 +
748 +    <jar destfile="${4jdk8product.jar}">
749 +      <fileset dir="${build.4jdk8.classes.dir}"/>
750 +      <manifest>
751 +        <attribute name="Built-By" value="${user.name}"/>
752 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
753 +      </manifest>
754 +    </jar>
755 +
756 +  </target>
757 +
758 +
759 +  <target name="4jdk8-tck"
760 +          depends="4jdk8jar"
761 +          description="Runs tck tests for jsr166-4jdk8 directly">
762 +
763 +    <run-tck-tests
764 +      target="8"
765 +      workdir="${build.4jdk8.dir}"
766 +      classes="${4jdk8product.jar}">
767 +      <javac-elements>
768 +        <!-- JDK9+ test classes -->
769 +        <exclude name="*9Test.java"/>
770 +        <exclude name="*10Test.java"/>
771 +      </javac-elements>
772 +    </run-tck-tests>
773 +  </target>
774 +
775 +
776 +  <target name="4jdk8-jtreg"
777 +          depends="4jdk8jar"
778 +          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
779 +    <run-jtreg-tests
780 +       target="8"
781 +       workdir="${build.4jdk8.dir}"
782 +       classes="${4jdk8product.jar}"/>
783 +  </target>
784 +
785 +
786 +  <target name="4jdk8-test"
787 +          depends="4jdk8-tck, 4jdk8-jtreg"
788 +          description="Runs tck and jtreg tests for jsr166-4jdk8">
789 +  </target>
790 +
791 +
792 +  <target name="4jdk8docs"
793 +          description="Builds javadocs for src/jdk8 to dist dir">
794 +
795 +    <delete dir="${4jdk8docs.dir}"/>
796 +    <mkdir dir="${4jdk8docs.dir}"/>
797 +
798 +    <javadoc destdir="${4jdk8docs.dir}"
799 +             packagenames="none"
800 +             link="${java8.api.url}"
801 +             overview="${4jdk8src.dir}/intro.html"
802 +             access="${build.javadoc.access}"
803 +             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
804 +             classpath=""
805 +             executable="${javadoc8}"
806 +             failonerror = "true">
807 +      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
808 +        <include name="**/*.java"/>
809 +      </fileset>
810 +      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
811 +      <arg value="-XDignore.symbol.file=true"/>
812 +      <arg value="-tag"/>
813 +      <arg value="${javadoc.jls.option}"/>
814 + <!-- @apiNote currently unused -->
815 + <!--       <arg value="-tag"/> -->
816 + <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
817 +      <arg value="-tag"/>
818 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
819 +      <arg value="-tag"/>
820 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
821 +    </javadoc>
822 +  </target>
823 +
824 +
825 +  <target name="4jdk8dist"
826 +          depends="4jdk8dist-jar, 4jdk8dist-docs"
827 +          description="Puts all distributable products in single hierarchy"/>
828 +
829 +
830 +  <target name="4jdk8clean"
831 +          description="Removes all 4jdk8 build products">
832 +
833 +    <delete dir="${build.4jdk8.dir}"/>
834 +
835 +  </target>
836 +
837 +
838 +  <target name="4jdk8dist-jar"
839 +          depends="4jdk8clean, 4jdk8jar">
840 +    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
841 +  </target>
842 +
843 +
844 +  <target name="4jdk8dist-docs"
845 +          depends="4jdk8clean, 4jdk8docs">
846 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
847 +  </target>
848 +
849 +
850 +
851    <!-- jsr166 4jdk7 -->
852  
853    <target name="4jdk7compile"
# Line 656 | Line 867
867             bootclasspath="${bootclasspath6}"
868             includeAntRuntime="false"
869             includeJavaRuntime="false"
870 +           encoding="ASCII"
871             executable="${javac7}"
872             fork="true">
873  
# Line 686 | Line 898
898             bootclasspath="${bootclasspath6}"
899             includeAntRuntime="false"
900             includeJavaRuntime="false"
901 +           encoding="ASCII"
902             executable="${javac8}"
903             fork="true">
904  
# Line 741 | Line 954
954    </target>
955  
956  
957 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
958    <target name="4jdk7-tck-junit"
959 <          depends="4jdk7compile"
746 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
959 >          depends="4jdk7compile">
960  
961      <junit printsummary="true"
962             showoutput="true"
# Line 796 | Line 1009
1009               link="${java7.api.url}"
1010               overview="${4jdk7src.dir}/intro.html"
1011               access="${build.javadoc.access}"
1012 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1012 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1013               classpath=""
1014 <             executable="${javadoc7}">
1014 >             executable="${javadoc7}"
1015 >             failonerror = "true">
1016        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1017          <include name="**/*.java"/>
1018        </fileset>
# Line 852 | Line 1066
1066             target="5"
1067             includeAntRuntime="false"
1068             includeJavaRuntime="false"
1069 +           encoding="ASCII"
1070             executable="${javac7}"
1071             fork="true">
1072  
# Line 890 | Line 1105
1105               packagenames="jsr166x.*"
1106               link="${java.api.url}"
1107               access="${build.javadoc.access}"
1108 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1108 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1109               bootclasspath="${bootclasspath6}"
1110               source="5"
1111 <             executable="${javadoc7}">
1111 >             executable="${javadoc7}"
1112 >             failonerror = "true">
1113        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1114        <arg value="-XDignore.symbol.file=true"/>
1115  
# Line 944 | Line 1160
1160             bootclasspath="${bootclasspath6}"
1161             includeAntRuntime="false"
1162             includeJavaRuntime="false"
1163 +           encoding="ASCII"
1164             executable="${javac7}"
1165             fork="true">
1166  
# Line 982 | Line 1199
1199               packagenames="jsr166y.*"
1200               link="${java.api.url}"
1201               access="${build.javadoc.access}"
1202 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1202 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1203               bootclasspath="${bootclasspath6}"
1204               source="6"
1205 <             executable="${javadoc7}">
1205 >             executable="${javadoc7}"
1206 >             failonerror = "true">
1207        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1208        <arg value="-XDignore.symbol.file=true"/>
1209  
# Line 1037 | Line 1255
1255             target="6"
1256             includeAntRuntime="false"
1257             includeJavaRuntime="false"
1258 +           encoding="ASCII"
1259             executable="${javac7}"
1260             fork="true">
1261  
# Line 1075 | Line 1294
1294               packagenames="extra166y.*"
1295               link="${java.api.url}"
1296               access="${build.javadoc.access}"
1297 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1297 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1298               bootclasspath="${bootclasspath6}"
1299               source="6"
1300               executable="${javadoc7}">
# Line 1196 | Line 1415
1415               packagenames="jsr166e.*"
1416               link="${java.api.url}"
1417               access="${build.javadoc.access}"
1418 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1418 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1419               source="${build.jsr166e.java.version}"
1420 <             executable="${javadoc7}">
1420 >             executable="${javadoc7}"
1421 >             failonerror = "true">
1422        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1423        <arg value="-XDignore.symbol.file=true"/>
1424  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines