/[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.219 by jsr166, Sat Sep 17 21:02:01 2016 UTC
# 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:java.base=${build.classes.dir}/java.base" 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:java.base=${build.classes.dir}/java.base" 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 -->          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270          <jvmarg line="${vmoptions}" if:set="vmoptions"/>          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 335  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="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
342        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 391  Line 392 
392             classpath=""             classpath=""
393             includeAntRuntime="false"             includeAntRuntime="false"
394             includeJavaRuntime="false"             includeJavaRuntime="false"
395               encoding="ASCII"
396             executable="${build.main.javac}"             executable="${build.main.javac}"
397             fork="true">             fork="true">
398    
# Line 432  Line 434 
434      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
435      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
436    
437  <!--  TODO:       sourcepath="${src.dir}:${jdk9.src.dir}" -->  <!--  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}"      <javadoc destdir="${docs.dir}"
440               packagenames="none"               packagenames="none"
441               link="${java9.api.url}"               link="${java9.api.url}"
# Line 630  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 657  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 690  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 720  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 859  Line 866 
866             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
867             includeAntRuntime="false"             includeAntRuntime="false"
868             includeJavaRuntime="false"             includeJavaRuntime="false"
869               encoding="ASCII"
870             executable="${javac7}"             executable="${javac7}"
871             fork="true">             fork="true">
872    
# Line 889  Line 897 
897             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
898             includeAntRuntime="false"             includeAntRuntime="false"
899             includeJavaRuntime="false"             includeJavaRuntime="false"
900               encoding="ASCII"
901             executable="${javac8}"             executable="${javac8}"
902             fork="true">             fork="true">
903    
# Line 1056  Line 1065 
1065             target="5"             target="5"
1066             includeAntRuntime="false"             includeAntRuntime="false"
1067             includeJavaRuntime="false"             includeJavaRuntime="false"
1068               encoding="ASCII"
1069             executable="${javac7}"             executable="${javac7}"
1070             fork="true">             fork="true">
1071    
# Line 1149  Line 1159 
1159             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1160             includeAntRuntime="false"             includeAntRuntime="false"
1161             includeJavaRuntime="false"             includeJavaRuntime="false"
1162               encoding="ASCII"
1163             executable="${javac7}"             executable="${javac7}"
1164             fork="true">             fork="true">
1165    
# Line 1243  Line 1254 
1254             target="6"             target="6"
1255             includeAntRuntime="false"             includeAntRuntime="false"
1256             includeJavaRuntime="false"             includeJavaRuntime="false"
1257               encoding="ASCII"
1258             executable="${javac7}"             executable="${javac7}"
1259             fork="true">             fork="true">
1260    

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

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