From faec16f2368ea73ea9f332f6d20a59d0307af531 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Wed, 3 Nov 2010 14:53:16 +0000 Subject: [PATCH] Updated to the new collect-view path --- tools/cooja/apps/collect-view/build.xml | 2 +- tools/release-tools/Makefile.sky | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/cooja/apps/collect-view/build.xml b/tools/cooja/apps/collect-view/build.xml index 70b4e2052..fd0c01611 100644 --- a/tools/cooja/apps/collect-view/build.xml +++ b/tools/cooja/apps/collect-view/build.xml @@ -22,7 +22,7 @@ - + diff --git a/tools/release-tools/Makefile.sky b/tools/release-tools/Makefile.sky index e69d6e7f3..cbdd002c8 100644 --- a/tools/release-tools/Makefile.sky +++ b/tools/release-tools/Makefile.sky @@ -1,11 +1,11 @@ -contiki-sky: - (cd contiki-2.x/examples/sky-shell; make sky-shell.ihex && ant dist && chmod 755 dist/tools/*-linux) - cp -r contiki-2.x/examples/sky-shell/dist contiki-sky-$(RELEASE) +contiki-collect-sky: + (cd contiki-2.x/examples/sky-shell; make sky-shell.ihex) + cp contiki-2.x/examples/sky-shell/sky-shell.ihex contiki-2.x/tools/collect-view + (cd contiki-2.x/tools/collect-view/; ant dist && chmod 755 dist/tools/*-linux) + cp -r contiki-2.x/tools/collect-view/dist contiki-collect-sky-$(RELEASE) -contiki-sky-$(RELEASE).zip: contiki-sky - tar czf contiki-sky-$(RELEASE).tar.gz contiki-sky-$(RELEASE) - chmod 644 contiki-sky-$(RELEASE).tar.gz - zip -r contiki-sky-$(RELEASE).zip contiki-sky-$(RELEASE) - chmod 644 contiki-sky-$(RELEASE).zip +contiki-collect-sky-$(RELEASE).zip: contiki-collect-sky + zip -r contiki-collect-sky-$(RELEASE).zip contiki-collect-sky-$(RELEASE) + chmod 644 contiki-collect-sky-$(RELEASE).zip -BINARIES += contiki-sky-$(RELEASE).zip +BINARIES += contiki-collect-sky-$(RELEASE).zip