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.200 by jsr166, Sat Mar 26 06:22:49 2016 UTC vs.
Revision 1.227 by jsr166, Sat Dec 17 22:18:25 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 30 | Line 33
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.home="$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"/>
# Line 185 | 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 2016-03 -->
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 219 | 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 241 | 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 248 | 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="-Xpatch:${build.classes.dir}" if:set="modules"/>
255 >      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256        <compilerarg line="${build.args}"/>
257        <javac-elements/>
258  
# Line 259 | Line 263
263            jvm="${java@{target}}"
264            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
266 >        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267 >        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268 >        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269 >        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270 >        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271          <jvmarg line="@{jvmflags}"/>
272 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
274  
275 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
275 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276          <syspropertyset id="system-properties-used-by-tck">
277            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278            <propertyref prefix="jsr166."/>
# Line 289 | Line 299
299      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>
301        <exclude name="**/SpliteratorCharacteristics.java"/>
292      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
293      <exclude name="**/GCDuringIteration.java"/>
302      </patternset>
303    </fileset>
304  
# Line 322 | Line 330
330      </condition>
331  
332      <delete dir="@{workdir}/JTwork"   quiet="true"/>
325    <delete dir="@{workdir}/JTreport" quiet="true"/>
326    <mkdir dir="@{workdir}/JTwork/scratch"/>
327    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
328    <mkdir dir="@{workdir}/JTreport/html"/>
329    <mkdir dir="@{workdir}/JTreport/text"/>
333      <jtreg dir="${jtreg@{target}.src.dir}"
334             jdk="${jdk@{target}.home}"
335 <           workDir="@{workdir}/JTwork"
333 <           reportDir="@{workdir}/JTreport">
335 >           workDir="@{workdir}/JTwork">
336        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
338 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340        <arg value="-agentvm"/>
341 +      <arg value="-noreport"/>
342        <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>
344        <arg value="-automatic"/>
# Line 389 | Line 393
393             classpath=""
394             includeAntRuntime="false"
395             includeJavaRuntime="false"
396 +           encoding="ASCII"
397             executable="${build.main.javac}"
398             fork="true">
399  
# Line 403 | Line 408
408        <compilerarg line="${build.args}"/>
409  
410      </javac>
406
407    <!-- We need jdk9's Contended annotation, but at compile time only -->
408    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
411    </target>
412  
413  
414    <target name="jar"
415            depends="compile"
416 <          description="Builds library jar from compiled sources">
417 <
416 >          description="Builds library jar for src/main from compiled sources">
417 >    <local name="subdir"/>
418 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419      <jar destfile="${product.jar}">
420 <      <fileset dir="${build.classes.dir}"/>
420 >      <fileset dir="${build.classes.dir}${subdir}"/>
421        <manifest>
422          <attribute name="Built-By" value="${user.name}"/>
423          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 432 | Line 435
435      <!-- the packagenames="none" hack below prevents scanning the -->
436      <!-- sourcepath for packages -->
437  
438 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443      <javadoc destdir="${docs.dir}"
444               packagenames="none"
445               link="${java9.api.url}"
446               overview="${src.dir}/intro.html"
447               access="${build.javadoc.access}"
448 <             sourcepath="${src.dir}:${jdk9.src.dir}"
448 >             sourcepath="${src.dir}"
449               classpath=""
450               executable="${javadoc9}">
451        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 446 | Line 454
454        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
455        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
456        <arg value="-XDignore.symbol.file=true"/>
457 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
457 >      <arg value="-Xmodule:java.base"/>
458        <arg value="-tag"/>
459        <arg value="${javadoc.jls.option}"/>
460 + <!-- @apiNote currently unused -->
461 + <!--       <arg value="-tag"/> -->
462 + <!--       <arg value="apiNote:a:API Note:"/> -->
463        <arg value="-tag"/>
464 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
454 <      <arg value="-tag"/>
455 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
456 <      <arg value="-tag"/>
457 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
458 < <!-- tags added in jdk9 -->
459 <      <arg value="-tag"/>
460 <      <arg value="revised:X"/>
464 >      <arg value="implSpec:a:Implementation Requirements:"/>
465        <arg value="-tag"/>
466 <      <arg value="spec:X"/>
466 >      <arg value="implNote:a:Implementation Note:"/>
467 > <!-- tags added in jdk9: currently unused -->
468 > <!--       <arg value="-tag"/> -->
469 > <!--       <arg value="revised:X"/> -->
470 > <!--       <arg value="-tag"/> -->
471 > <!--       <arg value="spec:X"/> -->
472      </javadoc>
473    </target>
474  
# Line 520 | Line 529
529  
530    <target name="tck"
531            depends="jar"
532 <          description="Runs tck tests for main directly">
532 >          description="Runs tck tests for src/main directly">
533  
534      <run-tck-tests
535        target="${build.main.java.version}"
# Line 529 | Line 538
538    </target>
539  
540    <target name="tck-parallelism-1"
541 <          description="Runs tck with given common pool parallelism">
541 >          description="Runs tck with common pool parallelism 1">
542      <antcall target="tck">
543        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
544      </antcall>
545    </target>
546  
547    <target name="tck-parallelism-0"
548 <          description="Runs tck with given common pool parallelism">
548 >          description="Runs tck with common pool parallelism 0">
549      <antcall target="tck">
550        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
551      </antcall>
552    </target>
553  
554 +  <target name="tck-security-manager"
555 +          description="Runs tck with a security manager">
556 +    <antcall target="tck">
557 +      <param name="jsr166.useSecurityManager" value="true"/>
558 +    </antcall>
559 +  </target>
560 +
561    <target name="jtreg"
562            depends="jar"
563 <          description="Runs jtreg tests for main using the jtreg ant task">
563 >          description="Runs jtreg tests for src/main using the jtreg ant task">
564      <run-jtreg-tests
565         target="${build.main.java.version}"
566         workdir="${build.dir}"
# Line 552 | Line 568
568    </target>
569  
570    <target name="test"
571 <          depends="tck, tck-parallelism-1, jtreg"
572 <          description="Runs tck and jtreg tests for main">
571 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
572 >          description="Runs tck and jtreg tests for src/main">
573    </target>
574  
575 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
575 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
576  
577 <    <antcall target="jtreg">
578 <      <param name="build.main.java.version" value="8"/>
579 <      <param name="build.main.javac" value="${javac8}"/>
580 <    </antcall>
577 > <!--     <antcall target="jtreg"> -->
578 > <!--       <param name="build.main.java.version" value="8"/> -->
579 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
580 > <!--     </antcall> -->
581  
582 <  </target>
582 > <!--   </target> -->
583  
584 <  <target name="test89"
585 <          description="Runs tck and jtreg tests for main for multiple java versions">
584 > <!--   <target name="test89" -->
585 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
586  
587 <    <antcall target="clean"/>
588 <    <antcall target="test">
589 <      <param name="build.main.java.version" value="8"/>
590 <      <param name="build.main.javac" value="${javac8}"/>
591 <    </antcall>
587 > <!--     <antcall target="clean"/> -->
588 > <!--     <antcall target="test"> -->
589 > <!--       <param name="build.main.java.version" value="8"/> -->
590 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
591 > <!--     </antcall> -->
592  
593 <    <antcall target="clean"/>
594 <    <antcall target="test">
595 <      <param name="build.main.java.version" value="9"/>
596 <      <param name="build.main.javac" value="${javac9}"/>
597 <    </antcall>
593 > <!--     <antcall target="clean"/> -->
594 > <!--     <antcall target="test"> -->
595 > <!--       <param name="build.main.java.version" value="9"/> -->
596 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
597 > <!--     </antcall> -->
598  
599 <  </target>
599 > <!--   </target> -->
600  
601  
602  
# Line 610 | Line 626
626    <!-- Various demos and test programs -->
627  
628  
629 <  <target name="loops" depends="configure-compiler"
630 <          description="Benchmark from Doug Lea's AQS paper">
629 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
630 >  <target name="loops" depends="configure-compiler">
631  
632      <mkdir dir="${build.loops.dir}"/>
633  
# Line 622 | Line 638
638        deprecation="${build.deprecation}"
639             source="${build.sourcelevel}"
640             target="${build.sourcelevel}"
641 +         encoding="ASCII"
642               fork="true">
643  
644        <compilerarg line="${build.args}"/>
# Line 649 | Line 666
666             deprecation="${build.deprecation}"
667             includeAntRuntime="false"
668             includeJavaRuntime="false"
669 +           encoding="ASCII"
670             executable="${javac9}"
671             fork="true">
672  
# Line 682 | Line 700
700             bootclasspath="${bootclasspath8}"
701             includeAntRuntime="false"
702             includeJavaRuntime="false"
703 +           encoding="ASCII"
704             executable="${javac8}"
705             fork="true">
706  
# Line 712 | Line 731
731             bootclasspath="${bootclasspath8}"
732             includeAntRuntime="false"
733             includeJavaRuntime="false"
734 +           encoding="ASCII"
735             executable="${javac8}"
736             fork="true">
737  
# Line 787 | Line 807
807               access="${build.javadoc.access}"
808               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809               classpath=""
810 <             executable="${javadoc8}">
810 >             executable="${javadoc8}"
811 >             failonerror = "true">
812        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
813          <include name="**/*.java"/>
814        </fileset>
# Line 795 | Line 816
816        <arg value="-XDignore.symbol.file=true"/>
817        <arg value="-tag"/>
818        <arg value="${javadoc.jls.option}"/>
819 <      <arg value="-tag"/>
820 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
819 > <!-- @apiNote currently unused -->
820 > <!--       <arg value="-tag"/> -->
821 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822        <arg value="-tag"/>
823        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824        <arg value="-tag"/>
# Line 850 | Line 872
872             bootclasspath="${bootclasspath6}"
873             includeAntRuntime="false"
874             includeJavaRuntime="false"
875 +           encoding="ASCII"
876             executable="${javac7}"
877             fork="true">
878  
# Line 880 | Line 903
903             bootclasspath="${bootclasspath6}"
904             includeAntRuntime="false"
905             includeJavaRuntime="false"
906 +           encoding="ASCII"
907             executable="${javac8}"
908             fork="true">
909  
# Line 935 | Line 959
959    </target>
960  
961  
962 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
963    <target name="4jdk7-tck-junit"
964 <          depends="4jdk7compile"
940 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
964 >          depends="4jdk7compile">
965  
966      <junit printsummary="true"
967             showoutput="true"
# Line 992 | Line 1016
1016               access="${build.javadoc.access}"
1017               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018               classpath=""
1019 <             executable="${javadoc7}">
1019 >             executable="${javadoc7}"
1020 >             failonerror = "true">
1021        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022          <include name="**/*.java"/>
1023        </fileset>
# Line 1046 | Line 1071
1071             target="5"
1072             includeAntRuntime="false"
1073             includeJavaRuntime="false"
1074 +           encoding="ASCII"
1075             executable="${javac7}"
1076             fork="true">
1077  
# Line 1087 | Line 1113
1113               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1114               bootclasspath="${bootclasspath6}"
1115               source="5"
1116 <             executable="${javadoc7}">
1116 >             executable="${javadoc7}"
1117 >             failonerror = "true">
1118        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119        <arg value="-XDignore.symbol.file=true"/>
1120  
# Line 1138 | Line 1165
1165             bootclasspath="${bootclasspath6}"
1166             includeAntRuntime="false"
1167             includeJavaRuntime="false"
1168 +           encoding="ASCII"
1169             executable="${javac7}"
1170             fork="true">
1171  
# Line 1179 | Line 1207
1207               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1208               bootclasspath="${bootclasspath6}"
1209               source="6"
1210 <             executable="${javadoc7}">
1210 >             executable="${javadoc7}"
1211 >             failonerror = "true">
1212        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213        <arg value="-XDignore.symbol.file=true"/>
1214  
# Line 1231 | Line 1260
1260             target="6"
1261             includeAntRuntime="false"
1262             includeJavaRuntime="false"
1263 +           encoding="ASCII"
1264             executable="${javac7}"
1265             fork="true">
1266  
# Line 1392 | Line 1422
1422               access="${build.javadoc.access}"
1423               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1424               source="${build.jsr166e.java.version}"
1425 <             executable="${javadoc7}">
1425 >             executable="${javadoc7}"
1426 >             failonerror = "true">
1427        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1428        <arg value="-XDignore.symbol.file=true"/>
1429  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines