From ff62a63574de09ef59e06e854a60cedf244ddadc Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Mon, 4 Jun 2007 21:12:43 -0500 Subject: Update Makefile.am release procedures for git instead of CVS make release-publish automatically tags the repository for us, update it to tag in git instead of in cvs --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 3fc2fd5..223e6e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ RELEASE_UPLOAD_BASE = /srv/cairo.freedesktop.org/www RELEASE_UPLOAD_DIR = $(RELEASE_UPLOAD_BASE)/releases RELEASE_URL_BASE = http://cairographics.org/releases RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org (and CC gnome-announce-list@gnome.org) -CVS = cvs +GIT = $(top_srcdir)/missing --run git #MANUAL_DATED = cairo-manual-`date +%Y%m%d` #MANUAL_TAR_FILE = $(MANUAL_DATED).tar.gz @@ -53,7 +53,7 @@ release-verify-newer: @echo -n "Checking that no $(VERSION) release already exists..." @ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \ || (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \ - && echo "Are you sure you have an updated CVS checkout?" \ + && echo "Are you sure you have an updated git checkout?" \ && echo "This should never happen." \ && false) @echo "Good." @@ -75,7 +75,7 @@ release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file) scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR) mv $(tar_file) $(sha1_file) $(gpg_file) releases ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)" - $(CVS) tag RELEASE_$(GENERIC_MAJOR_VERSION)_$(GENERIC_MINOR_VERSION)_$(GENERIC_MICRO_VERSION) + $(GIT) tag -s -m "$(PACKAGE) release $(VERSION)" v$(VERSION) release-publish: release-upload releases/$(sha1_file) @echo "" -- cgit v1.2.3