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.212 by jsr166, Sat May 21 00:35:58 2016 UTC vs.
Revision 1.217 by jsr166, Tue Aug 30 02:41:07 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 265 | Line 265
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266          <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>
268 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
270  
271 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
271 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272          <syspropertyset id="system-properties-used-by-tck">
273            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274            <propertyref prefix="jsr166."/>
# Line 430 | Line 432
432      <!-- the packagenames="none" hack below prevents scanning the -->
433      <!-- sourcepath for packages -->
434  
435 + <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
436 + <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
437      <javadoc destdir="${docs.dir}"
438               packagenames="none"
439               link="${java9.api.url}"
440               overview="${src.dir}/intro.html"
441               access="${build.javadoc.access}"
442 <             sourcepath="${src.dir}:${jdk9.src.dir}"
442 >             sourcepath="${src.dir}"
443               classpath=""
444               executable="${javadoc9}">
445        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 444 | Line 448
448        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
449        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <arg value="-XDignore.symbol.file=true"/>
451 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
451 >      <arg value="-Xmodule:java.base"/>
452        <arg value="-tag"/>
453        <arg value="${javadoc.jls.option}"/>
454        <arg value="-tag"/>
# Line 540 | Line 544
544      </antcall>
545    </target>
546  
547 +  <target name="tck-security-manager"
548 +          description="Runs tck with a security manager">
549 +    <antcall target="tck">
550 +      <param name="jsr166.useSecurityManager" value="true"/>
551 +    </antcall>
552 +  </target>
553 +
554    <target name="jtreg"
555            depends="jar"
556            description="Runs jtreg tests for src/main using the jtreg ant task">

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines