From 089af1b2de412c4086510802a718fc31499a0c93 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Wed, 31 Aug 2011 20:56:28 +0200 Subject: [PATCH] Updated for git (intermediate commit - not sure this works yet!) --- tools/release-tools/Makefile | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/release-tools/Makefile b/tools/release-tools/Makefile index 35c369a87..f89f5e175 100644 --- a/tools/release-tools/Makefile +++ b/tools/release-tools/Makefile @@ -1,6 +1,6 @@ ifndef TAG ifndef RELEASE - ${error You must specify the RELEASE variable (e.g. make RELEASE=2.2)} + ${error You must specify the RELEASE variable (e.g. make RELEASE=2.5)} endif RELEASETAG=$(subst .,-,$(RELEASE)) TAG=contiki-$(RELEASETAG) @@ -8,33 +8,29 @@ else RELEASE=$(TAG) endif -ifndef CVSUSER - CVSUSER=:pserver:anonymous -endif - -CVSROOT=$(CVSUSER)@contiki.cvs.sourceforge.net:/cvsroot/contiki +GITROOT=git://contiki.git.sourceforge.net/gitroot/contiki/contiki package: all test: export-package compile almost-clean -export-package: clean export copy tgz zip +export-package: clean checkout copy tgz zip almost-clean: - rm -rf contiki-2.x contiki-$(RELEASE) contiki-collect-$(RELEASE) + rm -rf contiki contiki-$(RELEASE) contiki-collect-$(RELEASE) clean: - rm -rf contiki-2.x contiki-$(RELEASE) contiki-collect-$(RELEASE) *.zip *.tar.gz + rm -rf contiki contiki-$(RELEASE) contiki-collect-$(RELEASE) *.zip *.tar.gz copy: - cp -r contiki-2.x contiki-$(RELEASE) + cp -r contiki contiki-$(RELEASE) doc: - (cd contiki-2.x/doc; make dox pdf) + (cd contiki/doc; make dox pdf) copydoc: - cp contiki-2.x/doc/latex/refman.pdf contiki-$(RELEASE)/doc/ - cp -r contiki-2.x/doc/html contiki-$(RELEASE)/doc/ + cp contiki/doc/latex/refman.pdf contiki-$(RELEASE)/doc/ + cp -r contiki/doc/html contiki-$(RELEASE)/doc/ tgz: tar czf contiki-$(RELEASE).tar.gz contiki-$(RELEASE) @@ -45,13 +41,12 @@ zip: chmod 644 contiki-$(RELEASE).zip compile: - (cd contiki-2.x/examples/compile-platforms; make) + (cd contiki/examples/compile-platforms; make) checkout: - cvs -d $(CVSROOT) co -r $(TAG) contiki-2.x - -export: - cvs -d $(CVSROOT) export -r $(TAG) contiki-2.x + git clone $(GITROOT) + git checkout $(TAG) + rm -rf contiki/.git -include Makefile.sky -include Makefile.raven