Permalink
Browse files

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

  • Loading branch information...
1 parent c67c048 commit 71eea754d685afa23f3c2db5b263ce648f563213 @adamdunkels adamdunkels committed with cmorty Aug 29, 2013
View
@@ -0,0 +1,3 @@
+[submodule "tools/mspsim"]
+ path = tools/mspsim
+ url = https://github.com/contiki-os/mspsim.git
@@ -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>
@@ -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
Submodule mspsim added at 58f187
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
@@ -1,15 +0,0 @@
-# autorun script for MSPSim
-# - all commands will run after loaded firmware into MSPSim
-#log CC2420 >log.txt
-#printcalls >>log.txt
-
-# Install and activate the plugin 'ContikiChecker'
-# install ContikiChecker
-# contikichecker
-
-#start the nodegui service
-service -f controlgui start
-service -f nodegui start
-service -f serialgui start
-#service -f stackchart start
-start

0 comments on commit 71eea75

Please sign in to comment.