cluster: STABLE3 - build: allow easy build of test tarballs for the whole set

cluster: STABLE3 - build: allow easy build of test tarballs for the whole set

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=94df30ca63e49afb1e8aeede65df8a3e5bcd0970
Commit:        94df30ca63e49afb1e8aeede65df8a3e5bcd0970
Parent:        0f6530f6b58cd43cb35745dd1b4e96c16673384c
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Jun 10 10:16:42 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Jun 10 10:16:42 2009 +0200

build: allow easy build of test tarballs for the whole set

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 make/release.mk |   50 ++++++++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/make/release.mk b/make/release.mk
index 67ae422..7a8b9a0 100644
--- a/make/release.mk
+++ b/make/release.mk
@@ -19,59 +19,65 @@ all:
 
 else
 
+ifdef RELEASE
+TEST=""
+else
+TEST="test"
+endif
+
 ## setup stuff
 
 MASTERPROJECT=cluster
+
+ifdef RELEASE
 MASTERPV=$(MASTERPROJECT)-$(VERSION)
-MASTERTGZ=$(MASTERPV).tar.gz
-TESTTGZ=TEST-$(MASTERTGZ)
+else
+MASTERPV=HEAD
+endif
+MASTERTGZ=$(TEST)$(MASTERPROJECT)-$(VERSION).tar.gz
 
 # fence-agents
 FENCEPROJECT=fence-agents
 FENCEPV=$(FENCEPROJECT)-$(VERSION)
-FENCETGZ=$(FENCEPV).tar.gz
+FENCETGZ=$(TEST)$(FENCEPV).tar.gz
 
 # resource-agents
 RASPROJECT=resource-agents
 RASPV=$(RASPROJECT)-$(VERSION)
-RASTGZ=$(RASPV).tar.gz
-
-all: test-tarball
-
-test-tarball:
-	git archive \
-		--format=tar \
-		--prefix=$(MASTERPV)/ \
-		HEAD | \
-		gzip -9 \
-		> ../$(TESTTGZ)
+RASTGZ=$(TEST)$(RASPV).tar.gz
 
-release: tag tarballs
+all: tag tarballs
 
+ifdef RELEASE
 tag:
 	git tag -a -m "$(MASTERPV) release" $(MASTERPV) HEAD
 
+else
+tag:
+
+endif
+
 tarballs: master-tarball fence-agents-tarball resource-agents-tarball
 
 master-tarball:
 	git archive \
 		--format=tar \
-		--prefix=$(MASTERPV)/ \
+		--prefix=$(MASTERPROJECT)-$(VERSION)/ \
 		$(MASTERPV) | \
 		tar xp
 	sed -i -e \
 		's#<CVS>#$(VERSION)#g' \
-		$(MASTERPV)/gfs-kernel/src/gfs/gfs.h
+		$(MASTERPROJECT)-$(VERSION)/gfs-kernel/src/gfs/gfs.h
 	echo "VERSION \"$(VERSION)\"" \
-		>> $(MASTERPV)/make/official_release_version
-	tar cp $(MASTERPV) | \
+		>> $(MASTERPROJECT)-$(VERSION)/make/official_release_version
+	tar cp $(MASTERPROJECT)-$(VERSION) | \
 		gzip -9 \
 		> ../$(MASTERTGZ)
-	rm -rf $(MASTERPV)
+	rm -rf $(MASTERPROJECT)-$(VERSION)
 
 fence-agents-tarball:
 	tar zxpf ../$(MASTERTGZ)
-	mv $(MASTERPV) $(FENCEPV)
+	mv $(MASTERPROJECT)-$(VERSION) $(FENCEPV)
 	cd $(FENCEPV) && \
 		rm -rf bindings cman common config contrib dlm gfs* group rgmanager && \
 		rm -rf fence/fenced fence/fence_node fence/fence_tool fence/include fence/libfence fence/libfenced && \
@@ -84,7 +90,7 @@ fence-agents-tarball:
 
 resource-agents-tarball:
 	tar zxpf ../$(MASTERTGZ)
-	mv $(MASTERPV) $(RASPV)
+	mv $(MASTERPROJECT)-$(VERSION) $(RASPV)
 	cd $(RASPV) && \
 		rm -rf bindings cman common config contrib dlm fence gfs* group && \
 		rm -rf rgmanager/ChangeLog rgmanager/errors.txt rgmanager/event-script.txt \