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

Diff of /jsr166/build.xml

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

revision 1.216 by jsr166, Tue Aug 30 00:01:22 2016 UTC revision 1.227 by jsr166, Sat Dec 17 22:18:25 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 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=@{classes}" 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=@{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}"/>          <jvmarg line="@{jvmflags}"/>
272          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273          <jvmarg line="${vmoptions}" if:set="vmoptions"/>          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 295  Line 299 
299      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>        <include name="**/*.java"/>
301        <exclude name="**/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
302      </patternset>      </patternset>
303    </fileset>    </fileset>
304    
# Line 328  Line 330 
330      </condition>      </condition>
331    
332      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
333      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
334             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
335             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
336        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338        <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341          <arg value="-noreport"/>
342        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
344        <arg value="-automatic"/>        <arg value="-automatic"/>
# Line 391  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 432  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}" -->  <!-- 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    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
444               packagenames="none"               packagenames="none"
445               link="${java9.api.url}"               link="${java9.api.url}"
# Line 450  Line 457 
457        <arg value="-Xmodule:java.base"/>        <arg value="-Xmodule:java.base"/>
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
460    <!-- @apiNote currently unused -->
461    <!--       <arg value="-tag"/> -->
462    <!--       <arg value="apiNote:a:API Note:"/> -->
463        <arg value="-tag"/>        <arg value="-tag"/>
464        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
465        <arg value="-tag"/>        <arg value="-tag"/>
466        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
467        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
468        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
469  <!-- tags added in jdk9 -->  <!--       <arg value="revised:X"/> -->
470        <arg value="-tag"/>  <!--       <arg value="-tag"/> -->
471        <arg value="revised:X"/>  <!--       <arg value="spec:X"/> -->
       <arg value="-tag"/>  
       <arg value="spec:X"/>  
472      </javadoc>      </javadoc>
473    </target>    </target>
474    
# Line 630  Line 638 
638        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
639             source="${build.sourcelevel}"             source="${build.sourcelevel}"
640             target="${build.sourcelevel}"             target="${build.sourcelevel}"
641             encoding="ASCII"
642               fork="true">               fork="true">
643    
644        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 657  Line 666 
666             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
667             includeAntRuntime="false"             includeAntRuntime="false"
668             includeJavaRuntime="false"             includeJavaRuntime="false"
669               encoding="ASCII"
670             executable="${javac9}"             executable="${javac9}"
671             fork="true">             fork="true">
672    
# Line 690  Line 700 
700             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
701             includeAntRuntime="false"             includeAntRuntime="false"
702             includeJavaRuntime="false"             includeJavaRuntime="false"
703               encoding="ASCII"
704             executable="${javac8}"             executable="${javac8}"
705             fork="true">             fork="true">
706    
# Line 720  Line 731 
731             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
732             includeAntRuntime="false"             includeAntRuntime="false"
733             includeJavaRuntime="false"             includeJavaRuntime="false"
734               encoding="ASCII"
735             executable="${javac8}"             executable="${javac8}"
736             fork="true">             fork="true">
737    
# Line 804  Line 816 
816        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
817        <arg value="-tag"/>        <arg value="-tag"/>
818        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
819        <arg value="-tag"/>  <!-- @apiNote currently unused -->
820        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
821    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822        <arg value="-tag"/>        <arg value="-tag"/>
823        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824        <arg value="-tag"/>        <arg value="-tag"/>
# Line 859  Line 872 
872             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
873             includeAntRuntime="false"             includeAntRuntime="false"
874             includeJavaRuntime="false"             includeJavaRuntime="false"
875               encoding="ASCII"
876             executable="${javac7}"             executable="${javac7}"
877             fork="true">             fork="true">
878    
# Line 889  Line 903 
903             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
904             includeAntRuntime="false"             includeAntRuntime="false"
905             includeJavaRuntime="false"             includeJavaRuntime="false"
906               encoding="ASCII"
907             executable="${javac8}"             executable="${javac8}"
908             fork="true">             fork="true">
909    
# Line 1056  Line 1071 
1071             target="5"             target="5"
1072             includeAntRuntime="false"             includeAntRuntime="false"
1073             includeJavaRuntime="false"             includeJavaRuntime="false"
1074               encoding="ASCII"
1075             executable="${javac7}"             executable="${javac7}"
1076             fork="true">             fork="true">
1077    
# Line 1149  Line 1165 
1165             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1166             includeAntRuntime="false"             includeAntRuntime="false"
1167             includeJavaRuntime="false"             includeJavaRuntime="false"
1168               encoding="ASCII"
1169             executable="${javac7}"             executable="${javac7}"
1170             fork="true">             fork="true">
1171    
# Line 1243  Line 1260 
1260             target="6"             target="6"
1261             includeAntRuntime="false"             includeAntRuntime="false"
1262             includeJavaRuntime="false"             includeJavaRuntime="false"
1263               encoding="ASCII"
1264             executable="${javac7}"             executable="${javac7}"
1265             fork="true">             fork="true">
1266    

Legend:
Removed from v.1.216  
changed lines
  Added in v.1.227

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