[rvm-commits] jikesrvm: RVM-822 : remove build warnings concerning includeantr...

[<jik...@li...>]

details:   http://jikesrvm.hg.sourceforge.net/hgweb/jikesrvm/jikesrvm/rev/c5b02f0215e8
changeset: 10399:c5b02f0215e8
user:      Dave Grove <gr...@us...>
date:      Wed Dec 07 21:24:00 2011 -0500
description:
RVM-822 : remove build warnings concerning includeantruntime

patch from Erik Brangs


diffstat:

 build.xml                                   |  32 ++++++++++++++++------------
 build/components/specjvm.xml                |   2 +-
 build/tasks.xml                             |   2 +-
 build/testing/report2html.xsl               |   2 +-
 testing/tests/CaffeineMark/build.xml        |   2 +-
 testing/tests/basic/build.xml               |   2 +-
 testing/tests/classpath-testsuite/build.xml |  12 +++++-----
 testing/tests/gctest/build.xml              |   2 +-
 testing/tests/gctracingtest/build.xml       |   2 +-
 testing/tests/javalex/build.xml             |   2 +-
 testing/tests/jgf-threads/build.xml         |   2 +-
 testing/tests/jgf/build.xml                 |   2 +-
 testing/tests/jni/build.xml                 |   2 +-
 testing/tests/jsr166-tck/build.xml          |   2 +-
 testing/tests/mmtk/build.xml                |   4 +-
 testing/tests/opttests/build.xml            |   2 +-
 testing/tests/soot/build.xml                |   2 +-
 17 files changed, 40 insertions(+), 36 deletions(-)

diffs (truncated from 337 to 300 lines):

diff -r cd1258740580 -r c5b02f0215e8 build.xml
--- a/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -403,13 +403,13 @@
   <target name="compile-vmmagic-stub">
     <mkdir dir="${build.vmmagic-stub.classes}"/>
     <javac srcdir="${vmmagic-stub.java}" destdir="${build.vmmagic-stub.classes}" debug="true" debugLevel="lines,source"
-           source="1.5" target="1.5"/>
+           source="1.5" target="1.5" includeantruntime="false"/>
   </target>
 
   <target name="compile-options" depends="compile-vmmagic-stub">
     <mkdir dir="${build.options.classes}"/>
     <javac srcdir="${options.java}" destdir="${build.options.classes}" debug="true" debugLevel="lines,source"
-           source="1.5" target="1.5">
+           source="1.5" target="1.5" includeantruntime="false">
       <classpath>
         <pathelement location="${build.vmmagic-stub.classes}"/>
       </classpath>
@@ -421,7 +421,7 @@
     <property name="build.mmtk.classes" location="${build.dir}/mmtk/classes"/>
     <mkdir dir="${build.mmtk.classes}"/>
     <javac srcdir="${mmtk.java}" destdir="${build.mmtk.classes}" debug="true" debugLevel="lines,source" source="1.5"
-           target="1.5">
+           target="1.5" includeantruntime="false">
       <classpath>
         <pathelement location="${build.vmmagic-stub.classes}"/>
         <pathelement location="${build.options.classes}"/>
@@ -443,7 +443,7 @@
     <mkdir dir="${build.mmtk-harness.classes}"/>
     <javac srcdir="${mmtk-harness.java}:${mmtk-harness-vmmagic.java}:${mmtk-vm-harness.java}:${generated.mmtk-harness-parser.java}" 
         destdir="${build.mmtk-harness.classes}" debug="true" debugLevel="lines,source" 
-        source="1.6" target="1.6">
+        source="1.6" target="1.6" includeantruntime="false">
       <classpath>
         <pathelement location="${build.vmmagic-stub.classes}"/>
         <pathelement location="${build.mmtk.classes}"/>
@@ -929,7 +929,7 @@
           tofile="${build.ia32-assembler-opt.dir}/org/jikesrvm/compilers/common/assembler/ia32/Assembler.java"/>
 
     <javac srcdir="${build.ia32-assembler-opt.dir}" destdir="${build.ia32-assembler-opt.dir}" debug="true"
-           debugLevel="lines,source" source="1.5" target="1.5">
+           debugLevel="lines,source" source="1.5" target="1.5" includeantruntime="false">
       <src path="${ia32-assembler-opt.dir}"/>
       <classpath>
         <pathelement location="${build.vmmagic-stub.classes}"/>
@@ -1176,7 +1176,8 @@
                source="1.5"
                target="1.5"
                srcdir="${main.java}:${classlib.library-interface.common.java}:${classlib.library-interface.cpl.java}:${classlib.library-interface.non-cpl.java}:${classlib.library-interface.non-cpl2.java}:${mmtk-vm-rvm.java}:${tuningforklib.java}"
-               sourcepath="${mmtk.java}:${options.java}:${generated.java}:${generated.config.java}:${generated.arch.java}:${main.java}:${mmtk-vm-rvm.java}:${tuningforklib.java}">
+               sourcepath="${mmtk.java}:${options.java}:${generated.java}:${generated.config.java}:${generated.arch.java}:${main.java}:${mmtk-vm-rvm.java}:${tuningforklib.java}"
+               includeantruntime="false">
           <bootclasspath>
             <pathelement location="${classpath.lib.dir}/classpath.jar"/>
           </bootclasspath>
@@ -1210,7 +1211,8 @@
                source="1.5"
                target="1.5"
                srcdir="${main.java}:${classlib.library-interface.common.java}:${classlib.library-interface.non-cpl.java}:${classlib.library-interface.cpl.java}:${mmtk-vm-rvm.java}:${tuningforklib.java}"
-               sourcepath="${mmtk.java}:${options.java}:${generated.java}:${generated.config.java}:${generated.arch.java}:${main.java}:${mmtk-vm-rvm.java}:${tuningforklib.java}">
+               sourcepath="${mmtk.java}:${options.java}:${generated.java}:${generated.config.java}:${generated.arch.java}:${main.java}:${mmtk-vm-rvm.java}:${tuningforklib.java}"
+               includeantruntime="false">
           <bootclasspath>
             <pathelement location="${harmony.lib.dir}/luni-kernel-stubs.jar"/>
             <pathelement location="${harmony.lib.dir}/luni.jar"/>
@@ -1262,7 +1264,8 @@
            debugLevel="lines,source"
            source="1.5"
            target="1.5"
-           srcdir="${build.base}/syscall/java">
+           srcdir="${build.base}/syscall/java"
+           includeantruntime="false">
       <classpath>
         <pathelement location="${build.vmmagic-stub.classes}"/>
         <pathelement location="${build.classes}"/>
@@ -1273,7 +1276,7 @@
   <target name="compile-vmmagic" depends="compile">
     <mkdir dir="${build.vmmagic.classes}"/>
     <javac srcdir="${vmmagic.java}" destdir="${build.vmmagic.classes}" debug="true" debugLevel="lines,source"
-           source="1.5" target="1.5">
+           source="1.5" target="1.5" includeantruntime="false">
       <src path="${generated.vmmagic.arch.java}"/>
       <classpath>
         <pathelement location="${build.classes}"/>
@@ -1328,7 +1331,7 @@
   
   <target name="prepare-asm" depends="package,check-components-properties">
     <mkdir dir="${build.asm.classes}"/>
-    <javac srcdir="${jikesrvm.dir}/tools/asm-tasks/src" destdir="${build.asm.classes}" debug="true" classpath="${asm.jar}:${build.vm.jar}:${build.rt.jar}"/>
+    <javac srcdir="${jikesrvm.dir}/tools/asm-tasks/src" destdir="${build.asm.classes}" debug="true" classpath="${asm.jar}:${build.vm.jar}:${build.rt.jar}" includeantruntime="false"/>
  </target>
   
   <target name="gen-asm" depends="package,prepare-asm">
@@ -1435,7 +1438,7 @@
     <property name="build.bootimage-writer.dir" value="${build.base}/bootimage-writer"/>
     <mkdir dir="${build.bootimage-writer.dir}"/>
     <javac srcdir="${basedir}/tools/bootImageWriter/src" destdir="${build.bootimage-writer.dir}" debug="true"
-           debugLevel="lines,source" source="1.5" target="1.5">
+           debugLevel="lines,source" source="1.5" target="1.5" includeantruntime="false">
       <classpath>
         <pathelement location="${build.vm.jar}"/>
         <pathelement location="${build.rt.jar}"/>
@@ -2091,10 +2094,10 @@
       <fileset dir="tools" includes="**/*.java"/>
     </checkstyle>
 
-    <style in="${build.dir}/checkstyle/report.xml"
+    <xslt in="${build.dir}/checkstyle/report.xml"
            out="${build.dir}/checkstyle/report.html"
            style="${checkstyle.dir}/contrib/checkstyle-simple.xsl"/>
-    <style in="${build.dir}/checkstyle/report.xml"
+    <xslt in="${build.dir}/checkstyle/report.xml"
            out="${build.dir}/checkstyle/report.txt"
            style="build/checkstyle/text-output.xsl"/>
 
@@ -2179,7 +2182,8 @@
            debug="true"
            debugLevel="lines,source"
            source="1.5"
-           target="1.5">
+           target="1.5"
+           includeantruntime="false">
       <bootclasspath>
         <pathelement location="${classpath.lib.dir}/classpath.jar"/>
       </bootclasspath>
diff -r cd1258740580 -r c5b02f0215e8 build/components/specjvm.xml
--- a/build/components/specjvm.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/build/components/specjvm.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -14,7 +14,7 @@
 
   <import file="base.xml"/>
 
-  <property name="specjvm.version" value="1_00"/>
+  <property name="specjvm.version" value="1_01"/>
   <property name="specjvm.description" value="SPEC jvm 2008 Benchmark Suite"/>
 
   <property name="specjvm.dir" location="${components.dir}/SPECjvm2008/${specjvm.version}"/>
diff -r cd1258740580 -r c5b02f0215e8 build/tasks.xml
--- a/build/tasks.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/build/tasks.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -23,7 +23,7 @@
 
   <target name="prepare-ant-tasks">
     <mkdir dir="${tasks.classes}"/>
-    <javac srcdir="${jikesrvm.dir}/tools/ant-tasks/src" destdir="${tasks.classes}" debug="true" classpath="${ant.jar}"/>
+    <javac srcdir="${jikesrvm.dir}/tools/ant-tasks/src" destdir="${tasks.classes}" debug="true" includeantruntime="true"/>
     <!-- forEach is used in the test harness -->
     <taskdef name="forEach" classname="org.jikesrvm.tools.ant.ForEachTask" classpath="${tasks.classes}"/>
     <!-- selectRegex is used to get results from some benchmark tests -->
diff -r cd1258740580 -r c5b02f0215e8 build/testing/report2html.xsl
--- a/build/testing/report2html.xsl	Wed Dec 07 17:03:29 2011 -0500
+++ b/build/testing/report2html.xsl	Wed Dec 07 21:24:00 2011 -0500
@@ -41,7 +41,7 @@
         <xsl:variable name="total-successes" select="count(build-target/build-configuration/test-configuration/group/test/test-execution/result[text() = 'SUCCESS'])"/>
 
         <h2>Total Success Rate <xsl:value-of select="$total-successes"/>/<xsl:value-of select="$total-tests"/></h2>
-        <p>Subversion Revision: <xsl:value-of select="revision"/></p>
+        <p>Mercurial Revision: <xsl:value-of select="revision"/></p>
         <xsl:if test="($total-tests - $total-successes) != 0">
           <table class="errors">
             <tr>
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/CaffeineMark/build.xml
--- a/testing/tests/CaffeineMark/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/CaffeineMark/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -38,7 +38,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" classpath="${test.class.path}"/>
+    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" classpath="${test.class.path}" includeantruntime="false"/>
   </target>
 
   <!-- **************************************************************************** -->
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/basic/build.xml
--- a/testing/tests/basic/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/basic/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -34,7 +34,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true">
+    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false">
       <!-- need extra classpath for vmmagic -->
       <classpath>
         <pathelement path="${test.rvm.dir}/jksvm.jar"/>
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/classpath-testsuite/build.xml
--- a/testing/tests/classpath-testsuite/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/classpath-testsuite/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -35,12 +35,12 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${classpath.dir}/gnu/test" destdir="${build.classes}" debug="true" />
-    <javac srcdir="${classpath.dir}/testsuite/java.io/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" />
-    <javac srcdir="${classpath.dir}/testsuite/java.lang/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" />
-    <javac srcdir="${classpath.dir}/testsuite/java.net/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" />
-    <javac srcdir="${classpath.dir}/testsuite/java.text/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" />
-    <javac srcdir="${classpath.dir}/testsuite/java.util/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" />
+    <javac srcdir="${classpath.dir}/gnu/test" destdir="${build.classes}" debug="true" includeantruntime="false"/>
+    <javac srcdir="${classpath.dir}/testsuite/java.io/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
+    <javac srcdir="${classpath.dir}/testsuite/java.lang/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
+    <javac srcdir="${classpath.dir}/testsuite/java.net/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
+    <javac srcdir="${classpath.dir}/testsuite/java.text/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
+    <javac srcdir="${classpath.dir}/testsuite/java.util/" classpath="${test.class.path}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
   </target>
 
   <!-- **************************************************************************** -->
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/gctest/build.xml
--- a/testing/tests/gctest/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/gctest/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -55,7 +55,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true">
+    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false">
       <classpath>
         <pathelement path="${test.rvm.dir}/jksvm.jar"/>
         <pathelement path="${test.rvm.dir}/rvmrt.jar"/>
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/gctracingtest/build.xml
--- a/testing/tests/gctracingtest/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/gctracingtest/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -30,7 +30,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true"/>
+    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
   </target>
 
   <!-- **************************************************************************** -->
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/javalex/build.xml
--- a/testing/tests/javalex/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/javalex/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -33,7 +33,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${jlex.dir}" destdir="${build.classes}" debug="true"/>
+    <javac srcdir="${jlex.dir}" destdir="${build.classes}" debug="true" includeantruntime="false"/>
   </target>
 
 
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/jgf-threads/build.xml
--- a/testing/tests/jgf-threads/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/jgf-threads/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -41,7 +41,7 @@
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
     <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.4" nowarn="true"
-           sourcepath="${main.java}:${jgf-threads.dir}:${jgf-threads.dir}/section1:${jgf-threads.dir}/section2:${jgf-threads.dir}/section3"/>
+           sourcepath="${main.java}:${jgf-threads.dir}:${jgf-threads.dir}/section1:${jgf-threads.dir}/section2:${jgf-threads.dir}/section3" includeantruntime="false"/>
   </target>
 
   <!-- **************************************************************************** -->
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/jgf/build.xml
--- a/testing/tests/jgf/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/jgf/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -35,7 +35,7 @@
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
     <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.4" nowarn="true"
-           sourcepath="${main.java}:${jgf.dir}:${jgf.dir}/section1:${jgf.dir}/section2:${jgf.dir}/section3"/>
+           sourcepath="${main.java}:${jgf.dir}:${jgf.dir}/section1:${jgf.dir}/section2:${jgf.dir}/section3" includeantruntime="false"/>
   </target>
 
   <!-- **************************************************************************** -->
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/jni/build.xml
--- a/testing/tests/jni/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/jni/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -61,7 +61,7 @@
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
     <mkdir dir="${build.native}"/>
-    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true">
+    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false">
       <exclude name="StackResize.java"/>
       <exclude name="NativeThreadsWorker.java"/>
       <exclude name="tNativeThreads.java"/>
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/jsr166-tck/build.xml
--- a/testing/tests/jsr166-tck/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/jsr166-tck/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -52,7 +52,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true">
+    <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false">
       <classpath>
         <pathelement path="${junit.jar}"/>
       </classpath>
diff -r cd1258740580 -r c5b02f0215e8 testing/tests/mmtk/build.xml
--- a/testing/tests/mmtk/build.xml	Wed Dec 07 17:03:29 2011 -0500
+++ b/testing/tests/mmtk/build.xml	Wed Dec 07 21:24:00 2011 -0500
@@ -29,7 +29,7 @@
   <!-- The junit jar file, supplied by the junit component -->
   <property name="junit.version" value="4.2"/>
   <property name="junit.jar" 
-    location="${jikesrvm.dir}/components/junit/${junit.version}/junit${junit.version}/junit-${junit.version}.jar"/>