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.228 by jsr166, Sat Dec 17 22:28:20 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 295 | Line 298
298    <fileset dir="${jtreg8.src.dir}">
299      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>
298 –      <exclude name="**/SpliteratorCharacteristics.java"/>
299 –      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300 –      <exclude name="**/GCDuringIteration.java"/>
301      </patternset>
302    </fileset>
303  
# Line 329 | Line 329
329      </condition>
330  
331      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332 –    <delete dir="@{workdir}/JTreport" quiet="true"/>
332      <jtreg dir="${jtreg@{target}.src.dir}"
333             jdk="${jdk@{target}.home}"
334 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
334 >           workDir="@{workdir}/JTwork">
335        <patternset refid="jdk@{target}.jtreg.tests"/>
336        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
337 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
337 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
338 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339        <arg value="-agentvm"/>
340 +      <arg value="-noreport"/>
341        <arg value="-verbose:${jtreg.verbose}"/>
342        <arg value="-vmoptions:-esa -ea"/>
343        <arg value="-automatic"/>
# Line 434 | Line 434
434      <!-- the packagenames="none" hack below prevents scanning the -->
435      <!-- sourcepath for packages -->
436  
437 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
437 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
440 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
441 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
442      <javadoc destdir="${docs.dir}"
443               packagenames="none"
444               link="${java9.api.url}"
# Line 455 | Line 458
458        <arg value="${javadoc.jls.option}"/>
459   <!-- @apiNote currently unused -->
460   <!--       <arg value="-tag"/> -->
461 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
461 > <!--       <arg value="apiNote:a:API Note:"/> -->
462        <arg value="-tag"/>
463 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
463 >      <arg value="implSpec:a:Implementation Requirements:"/>
464        <arg value="-tag"/>
465 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
465 >      <arg value="implNote:a:Implementation Note:"/>
466   <!-- tags added in jdk9: currently unused -->
467   <!--       <arg value="-tag"/> -->
468   <!--       <arg value="revised:X"/> -->

Diff Legend

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