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

Diff of /jsr166/build.xml

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

revision 1.213 by jsr166, Sat Jun 4 23:49:29 2016 UTC revision 1.224 by jsr166, Thu Nov 24 01:58:04 2016 UTC
# Line 63  Line 63 
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
66    
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 188  Line 187 
187    <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"/>
188    <!-- The expected canonical location does not yet exist as of 2016-04 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <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"/> -->
190    <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193    
# Line 245  Line 244 
244             classpath="${junit.jar}"             classpath="${junit.jar}"
245             includeAntRuntime="false"             includeAntRuntime="false"
246             includeJavaRuntime="false"             includeJavaRuntime="false"
247               encoding="ASCII"
248             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
249             fork="true">             fork="true">
250    
# Line 252  Line 252 
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255        <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 263  Line 263 
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266          <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>          <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <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 -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
273            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
# Line 326  Line 328 
328      </condition>      </condition>
329    
330      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
331      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
332             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
333             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
334        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336        <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
337          <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
338        <arg value="-agentvm"/>        <arg value="-agentvm"/>
339          <arg value="-noreport"/>
340        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
341        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
342        <arg value="-automatic"/>        <arg value="-automatic"/>
# Line 389  Line 391 
391             classpath=""             classpath=""
392             includeAntRuntime="false"             includeAntRuntime="false"
393             includeJavaRuntime="false"             includeJavaRuntime="false"
394               encoding="ASCII"
395             executable="${build.main.javac}"             executable="${build.main.javac}"
396             fork="true">             fork="true">
397    
# Line 430  Line 433 
433      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
434      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
435    
436    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
437    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
438      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
439               packagenames="none"               packagenames="none"
440               link="${java9.api.url}"               link="${java9.api.url}"
441               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
442               access="${build.javadoc.access}"               access="${build.javadoc.access}"
443               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
444               classpath=""               classpath=""
445               executable="${javadoc9}">               executable="${javadoc9}">
446        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 444  Line 449 
449        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
450        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
451        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
452  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
453        <arg value="-tag"/>        <arg value="-tag"/>
454        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
455    <!-- @apiNote currently unused -->
456    <!--       <arg value="-tag"/> -->
457    <!--       <arg value="apiNote:a:API Note:"/> -->
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
460        <arg value="-tag"/>        <arg value="-tag"/>
461        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
462        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
463        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
464  <!-- tags added in jdk9 -->  <!--       <arg value="revised:X"/> -->
465        <arg value="-tag"/>  <!--       <arg value="-tag"/> -->
466        <arg value="revised:X"/>  <!--       <arg value="spec:X"/> -->
       <arg value="-tag"/>  
       <arg value="spec:X"/>  
467      </javadoc>      </javadoc>
468    </target>    </target>
469    
# Line 627  Line 633 
633        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
634             source="${build.sourcelevel}"             source="${build.sourcelevel}"
635             target="${build.sourcelevel}"             target="${build.sourcelevel}"
636             encoding="ASCII"
637               fork="true">               fork="true">
638    
639        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 654  Line 661 
661             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
662             includeAntRuntime="false"             includeAntRuntime="false"
663             includeJavaRuntime="false"             includeJavaRuntime="false"
664               encoding="ASCII"
665             executable="${javac9}"             executable="${javac9}"
666             fork="true">             fork="true">
667    
# Line 687  Line 695 
695             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
696             includeAntRuntime="false"             includeAntRuntime="false"
697             includeJavaRuntime="false"             includeJavaRuntime="false"
698               encoding="ASCII"
699             executable="${javac8}"             executable="${javac8}"
700             fork="true">             fork="true">
701    
# Line 717  Line 726 
726             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
727             includeAntRuntime="false"             includeAntRuntime="false"
728             includeJavaRuntime="false"             includeJavaRuntime="false"
729               encoding="ASCII"
730             executable="${javac8}"             executable="${javac8}"
731             fork="true">             fork="true">
732    
# Line 801  Line 811 
811        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
812        <arg value="-tag"/>        <arg value="-tag"/>
813        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
814        <arg value="-tag"/>  <!-- @apiNote currently unused -->
815        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
816    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
817        <arg value="-tag"/>        <arg value="-tag"/>
818        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
819        <arg value="-tag"/>        <arg value="-tag"/>
# Line 856  Line 867 
867             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
868             includeAntRuntime="false"             includeAntRuntime="false"
869             includeJavaRuntime="false"             includeJavaRuntime="false"
870               encoding="ASCII"
871             executable="${javac7}"             executable="${javac7}"
872             fork="true">             fork="true">
873    
# Line 886  Line 898 
898             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
899             includeAntRuntime="false"             includeAntRuntime="false"
900             includeJavaRuntime="false"             includeJavaRuntime="false"
901               encoding="ASCII"
902             executable="${javac8}"             executable="${javac8}"
903             fork="true">             fork="true">
904    
# Line 1053  Line 1066 
1066             target="5"             target="5"
1067             includeAntRuntime="false"             includeAntRuntime="false"
1068             includeJavaRuntime="false"             includeJavaRuntime="false"
1069               encoding="ASCII"
1070             executable="${javac7}"             executable="${javac7}"
1071             fork="true">             fork="true">
1072    
# Line 1146  Line 1160 
1160             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1161             includeAntRuntime="false"             includeAntRuntime="false"
1162             includeJavaRuntime="false"             includeJavaRuntime="false"
1163               encoding="ASCII"
1164             executable="${javac7}"             executable="${javac7}"
1165             fork="true">             fork="true">
1166    
# Line 1240  Line 1255 
1255             target="6"             target="6"
1256             includeAntRuntime="false"             includeAntRuntime="false"
1257             includeJavaRuntime="false"             includeJavaRuntime="false"
1258               encoding="ASCII"
1259             executable="${javac7}"             executable="${javac7}"
1260             fork="true">             fork="true">
1261    

Legend:
Removed from v.1.213  
changed lines
  Added in v.1.224

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27