Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ee3947fceb8d0fd993f8d209db6851b8c074257f Commit: ee3947fceb8d0fd993f8d209db6851b8c074257f Parent: cf2470d0578ba87f88d815ffb2259bbfd91978c5 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Thu Aug 27 14:18:06 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Thu Aug 27 14:18:06 2009 +0200 build: update release script create gfs1-utils and rgmanager separate tarballs. tidy up a few other bits. Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- make/release.mk | 81 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 59 insertions(+), 22 deletions(-) diff --git a/make/release.mk b/make/release.mk index 7a8b9a0..dcda14d 100644 --- a/make/release.mk +++ b/make/release.mk @@ -19,20 +19,16 @@ all: else -ifdef RELEASE -TEST="" -else -TEST="test" -endif - ## setup stuff MASTERPROJECT=cluster ifdef RELEASE MASTERPV=$(MASTERPROJECT)-$(VERSION) +TEST="" else MASTERPV=HEAD +TEST="test" endif MASTERTGZ=$(TEST)$(MASTERPROJECT)-$(VERSION).tar.gz @@ -46,6 +42,16 @@ RASPROJECT=resource-agents RASPV=$(RASPROJECT)-$(VERSION) RASTGZ=$(TEST)$(RASPV).tar.gz +# rgmanager +RGMPROJECT=rgmanager +RGMPV=$(RGMPROJECT)-$(VERSION) +RGMTGZ=$(TEST)$(RGMPV).tar.gz + +# gfs1-utils +GFS1PROJECT=gfs1-utils +GFS1PV=$(GFS1PROJECT)-$(VERSION) +GFS1TGZ=$(TEST)$(GFS1PV).tar.gz + all: tag tarballs ifdef RELEASE @@ -57,7 +63,11 @@ tag: endif -tarballs: master-tarball fence-agents-tarball resource-agents-tarball +tarballs: master-tarball +tarballs: fence-agents-tarball +tarballs: resource-agents-tarball +tarballs: rgmanager-tarball +tarballs: gfs1-tarball master-tarball: git archive \ @@ -75,40 +85,67 @@ master-tarball: > ../$(MASTERTGZ) rm -rf $(MASTERPROJECT)-$(VERSION) -fence-agents-tarball: +fence-agents-tarball: master-tarball tar zxpf ../$(MASTERTGZ) 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 && \ - rm -rf fence/man/fence.8 fence/man/fenced.8 fence/man/fence_node.8 fence/man/fence_tool.8 && \ - sed -i -e 's/fence.8//g' -e 's/fenced.8//g' -e 's/fence_node.8//g' -e 's/fence_tool.8//g' fence/man/Makefile + rm -rf bindings cman common config contrib dlm gfs* group \ + rgmanager fence/fenced fence/fence_node \ + fence/fence_tool fence/include fence/libfence \ + fence/libfenced fence/man/fence.8 fence/man/fenced.8 \ + fence/man/fence_node.8 fence/man/fence_tool.8 && \ + sed -i -e 's/fence.8//g' -e 's/fenced.8//g' \ + -e 's/fence_node.8//g' -e 's/fence_tool.8//g' \ + fence/man/Makefile tar cp $(FENCEPV) | \ gzip -9 \ > ../$(FENCETGZ) rm -rf $(FENCEPV) -resource-agents-tarball: +resource-agents-tarball: master-tarball tar zxpf ../$(MASTERTGZ) 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 \ - rgmanager/examples rgmanager/include rgmanager/init.d rgmanager/man \ - rgmanager/README && \ - rm -rf rgmanager/src/clulib rgmanager/src/daemons rgmanager/src/utils + rm -rf bindings cman common config contrib dlm fence gfs* \ + group rgmanager/ChangeLog rgmanager/errors.txt \ + rgmanager/event-script.txt rgmanager/examples \ + rgmanager/include rgmanager/init.d rgmanager/man \ + rgmanager/README rgmanager/src/clulib \ + rgmanager/src/daemons rgmanager/src/utils tar cp $(RASPV) | \ gzip -9 \ > ../$(RASTGZ) rm -rf $(RASPV) +rgmanager-tarball: master-tarball + tar zxpf ../$(MASTERTGZ) + mv $(MASTERPROJECT)-$(VERSION) $(RGMPV) + cd $(RGMPV) && \ + rm -rf bindings cman common config contrib dlm fence gfs* group \ + rgmanager/src/resources + tar cp $(RGMPV) | \ + gzip -9 \ + > ../$(RGMTGZ) + rm -rf $(RGMPV) + +gfs1-tarball: master-tarball + tar zxpf ../$(MASTERTGZ) + mv $(MASTERPROJECT)-$(VERSION) $(GFS1PV) + cd $(GFS1PV) && \ + rm -rf bindings cman common config contrib dlm fence group \ + rgmanager gfs2 + tar cp $(GFS1PV) | \ + gzip -9 \ + > ../$(GFS1TGZ) + rm -rf $(GFS1PV) + publish: git push --tags origin scp ../$(MASTERTGZ) \ - fedorahosted.org:$(MASTERPROJECT) - scp ../$(FENCETGZ) \ - fedorahosted.org:$(MASTERPROJECT) - scp ../$(RASTGZ) \ + ../$(FENCETGZ) \ + ../$(RASTGZ) \ + ../$(GFS1TGZ) \ + ../$(RGMTGZ) \ fedorahosted.org:$(MASTERPROJECT) git log $(MASTERPROJECT)-$(OLDVER)..$(MASTERPV) | \ git shortlog > ../$(MASTERPV).emaildata