Added mspsim as a submodule instead of as a binary mspsim.jar file

hosssha · Nov 7, 2013 · 71eea75 · 71eea75
1 parent c67c048
commit 71eea75
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 523 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tools/mspsim"]
+	path = tools/mspsim
+	url = https://github.com/contiki-os/mspsim.git
diff --git a/tools/cooja/apps/mspsim/build.xml b/tools/cooja/apps/mspsim/build.xml
@@ -8,8 +8,8 @@
   <property name="cooja" location="../.."/>
 
   <property name="cooja_jar" value="${cooja}/dist/cooja.jar"/>
-  <property name="mspsim" location="../../../mspsim"/>
-  <property name="mspsim_jar" value="${lib}/mspsim.jar"/>
+  <property name="mspsim" location="${cooja}/../mspsim"/>
+  <property name="mspsim_jar" value="${mspsim}/mspsim.jar"/>
   <property name="coffee" location="../../../coffee-manager"/>
   <property name="coffee_jar" value="${lib}/coffee.jar"/>
   <property name="cooja_mspsim_jar" value="${lib}/cooja_mspsim.jar"/>
@@ -26,7 +26,8 @@
   </target>
 
   <target name="mspsim" depends="init">
-    <copy todir="${lib}" file="${mspsim}/mspsim.jar" />
+    <ant antfile="build.xml" dir="${mspsim}" target="jar" inheritAll="false"/>
+    <copy todir="${lib}" file="${mspsim_jar}" />
     <copy todir="${lib}" file="${mspsim}/lib/jipv6.jar" />
   </target>
 

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -76,7 +76,7 @@
 import se.sics.mspsim.util.ELF;
 import se.sics.mspsim.util.MapEntry;
 import se.sics.mspsim.util.MapTable;
-import se.sics.mspsim.util.SimpleProfiler;
+import se.sics.mspsim.profiler.SimpleProfiler;
 
 /**
  * @author Fredrik Osterlind

diff --git a/tools/mspsim b/tools/mspsim
diff --git a/tools/mspsim/lib/jcommon-1.0.14.jar b/tools/mspsim/lib/jcommon-1.0.14.jar
diff --git a/tools/mspsim/lib/jfreechart-1.0.11.jar b/tools/mspsim/lib/jfreechart-1.0.11.jar
diff --git a/tools/mspsim/lib/jfreechart-licence-LGPL.txt b/tools/mspsim/lib/jfreechart-licence-LGPL.txt
diff --git a/tools/mspsim/lib/jipv6.jar b/tools/mspsim/lib/jipv6.jar
diff --git a/tools/mspsim/mspsim.jar b/tools/mspsim/mspsim.jar
diff --git a/tools/mspsim/scripts/autorun.sc b/tools/mspsim/scripts/autorun.sc