29 |
|
Alternatively, define ant variables thus: |
30 |
|
ant -Djdk$N.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 |
36 |
+ |
"docs" target is still broken. |
37 |
|
------------------------------------------------------------------------------ |
38 |
|
</description> |
39 |
|
|
107 |
|
if:set="have.java.base"/> |
108 |
|
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes" |
109 |
|
unless:set="have.java.base"/> |
110 |
+ |
<local name="modules"/> |
111 |
+ |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
112 |
|
<local name="boot.jar.dir"/> |
113 |
< |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
114 |
< |
<path id="bootclasspath@{v}"> |
113 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
114 |
> |
<path id="bootclasspath@{v}" unless:set="modules"> |
115 |
|
<pathelement path="${boot.jar.dir}/resources.jar"/> |
116 |
|
<pathelement path="${boot.jar.dir}/rt.jar"/> |
117 |
|
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
118 |
|
<pathelement path="${boot.jar.dir}/jce.jar"/> |
119 |
|
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
120 |
|
</path> |
121 |
< |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
121 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/> |
122 |
|
</sequential> |
123 |
|
</macrodef> |
124 |
|
|
219 |
|
<attribute name="classes"/> |
220 |
|
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
221 |
|
<element name="javac-elements" optional="true"/> |
222 |
+ |
|
223 |
|
<sequential> |
224 |
|
|
225 |
+ |
<local name="modules"/> |
226 |
+ |
<condition property="modules"> |
227 |
+ |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
228 |
+ |
</condition> |
229 |
+ |
|
230 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
231 |
|
|
232 |
|
<javac srcdir="@{tck.src.dir}" |
245 |
|
<include name="*.java"/> |
246 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
247 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
248 |
< |
<compilerarg value="-Xbootclasspath/p:@{classes}"/> |
248 |
> |
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
249 |
> |
<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
250 |
|
<compilerarg line="${build.args}"/> |
251 |
|
<javac-elements/> |
252 |
|
|
256 |
|
failonerror="true" |
257 |
|
jvm="${java@{target}}" |
258 |
|
fork="true"> |
259 |
< |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
259 |
> |
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
260 |
> |
<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
261 |
|
<jvmarg line="@{jvmflags}"/> |
262 |
|
|
263 |
|
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
306 |
|
<attribute name="workdir"/> |
307 |
|
<attribute name="classes"/> |
308 |
|
<attribute name="jtregflags" default=""/> |
309 |
+ |
|
310 |
|
<sequential> |
311 |
+ |
|
312 |
+ |
<local name="modules"/> |
313 |
+ |
<condition property="modules"> |
314 |
+ |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
315 |
+ |
</condition> |
316 |
+ |
|
317 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
318 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
319 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
323 |
|
workDir="@{workdir}/JTwork" |
324 |
|
reportDir="@{workdir}/JTreport"> |
325 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
326 |
< |
<arg value="-Xbootclasspath/p:@{classes}"/> |
326 |
> |
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
327 |
> |
<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
328 |
|
<arg value="-agentvm"/> |
329 |
|
<arg value="-v:nopass,fail"/> |
330 |
|
<arg value="-vmoptions:-esa -ea"/> |
357 |
|
depends="configure-compiler" |
358 |
|
description="Compiles src/main sources to build dir"> |
359 |
|
|
360 |
< |
<mkdir dir="${build.classes.dir}"/> |
360 |
> |
<local name="modules"/> |
361 |
> |
<condition property="modules"> |
362 |
> |
<and> |
363 |
> |
<available file="${jdk9.home}/jmods" type="dir"/> |
364 |
> |
<equals arg1="9" arg2="${build.main.java.version}"/> |
365 |
> |
</and> |
366 |
> |
</condition> |
367 |
> |
|
368 |
> |
<local name="destdir"/> |
369 |
> |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
370 |
> |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
371 |
> |
|
372 |
> |
<mkdir dir="${destdir}"/> |
373 |
|
|
374 |
|
<javac srcdir="${src.dir}" |
375 |
< |
destdir="${build.classes.dir}" |
375 |
> |
destdir="${destdir}" |
376 |
|
debug="${build.debug}" |
377 |
|
debuglevel="${build.debuglevel}" |
378 |
|
deprecation="${build.deprecation}" |
383 |
|
fork="true"> |
384 |
|
|
385 |
|
<include name="**/*.java"/> |
386 |
+ |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
387 |
|
<compilerarg value="-Xprefer:source"/> |
388 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
389 |
|
<compilerarg value="-Xlint:all"/> |
433 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
434 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
435 |
|
<arg value="-XDignore.symbol.file=true"/> |
436 |
+ |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
437 |
|
<arg value="-tag"/> |
438 |
|
<arg value="${javadoc.jls.option}"/> |
439 |
|
<arg value="-tag"/> |