From d3df8bc35ba5486f5008d51a76f90a24f8b84f46 Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@sics.se>
Date: Tue, 6 Sep 2011 23:46:00 +0200
Subject: [PATCH] Update makefiles to git release tags and directories
---
tools/release-tools/Makefile | 2 +-
tools/release-tools/Makefile.raven | 14 +++++++-------
tools/release-tools/Makefile.sky | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/release-tools/Makefile b/tools/release-tools/Makefile
index f89f5e1751..ee30911ddc 100644
--- a/tools/release-tools/Makefile
+++ b/tools/release-tools/Makefile
@@ -3,7 +3,7 @@ ifndef TAG
${error You must specify the RELEASE variable (e.g. make RELEASE=2.5)}
endif
RELEASETAG=$(subst .,-,$(RELEASE))
- TAG=contiki-$(RELEASETAG)
+ TAG=$(RELEASE)
else
RELEASE=$(TAG)
endif
diff --git a/tools/release-tools/Makefile.raven b/tools/release-tools/Makefile.raven
index 6b438d859d..2d220f1370 100644
--- a/tools/release-tools/Makefile.raven
+++ b/tools/release-tools/Makefile.raven
@@ -1,12 +1,12 @@
contiki-raven:
- (cd contiki-2.x/examples/webserver-ipv6-raven; make)
- (cd contiki-2.x/platform/avr-ravenlcd; make)
- (cd contiki-2.x/examples/ravenusbstick; make)
+ (cd contiki/examples/webserver-ipv6-raven; make)
+ (cd contiki/platform/avr-ravenlcd; make)
+ (cd contiki/examples/ravenusbstick; make)
mkdir contiki-raven-$(RELEASE)
- cp contiki-2.x/examples/webserver-ipv6-raven/webserver6.elf contiki-raven-$(RELEASE)
- cp contiki-2.x/platform/avr-ravenlcd/ravenlcd_3290.elf contiki-raven-$(RELEASE)
- cp contiki-2.x/examples/ravenusbstick/ravenusbstick.elf contiki-raven-$(RELEASE)
- cp contiki-2.x/cpu/avr/dev/usb/INF/*.inf contiki-raven-$(RELEASE)
+ cp contiki/examples/webserver-ipv6-raven/webserver6.elf contiki-raven-$(RELEASE)
+ cp contiki/platform/avr-ravenlcd/ravenlcd_3290.elf contiki-raven-$(RELEASE)
+ cp contiki/examples/ravenusbstick/ravenusbstick.elf contiki-raven-$(RELEASE)
+ cp contiki/cpu/avr/dev/usb/INF/*.inf contiki-raven-$(RELEASE)
contiki-raven-$(RELEASE).zip: contiki-raven
tar czf contiki-raven-$(RELEASE).tar.gz contiki-raven-$(RELEASE)
diff --git a/tools/release-tools/Makefile.sky b/tools/release-tools/Makefile.sky
index d40ded17de..9db424c5e9 100644
--- a/tools/release-tools/Makefile.sky
+++ b/tools/release-tools/Makefile.sky
@@ -1,6 +1,6 @@
contiki-collect-sky:
- (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)
+ (cd contiki/tools/collect-view/; ant dist && chmod 755 dist/tools/*-linux)
+ cp -r contiki/tools/collect-view/dist contiki-collect-sky-$(RELEASE)
contiki-collect-sky-$(RELEASE).zip: contiki-collect-sky
zip -r contiki-collect-sky-$(RELEASE).zip contiki-collect-sky-$(RELEASE)
--
GitLab