27 |
|
(e.g. mercurial forest) or a symlink to same. |
28 |
|
|
29 |
|
Alternatively, define ant variables thus: |
30 |
< |
ant -Djdk$N.home=... |
30 |
> |
ant -Djdk$N.home=... -Djdk$N.src.home=... |
31 |
|
for $N in 6 7 8 9 ... |
32 |
|
|
33 |
|
As of 2015-09, there is incomplete hacky support for jigsaw |
34 |
|
Build for jigsaw using something like: |
35 |
< |
ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist |
35 |
> |
ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist |
36 |
|
"docs" target is still broken. |
37 |
|
------------------------------------------------------------------------------ |
38 |
|
</description> |
85 |
|
<macrodef name="defjdklocations"> |
86 |
|
<attribute name="v"/> |
87 |
|
<sequential> |
88 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
89 |
< |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
90 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
91 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
88 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
89 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
90 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
91 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
92 |
> |
<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/> |
93 |
|
<local name="have.java.base"/> |
94 |
|
<available property="have.java.base" |
95 |
< |
file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/> |
96 |
< |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" |
95 |
> |
file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/> |
96 |
> |
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" |
97 |
|
if:set="have.java.base"/> |
98 |
< |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes" |
98 |
> |
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
99 |
|
unless:set="have.java.base"/> |
100 |
|
<local name="modules"/> |
101 |
|
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
239 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
240 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
241 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
242 |
< |
<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
242 |
> |
<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
243 |
|
<compilerarg line="${build.args}"/> |
244 |
|
<javac-elements/> |
245 |
|
|
250 |
|
jvm="${java@{target}}" |
251 |
|
fork="true"> |
252 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
253 |
< |
<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
253 |
> |
<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
254 |
|
<jvmarg line="@{jvmflags}"/> |
255 |
|
|
256 |
|
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
257 |
|
<syspropertyset id="system-properties-used-by-tck"> |
258 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
259 |
|
<propertyref prefix="jsr166."/> |
260 |
+ |
<propertyref name="test.timeout.factor"/> |
261 |
|
</syspropertyset> |
262 |
|
|
263 |
|
<classpath> |
291 |
|
</patternset> |
292 |
|
</fileset> |
293 |
|
|
294 |
+ |
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
295 |
+ |
<property name="jtreg.flags" value=""/> |
296 |
+ |
|
297 |
|
<macrodef name="run-jtreg-tests"> |
298 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
299 |
|
<attribute name="source" default="7"/> |
324 |
|
reportDir="@{workdir}/JTreport"> |
325 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
326 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
327 |
< |
<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
327 |
> |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
328 |
|
<arg value="-agentvm"/> |
329 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
330 |
|
<arg value="-vmoptions:-esa -ea"/> |
331 |
|
<arg value="-automatic"/> |
332 |
|
<arg value="-k:!ignore"/> |
333 |
|
<arg line="@{jtregflags}"/> |
334 |
+ |
<arg line="${jtreg.flags}"/> |
335 |
|
</jtreg> |
336 |
|
</sequential> |
337 |
|
</macrodef> |
394 |
|
<compilerarg line="${build.args}"/> |
395 |
|
|
396 |
|
</javac> |
397 |
+ |
|
398 |
+ |
<!-- We need jdk9's Contended annotation, but at compile time only --> |
399 |
+ |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
400 |
|
</target> |
401 |
|
|
402 |
|
|
428 |
|
link="${java9.api.url}" |
429 |
|
overview="${src.dir}/intro.html" |
430 |
|
access="${build.javadoc.access}" |
431 |
< |
sourcepath="${src.dir}:${jdk9src.dir}" |
431 |
> |
sourcepath="${src.dir}:${jdk9.src.dir}" |
432 |
|
classpath="" |
433 |
|
executable="${javadoc9}"> |
434 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
446 |
|
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
447 |
|
<arg value="-tag"/> |
448 |
|
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
449 |
+ |
<!-- tags added in jdk9 --> |
450 |
+ |
<arg value="-tag"/> |
451 |
+ |
<arg value="revised:X"/> |
452 |
+ |
<arg value="-tag"/> |
453 |
+ |
<arg value="spec:X"/> |
454 |
|
</javadoc> |
455 |
|
</target> |
456 |
|
|
813 |
|
link="${java7.api.url}" |
814 |
|
overview="${4jdk7src.dir}/intro.html" |
815 |
|
access="${build.javadoc.access}" |
816 |
< |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
816 |
> |
sourcepath="${4jdk7src.dir}:${jdk7.src.dir}" |
817 |
|
classpath="" |
818 |
|
executable="${javadoc7}"> |
819 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
907 |
|
packagenames="jsr166x.*" |
908 |
|
link="${java.api.url}" |
909 |
|
access="${build.javadoc.access}" |
910 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
910 |
> |
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
911 |
|
bootclasspath="${bootclasspath6}" |
912 |
|
source="5" |
913 |
|
executable="${javadoc7}"> |
999 |
|
packagenames="jsr166y.*" |
1000 |
|
link="${java.api.url}" |
1001 |
|
access="${build.javadoc.access}" |
1002 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1002 |
> |
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1003 |
|
bootclasspath="${bootclasspath6}" |
1004 |
|
source="6" |
1005 |
|
executable="${javadoc7}"> |
1092 |
|
packagenames="extra166y.*" |
1093 |
|
link="${java.api.url}" |
1094 |
|
access="${build.javadoc.access}" |
1095 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1095 |
> |
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1096 |
|
bootclasspath="${bootclasspath6}" |
1097 |
|
source="6" |
1098 |
|
executable="${javadoc7}"> |
1213 |
|
packagenames="jsr166e.*" |
1214 |
|
link="${java.api.url}" |
1215 |
|
access="${build.javadoc.access}" |
1216 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1216 |
> |
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1217 |
|
source="${build.jsr166e.java.version}" |
1218 |
|
executable="${javadoc7}"> |
1219 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |