From 9ea58d343b0e45524e22ca226d71dd59032238e8 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Mon, 1 Sep 2008 12:47:54 +0000
Subject: [PATCH] cooja ant run automatically builds jars

---
 tools/cooja/apps/mrm/build.xml    | 2 +-
 tools/cooja/apps/mspsim/build.xml | 4 ++--
 tools/cooja/build.xml             | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/cooja/apps/mrm/build.xml b/tools/cooja/apps/mrm/build.xml
index eabf1e95b..b123bb37f 100644
--- a/tools/cooja/apps/mrm/build.xml
+++ b/tools/cooja/apps/mrm/build.xml
@@ -24,7 +24,7 @@
     <delete dir="${build}"/>
   </target>
 
-  <target name="jar" depends="clean, init, compile">
+  <target name="jar" depends="init, compile">
     <jar destfile="${lib}/mrm.jar" basedir="${build}">
       <fileset dir="images"/>
       <manifest>
diff --git a/tools/cooja/apps/mspsim/build.xml b/tools/cooja/apps/mspsim/build.xml
index 69a1d7f8d..c32e82b3a 100644
--- a/tools/cooja/apps/mspsim/build.xml
+++ b/tools/cooja/apps/mspsim/build.xml
@@ -20,7 +20,7 @@
     <delete file="${cooja_mspsim_jar}"/>
   </target>
 
-  <target name="compile" depends="init, clean">
+  <target name="compile" depends="init">
     <mkdir dir="${build}"/>
     <javac srcdir="${src}" destdir="${build}" debug="on">
       <classpath>
@@ -42,7 +42,7 @@
     </javadoc>
   </target>
 
-  <target name="jar" depends="clean, init, compile">
+  <target name="jar" depends="init, compile">
     <jar destfile="${cooja_mspsim_jar}" basedir="${build}">
       <manifest>
         <attribute name="Class-Path" value="."/>
diff --git a/tools/cooja/build.xml b/tools/cooja/build.xml
index 7606b614f..05145545d 100644
--- a/tools/cooja/build.xml
+++ b/tools/cooja/build.xml
@@ -57,7 +57,7 @@ The COOJA Simulator
     <delete dir="${dist}"/>
   </target>
 
-  <target name="run" depends="init, compile, copy configs">
+  <target name="run" depends="init, compile, jar, copy configs">
     <java fork="yes" dir="${build}" classname="se.sics.cooja.GUI">
       <arg line="${args}"/>
     	<env key="LD_LIBRARY_PATH" value="."/>
@@ -81,8 +81,7 @@ The COOJA Simulator
     </java>
   </target>
 
-  <target name="jar" depends="init">
-  	<ant antfile="build.xml" dir="." target="jar_cooja" inheritAll="false"/>
+  <target name="jar" depends="jar_cooja">
   	<ant antfile="build.xml" dir="apps/mrm" target="jar" inheritAll="false"/>
   	<ant antfile="build.xml" dir="apps/mspsim" target="jar" inheritAll="false"/>
   </target>
@@ -114,7 +113,7 @@ The COOJA Simulator
     </exec>
   </target>
 	
-  <target name="jar_cooja" depends="init, clean, compile, copy configs">
+  <target name="jar_cooja" depends="init, compile, copy configs">
     <mkdir dir="${dist}"/>
     <jar destfile="${dist}/cooja.jar" basedir="${build}">
       <manifest>