[cvs] / jsr166 / build.xml Repository:
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.208, Sat Apr 2 16:09:42 2016 UTC revision 1.222, Mon Oct 10 04:51:19 2016 UTC
# Line 38  Line 38 
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 186  Line 186 
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <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-03 -->    <!-- 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"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# Line 245  Line 245 
245             classpath="${junit.jar}"             classpath="${junit.jar}"
246             includeAntRuntime="false"             includeAntRuntime="false"
247             includeJavaRuntime="false"             includeJavaRuntime="false"
248               encoding="ASCII"
249             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
250             fork="true">             fork="true">
251    
# Line 252  Line 253 
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256        <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 263  Line 264 
264            jvm="${java@{target}}"            jvm="${java@{target}}"
265            fork="true">            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267          <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268          <jvmarg line="@{jvmflags}"/>          <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 -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
# Line 333  Line 336 
336             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
337        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
338        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340          <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
341        <arg value="-agentvm"/>        <arg value="-agentvm"/>
342        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 389  Line 393 
393             classpath=""             classpath=""
394             includeAntRuntime="false"             includeAntRuntime="false"
395             includeJavaRuntime="false"             includeJavaRuntime="false"
396               encoding="ASCII"
397             executable="${build.main.javac}"             executable="${build.main.javac}"
398             fork="true">             fork="true">
399    
# Line 409  Line 414 
414    <target name="jar"    <target name="jar"
415            depends="compile"            depends="compile"
416            description="Builds library jar for src/main from compiled sources">            description="Builds library jar for src/main from compiled sources">
417        <local name="subdir"/>
418        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
420        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
421        <manifest>        <manifest>
422          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
423          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429  Line 435 
435      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
436      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
437    
438    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
441               packagenames="none"               packagenames="none"
442               link="${java9.api.url}"               link="${java9.api.url}"
443               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
444               access="${build.javadoc.access}"               access="${build.javadoc.access}"
445               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
446               classpath=""               classpath=""
447               executable="${javadoc9}">               executable="${javadoc9}">
448        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 443  Line 451 
451        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
452        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
454  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
455        <arg value="-tag"/>        <arg value="-tag"/>
456        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
457    <!-- @apiNote currently unused -->
458    <!--       <arg value="-tag"/> -->
459    <!--       <arg value="apiNote:a:API Note:"/> -->
460        <arg value="-tag"/>        <arg value="-tag"/>
461        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
 <!-- tags added in jdk9 -->  
       <arg value="-tag"/>  
       <arg value="revised:X"/>  
462        <arg value="-tag"/>        <arg value="-tag"/>
463        <arg value="spec:X"/>        <arg value="implNote:a:Implementation Note:"/>
464    <!-- tags added in jdk9: currently unused -->
465    <!--       <arg value="-tag"/> -->
466    <!--       <arg value="revised:X"/> -->
467    <!--       <arg value="-tag"/> -->
468    <!--       <arg value="spec:X"/> -->
469      </javadoc>      </javadoc>
470    </target>    </target>
471    
# Line 539  Line 548 
548      </antcall>      </antcall>
549    </target>    </target>
550    
551      <target name="tck-security-manager"
552              description="Runs tck with a security manager">
553        <antcall target="tck">
554          <param name="jsr166.useSecurityManager" value="true"/>
555        </antcall>
556      </target>
557    
558    <target name="jtreg"    <target name="jtreg"
559            depends="jar"            depends="jar"
560            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
# Line 619  Line 635 
635        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
636             source="${build.sourcelevel}"             source="${build.sourcelevel}"
637             target="${build.sourcelevel}"             target="${build.sourcelevel}"
638             encoding="ASCII"
639               fork="true">               fork="true">
640    
641        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 646  Line 663 
663             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
664             includeAntRuntime="false"             includeAntRuntime="false"
665             includeJavaRuntime="false"             includeJavaRuntime="false"
666               encoding="ASCII"
667             executable="${javac9}"             executable="${javac9}"
668             fork="true">             fork="true">
669    
# Line 679  Line 697 
697             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
698             includeAntRuntime="false"             includeAntRuntime="false"
699             includeJavaRuntime="false"             includeJavaRuntime="false"
700               encoding="ASCII"
701             executable="${javac8}"             executable="${javac8}"
702             fork="true">             fork="true">
703    
# Line 709  Line 728 
728             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
729             includeAntRuntime="false"             includeAntRuntime="false"
730             includeJavaRuntime="false"             includeJavaRuntime="false"
731               encoding="ASCII"
732             executable="${javac8}"             executable="${javac8}"
733             fork="true">             fork="true">
734    
# Line 793  Line 813 
813        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
814        <arg value="-tag"/>        <arg value="-tag"/>
815        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
816        <arg value="-tag"/>  <!-- @apiNote currently unused -->
817        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
818    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
819        <arg value="-tag"/>        <arg value="-tag"/>
820        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
821        <arg value="-tag"/>        <arg value="-tag"/>
# Line 848  Line 869 
869             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
870             includeAntRuntime="false"             includeAntRuntime="false"
871             includeJavaRuntime="false"             includeJavaRuntime="false"
872               encoding="ASCII"
873             executable="${javac7}"             executable="${javac7}"
874             fork="true">             fork="true">
875    
# Line 878  Line 900 
900             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
901             includeAntRuntime="false"             includeAntRuntime="false"
902             includeJavaRuntime="false"             includeJavaRuntime="false"
903               encoding="ASCII"
904             executable="${javac8}"             executable="${javac8}"
905             fork="true">             fork="true">
906    
# Line 1045  Line 1068 
1068             target="5"             target="5"
1069             includeAntRuntime="false"             includeAntRuntime="false"
1070             includeJavaRuntime="false"             includeJavaRuntime="false"
1071               encoding="ASCII"
1072             executable="${javac7}"             executable="${javac7}"
1073             fork="true">             fork="true">
1074    
# Line 1138  Line 1162 
1162             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1163             includeAntRuntime="false"             includeAntRuntime="false"
1164             includeJavaRuntime="false"             includeJavaRuntime="false"
1165               encoding="ASCII"
1166             executable="${javac7}"             executable="${javac7}"
1167             fork="true">             fork="true">
1168    
# Line 1232  Line 1257 
1257             target="6"             target="6"
1258             includeAntRuntime="false"             includeAntRuntime="false"
1259             includeJavaRuntime="false"             includeJavaRuntime="false"
1260               encoding="ASCII"
1261             executable="${javac7}"             executable="${javac7}"
1262             fork="true">             fork="true">
1263    

Legend:
Removed from v.1.208  
changed lines
  Added in v.1.222

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8