From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13775 invoked by alias); 10 Jun 2009 08:17:44 -0000 Received: (qmail 13766 invoked by alias); 10 Jun 2009 08:17:43 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - build: allow easy build of test tarballs for the whole set To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 0f6530f6b58cd43cb35745dd1b4e96c16673384c X-Git-Newrev: 94df30ca63e49afb1e8aeede65df8a3e5bcd0970 From: "Fabio M. Di Nitto" Message-Id: <20090610081709.A458B12035A@lists.fedorahosted.org> Date: Wed, 10 Jun 2009 08:17:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00493.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=94df30ca63e49afb1e8aeede65df8a3e5bcd0970 Commit: 94df30ca63e49afb1e8aeede65df8a3e5bcd0970 Parent: 0f6530f6b58cd43cb35745dd1b4e96c16673384c Author: Fabio M. Di Nitto AuthorDate: Wed Jun 10 10:16:42 2009 +0200 Committer: Fabio M. Di Nitto 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 --- 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##$(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 \