diff options
| author | sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-04-18 18:42:03 +0000 |
|---|---|---|
| committer | sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-04-18 18:42:03 +0000 |
| commit | 7cd05b634be1c5cb0d23f4e264871106dcd60c5c (patch) | |
| tree | ed69f38e0cfa6ce9d7551511336705ef2045d1b2 /src/Makefile | |
| parent | 025c143437cb6d55eb9fdc61b005df48f41d2ace (diff) | |
| download | sos-7cd05b634be1c5cb0d23f4e264871106dcd60c5c.tar.gz | |
Cleaned up tagging and release in makefile, updated spec file
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@123 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index a480fd12..51efce99 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,23 +6,27 @@ NAME = sos VERSION = $(shell awk '/Version/ { print $$2 }' sos.spec) REPO = https://sos.108.redhat.com/svn/sos SVNTAG = r$(subst .,-,$(VERSION)) +SVN_TAG_CONTENTS := $(shell svn list $(REPO)/tags/$(SVNTAG)/Makefile) all: -.PHONY: tag-archive create-archive archive install version clean +.PHONY: tag-release tarball release install version clean -../../tags/$(SVNTAG): +tag-release: +ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile) + @echo "The repository already contains a tag for version $(VERSION)" +else @svn copy $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) \ -m "Tagging the $(SVNTAG) release of the sos project" @echo "$(SVNTAG)" @svn update ../../tags +endif -tag-archive: ../../tags/$(SVNTAG) - -create-archive: tag-archive +tarball: clean + @echo "Creating an archive from HEAD of development" @rm -rf /tmp/$(NAME) - @svn export $(REPO)/tags/$(SVNTAG) /tmp/$(NAME) \ + @svn export -q $(REPO)/trunk/src /tmp/$(NAME) \ || echo GRRRrrrrr -- ignore [export aborted] @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) @cd /tmp; tar --bzip2 -cSpf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) @@ -32,7 +36,22 @@ create-archive: tag-archive @echo " " @echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2." -archive: clean tag-archive create-archive +release: clean tag-release +ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile) + @echo "Creating an archive from tag $(SVNTAG)" + @rm -rf /tmp/$(NAME) + @svn export -q $(REPO)/tags/$(SVNTAG) /tmp/$(NAME) \ + || echo GRRRrrrrr -- ignore [export aborted] + @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) + @cd /tmp; tar --bzip2 -cSpf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) + @rm -rf /tmp/$(NAME)-$(VERSION) + @cp /tmp/$(NAME)-$(VERSION).tar.bz2 . + @rm -f /tmp/$(NAME)-$(VERSION).tar.bz2 + @echo " " + @echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2." +else + @echo "There is no tag in the repository for this version, must be tagged before release" +endif install: python setup.py install |