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.210 by jsr166, Mon Apr 18 15:30:49 2016 UTC vs.
Revision 1.223 by jsr166, Thu Nov 24 01:53:50 2016 UTC

# Line 188 | Line 188
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191 <  <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
191 >  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194  
# Line 245 | Line 245
245             classpath="${junit.jar}"
246             includeAntRuntime="false"
247             includeJavaRuntime="false"
248 +           encoding="ASCII"
249             executable="${javac@{compile-target}}"
250             fork="true">
251  
# Line 252 | Line 253
253        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
256 >      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257        <compilerarg line="${build.args}"/>
258        <javac-elements/>
259  
# Line 263 | Line 264
264            jvm="${java@{target}}"
265            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
267 >        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268          <jvmarg line="@{jvmflags}"/>
269 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
271  
272 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273          <syspropertyset id="system-properties-used-by-tck">
274            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275            <propertyref prefix="jsr166."/>
# Line 326 | Line 329
329      </condition>
330  
331      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329 –    <delete dir="@{workdir}/JTreport" quiet="true"/>
332      <jtreg dir="${jtreg@{target}.src.dir}"
333             jdk="${jdk@{target}.home}"
334 <           workDir="@{workdir}/JTwork"
333 <           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="-Xpatch:${build.classes.dir}" if:set="modules"/>
337 >      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
338 >      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" 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 389 | Line 392
392             classpath=""
393             includeAntRuntime="false"
394             includeJavaRuntime="false"
395 +           encoding="ASCII"
396             executable="${build.main.javac}"
397             fork="true">
398  
# Line 409 | Line 413
413    <target name="jar"
414            depends="compile"
415            description="Builds library jar for src/main from compiled sources">
416 <
416 >    <local name="subdir"/>
417 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418      <jar destfile="${product.jar}">
419 <      <fileset dir="${build.classes.dir}"/>
419 >      <fileset dir="${build.classes.dir}${subdir}"/>
420        <manifest>
421          <attribute name="Built-By" value="${user.name}"/>
422          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429 | 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" -->
439      <javadoc destdir="${docs.dir}"
440               packagenames="none"
441               link="${java9.api.url}"
442               overview="${src.dir}/intro.html"
443               access="${build.javadoc.access}"
444 <             sourcepath="${src.dir}:${jdk9.src.dir}"
444 >             sourcepath="${src.dir}"
445               classpath=""
446               executable="${javadoc9}">
447        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 443 | Line 450
450        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
451        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
452        <arg value="-XDignore.symbol.file=true"/>
453 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
453 >      <arg value="-Xmodule:java.base"/>
454        <arg value="-tag"/>
455        <arg value="${javadoc.jls.option}"/>
456 + <!-- @apiNote currently unused -->
457 + <!--       <arg value="-tag"/> -->
458 + <!--       <arg value="apiNote:a:API Note:"/> -->
459        <arg value="-tag"/>
460 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
451 <      <arg value="-tag"/>
452 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
453 <      <arg value="-tag"/>
454 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
455 < <!-- tags added in jdk9 -->
456 <      <arg value="-tag"/>
457 <      <arg value="revised:X"/>
460 >      <arg value="implSpec:a:Implementation Requirements:"/>
461        <arg value="-tag"/>
462 <      <arg value="spec:X"/>
462 >      <arg value="implNote:a:Implementation Note:"/>
463 > <!-- tags added in jdk9: currently unused -->
464 > <!--       <arg value="-tag"/> -->
465 > <!--       <arg value="revised:X"/> -->
466 > <!--       <arg value="-tag"/> -->
467 > <!--       <arg value="spec:X"/> -->
468      </javadoc>
469    </target>
470  
# Line 539 | Line 547
547      </antcall>
548    </target>
549  
550 +  <target name="tck-security-manager"
551 +          description="Runs tck with a security manager">
552 +    <antcall target="tck">
553 +      <param name="jsr166.useSecurityManager" value="true"/>
554 +    </antcall>
555 +  </target>
556 +
557    <target name="jtreg"
558            depends="jar"
559            description="Runs jtreg tests for src/main using the jtreg ant task">
# Line 619 | Line 634
634        deprecation="${build.deprecation}"
635             source="${build.sourcelevel}"
636             target="${build.sourcelevel}"
637 +         encoding="ASCII"
638               fork="true">
639  
640        <compilerarg line="${build.args}"/>
# Line 646 | Line 662
662             deprecation="${build.deprecation}"
663             includeAntRuntime="false"
664             includeJavaRuntime="false"
665 +           encoding="ASCII"
666             executable="${javac9}"
667             fork="true">
668  
# Line 679 | Line 696
696             bootclasspath="${bootclasspath8}"
697             includeAntRuntime="false"
698             includeJavaRuntime="false"
699 +           encoding="ASCII"
700             executable="${javac8}"
701             fork="true">
702  
# Line 709 | Line 727
727             bootclasspath="${bootclasspath8}"
728             includeAntRuntime="false"
729             includeJavaRuntime="false"
730 +           encoding="ASCII"
731             executable="${javac8}"
732             fork="true">
733  
# Line 793 | Line 812
812        <arg value="-XDignore.symbol.file=true"/>
813        <arg value="-tag"/>
814        <arg value="${javadoc.jls.option}"/>
815 <      <arg value="-tag"/>
816 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
815 > <!-- @apiNote currently unused -->
816 > <!--       <arg value="-tag"/> -->
817 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
818        <arg value="-tag"/>
819        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
820        <arg value="-tag"/>
# Line 848 | Line 868
868             bootclasspath="${bootclasspath6}"
869             includeAntRuntime="false"
870             includeJavaRuntime="false"
871 +           encoding="ASCII"
872             executable="${javac7}"
873             fork="true">
874  
# Line 878 | Line 899
899             bootclasspath="${bootclasspath6}"
900             includeAntRuntime="false"
901             includeJavaRuntime="false"
902 +           encoding="ASCII"
903             executable="${javac8}"
904             fork="true">
905  
# Line 1045 | Line 1067
1067             target="5"
1068             includeAntRuntime="false"
1069             includeJavaRuntime="false"
1070 +           encoding="ASCII"
1071             executable="${javac7}"
1072             fork="true">
1073  
# Line 1138 | Line 1161
1161             bootclasspath="${bootclasspath6}"
1162             includeAntRuntime="false"
1163             includeJavaRuntime="false"
1164 +           encoding="ASCII"
1165             executable="${javac7}"
1166             fork="true">
1167  
# Line 1232 | Line 1256
1256             target="6"
1257             includeAntRuntime="false"
1258             includeJavaRuntime="false"
1259 +           encoding="ASCII"
1260             executable="${javac7}"
1261             fork="true">
1262  

Diff Legend

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