From 6457f765b34dbf30a3632d0c01e101d4ab1b1f70 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Mon, 21 Mar 2011 21:39:45 +0100
Subject: [PATCH] Do not include ant runtime in classpath (avoids compilation
 warning with Ant 1.8+)

---
 tools/coffee-manager/build.xml                         | 2 +-
 tools/cooja/apps/avrora/build.xml                      | 3 ++-
 tools/cooja/apps/mrm/build.xml                         | 3 ++-
 tools/cooja/apps/mspsim/build.xml                      | 3 ++-
 tools/cooja/apps/native_gateway/build.xml              | 3 ++-
 tools/cooja/apps/serial_socket/build.xml               | 2 +-
 tools/cooja/build.xml                                  | 5 +++--
 tools/cooja/examples/appmote_rimeabc/build.xml         | 2 +-
 tools/cooja/examples/project_new_interface/build.xml   | 3 ++-
 tools/cooja/examples/project_new_plugin/build.xml      | 3 ++-
 tools/cooja/examples/project_new_radiomedium/build.xml | 3 ++-
 11 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/tools/coffee-manager/build.xml b/tools/coffee-manager/build.xml
index cd082759e..0712f73c6 100644
--- a/tools/coffee-manager/build.xml
+++ b/tools/coffee-manager/build.xml
@@ -7,7 +7,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="build"/>
-    <javac srcdir="se/sics/coffee" destdir="build" />
+    <javac srcdir="se/sics/coffee" destdir="build" includeantruntime="false" />
   </target>
 
   <target name="clean" depends="init">
diff --git a/tools/cooja/apps/avrora/build.xml b/tools/cooja/apps/avrora/build.xml
index 2b6d83033..32e4dcf26 100644
--- a/tools/cooja/apps/avrora/build.xml
+++ b/tools/cooja/apps/avrora/build.xml
@@ -23,7 +23,8 @@
   </target>
 
   <target name="compile" depends="init">
-    <javac srcdir="${src}" destdir="${build}" debug="on">
+    <javac srcdir="${src}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement location="${avrora_jar}"/>
         <pathelement location="${cooja_jar}"/>
diff --git a/tools/cooja/apps/mrm/build.xml b/tools/cooja/apps/mrm/build.xml
index b9049eeb7..0b4e7dd65 100644
--- a/tools/cooja/apps/mrm/build.xml
+++ b/tools/cooja/apps/mrm/build.xml
@@ -12,7 +12,8 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build}"/>
-    <javac srcdir="${java}" destdir="${build}" debug="on">
+    <javac srcdir="${java}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement path="."/>
         <pathelement location="${cooja_jar}"/>
diff --git a/tools/cooja/apps/mspsim/build.xml b/tools/cooja/apps/mspsim/build.xml
index d877f4e7a..e1b5dac71 100644
--- a/tools/cooja/apps/mspsim/build.xml
+++ b/tools/cooja/apps/mspsim/build.xml
@@ -36,7 +36,8 @@
   </target>
 
   <target name="compile" depends="init,mspsim,coffee">
-    <javac srcdir="${src}" destdir="${build}" debug="on">
+    <javac srcdir="${src}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement location="${mspsim_jar}"/>
         <pathelement location="${coffee_jar}"/>
diff --git a/tools/cooja/apps/native_gateway/build.xml b/tools/cooja/apps/native_gateway/build.xml
index 1dbfa8bd3..a290a3d8c 100644
--- a/tools/cooja/apps/native_gateway/build.xml
+++ b/tools/cooja/apps/native_gateway/build.xml
@@ -23,7 +23,8 @@ Requires pre-installation of Jpcap and (Windows-only) WinPcap.
 
   <target name="compile" depends="init">
     <mkdir dir="${build}"/>
-    <javac srcdir="${java}" destdir="${build}" debug="on">
+    <javac srcdir="${java}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement path="."/>
         <pathelement location="${cooja_jar}"/>
diff --git a/tools/cooja/apps/serial_socket/build.xml b/tools/cooja/apps/serial_socket/build.xml
index 0872d8d59..7164eb260 100644
--- a/tools/cooja/apps/serial_socket/build.xml
+++ b/tools/cooja/apps/serial_socket/build.xml
@@ -10,7 +10,7 @@
 
   <target name="compile" depends="init">
     <mkdir dir="build"/>
-    <javac srcdir="java" destdir="build" debug="on">
+    <javac srcdir="java" destdir="build" debug="on" includeantruntime="false">
       <classpath>
         <pathelement path="."/>
         <pathelement location="${cooja_jar}"/>
diff --git a/tools/cooja/build.xml b/tools/cooja/build.xml
index f57d0f82a..96bdf532d 100644
--- a/tools/cooja/build.xml
+++ b/tools/cooja/build.xml
@@ -68,7 +68,8 @@ The COOJA Simulator
 
   <target name="compile" depends="init">
     <mkdir dir="${build}"/>
-    <javac srcdir="${java}" destdir="${build}" debug="on">
+    <javac srcdir="${java}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement path="."/>
         <pathelement location="lib/jdom.jar"/>
@@ -189,7 +190,7 @@ The COOJA Simulator
   </target>
 
   <target name="java_version" depends="init">
-    <exec executable="javac" dir="${build}">
+    <exec executable="javac" dir="${build}" includeantruntime="false">
       <arg value="-version"/>
     </exec>
   </target>
diff --git a/tools/cooja/examples/appmote_rimeabc/build.xml b/tools/cooja/examples/appmote_rimeabc/build.xml
index 7ca5753d2..06dd4c1d4 100644
--- a/tools/cooja/examples/appmote_rimeabc/build.xml
+++ b/tools/cooja/examples/appmote_rimeabc/build.xml
@@ -9,7 +9,7 @@
   </target>
 
   <target name="compile" depends="init">
-    <javac srcdir="." destdir="." debug="on">
+    <javac srcdir="." destdir="." debug="on" includeantruntime="false">
       <classpath>
         <pathelement location="${cooja_jar}"/>
       </classpath>
diff --git a/tools/cooja/examples/project_new_interface/build.xml b/tools/cooja/examples/project_new_interface/build.xml
index 4df9641b3..b0a765559 100644
--- a/tools/cooja/examples/project_new_interface/build.xml
+++ b/tools/cooja/examples/project_new_interface/build.xml
@@ -13,7 +13,8 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build}"/>
-    <javac srcdir="${src}" destdir="${build}" debug="on">
+    <javac srcdir="${src}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement location="${cooja_jar}"/>
       </classpath>
diff --git a/tools/cooja/examples/project_new_plugin/build.xml b/tools/cooja/examples/project_new_plugin/build.xml
index 8143949c7..7b3e78e58 100644
--- a/tools/cooja/examples/project_new_plugin/build.xml
+++ b/tools/cooja/examples/project_new_plugin/build.xml
@@ -13,7 +13,8 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build}"/>
-    <javac srcdir="${src}" destdir="${build}" debug="on">
+    <javac srcdir="${src}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement location="${cooja_jar}"/>
       </classpath>
diff --git a/tools/cooja/examples/project_new_radiomedium/build.xml b/tools/cooja/examples/project_new_radiomedium/build.xml
index 7e89b0427..81b0174bb 100644
--- a/tools/cooja/examples/project_new_radiomedium/build.xml
+++ b/tools/cooja/examples/project_new_radiomedium/build.xml
@@ -13,7 +13,8 @@
 
   <target name="compile" depends="init">
     <mkdir dir="${build}"/>
-    <javac srcdir="${src}" destdir="${build}" debug="on">
+    <javac srcdir="${src}" destdir="${build}" debug="on"
+           includeantruntime="false">
       <classpath>
         <pathelement location="${cooja_jar}"/>
       </classpath>