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.220 by jsr166, Sun Sep 25 01:28:54 2016 UTC vs.
Revision 1.226 by jsr166, Fri Dec 9 04:06:46 2016 UTC

# Line 63 | 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"/>
66 –  <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 253 | 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 line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
255 >      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256        <compilerarg line="${build.args}"/>
257        <javac-elements/>
258  
# Line 264 | Line 263
263            jvm="${java@{target}}"
264            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" 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"/>
# Line 329 | Line 332
332      </condition>
333  
334      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332 –    <delete dir="@{workdir}/JTreport" quiet="true"/>
335      <jtreg dir="${jtreg@{target}.src.dir}"
336             jdk="${jdk@{target}.home}"
337 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
337 >           workDir="@{workdir}/JTwork">
338        <patternset refid="jdk@{target}.jtreg.tests"/>
339        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
340 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
341 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
342        <arg value="-agentvm"/>
343 +      <arg value="-noreport"/>
344        <arg value="-verbose:${jtreg.verbose}"/>
345        <arg value="-vmoptions:-esa -ea"/>
346        <arg value="-automatic"/>
# Line 434 | Line 437
437      <!-- the packagenames="none" hack below prevents scanning the -->
438      <!-- sourcepath for packages -->
439  
440 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
441 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
441 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
442 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
443 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
444 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
445      <javadoc destdir="${docs.dir}"
446               packagenames="none"
447               link="${java9.api.url}"
# Line 455 | Line 461
461        <arg value="${javadoc.jls.option}"/>
462   <!-- @apiNote currently unused -->
463   <!--       <arg value="-tag"/> -->
464 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
464 > <!--       <arg value="apiNote:a:API Note:"/> -->
465        <arg value="-tag"/>
466 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
466 >      <arg value="implSpec:a:Implementation Requirements:"/>
467        <arg value="-tag"/>
468 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
468 >      <arg value="implNote:a:Implementation Note:"/>
469   <!-- tags added in jdk9: currently unused -->
470   <!--       <arg value="-tag"/> -->
471   <!--       <arg value="revised:X"/> -->

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines