From 1f1112618a96cd676d2445b5da658e91b1ca43d0 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Sat, 20 Sep 2008 09:15:45 +0000 Subject: [PATCH] in paths, dirs are separated by '/'s only --- .../apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java | 6 +++--- .../src/se/sics/cooja/mspmote/plugins/MspCodeWatcher.java | 4 ++-- tools/cooja/contiki_tests/sky_helloworld.csc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java index 01ac25df8..b2f4a42b1 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MspMoteType.java,v 1.10 2008/09/20 08:53:20 fros4943 Exp $ + * $Id: MspMoteType.java,v 1.11 2008/09/20 09:16:28 fros4943 Exp $ */ package se.sics.cooja.mspmote; @@ -961,7 +961,7 @@ public abstract class MspMoteType implements MoteType { if (fileSource != null) { element = new Element("source"); fileSource = GUI.stripAbsoluteContikiPath(fileSource); - element.setText(fileSource.getPath()); + element.setText(fileSource.getPath().replaceAll("\\\\", "/")); config.add(element); element = new Element("command"); element.setText(compileCommand); @@ -970,7 +970,7 @@ public abstract class MspMoteType implements MoteType { // ELF file element = new Element("elf"); fileELF = GUI.stripAbsoluteContikiPath(fileELF); - element.setText(fileELF.getPath()); + element.setText(fileELF.getPath().replaceAll("\\\\", "/")); config.add(element); } diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCodeWatcher.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCodeWatcher.java index a89444414..0dff91ce3 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCodeWatcher.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCodeWatcher.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MspCodeWatcher.java,v 1.12 2008/09/18 14:05:00 fros4943 Exp $ + * $Id: MspCodeWatcher.java,v 1.13 2008/09/20 09:16:28 fros4943 Exp $ */ package se.sics.cooja.mspmote.plugins; @@ -466,7 +466,7 @@ public class MspCodeWatcher extends VisPlugin { if (codeFile != null) { element = new Element("codefile"); codeFile = GUI.stripAbsoluteContikiPath(codeFile); - element.setText(codeFile.getPath()); + element.setText(codeFile.getPath().replaceAll("\\\\", "/")); config.add(element); } diff --git a/tools/cooja/contiki_tests/sky_helloworld.csc b/tools/cooja/contiki_tests/sky_helloworld.csc index 815065cb4..7029073a8 100644 --- a/tools/cooja/contiki_tests/sky_helloworld.csc +++ b/tools/cooja/contiki_tests/sky_helloworld.csc @@ -18,7 +18,7 @@ se.sics.cooja.mspmote.SkyMoteType sky1 Sky Mote Type #1 - ..\..\..\examples\hello-world\hello-world.c + ../../../examples/hello-world/hello-world.c make hello-world.firmware TARGET=sky