[cairo-commit] cairo ChangeLog, 1.878, 1.879 Makefile.am, 1.17, 1.18 RELEASING, 1.16, 1.17

Behdad Esfahbod commit at pdx.freedesktop.org
Sat Aug 13 00:20:47 PDT 2005 

Committed by: behdad

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv26855

Modified Files:
	ChangeLog Makefile.am RELEASING 
Log Message:
2005-08-13  Behdad Esfahbod  <behdad at behdad.org>

        * RELEASING:
        * Makefile.am: Generate sh1sum instead of md5sum.  Use gpg to
        sign it.  You need gpg set up.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.878
retrieving revision 1.879
diff -u -d -r1.878 -r1.879
--- ChangeLog	13 Aug 2005 06:50:17 -0000	1.878
+++ ChangeLog	13 Aug 2005 07:20:45 -0000	1.879
@@ -1,8 +1,14 @@
+2005-08-13  Behdad Esfahbod  <behdad at behdad.org>
+
+	* RELEASING:
+	* Makefile.am: Generate sh1sum instead of md5sum.  Use gpg to
+	sign it.  You need gpg set up.
+
 2005-08-12  Carl Worth  <cworth at cworth.org>
 
 	* RELEASING:
-	* Makefile.am: Move tag from an instruction in RELEASING to an
-	automated step at the end of release-publish.
+	* Makefile.am: Move tagging from an instruction in RELEASING to
+	an automated step at the end of release-publish.
 
 2005-08-13  Behdad Esfahbod  <behdad at behdad.org>
 

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	13 Aug 2005 06:50:17 -0000	1.17
+++ Makefile.am	13 Aug 2005 07:20:45 -0000	1.18
@@ -30,21 +30,28 @@
 RELEASE_URL_BASE = 	http://cairographics.org/snapshots
 RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org
 
+CVS=cvs
+
 tar_file = $(PACKAGE)-$(VERSION).tar.gz
-md5_file = $(tar_file).md5
+sha1_file = $(tar_file).sha1
+gpg_file = $(sha1_file).asc
 
-$(md5_file): $(tar_file)
-	md5sum $^ > $@
+$(sha1_file): $(tar_file)
+	sha1sum $^ > $@
+
+$(gpg_file): $(sha1_file)
+	@echo "Please enter your GPG password to sign the checksum."
+	gpg --armor --sign $^ 
 
 release-remove-old:
-	rm -f $(tar_file) $(md5_file)
+	rm -f $(tar_file) $(sha1_file) $(gpg_file)
 
-release-check: release-remove-old distcheck $(md5_file)
+release-check: release-verify-even-micro release-verify-newer release-remove-old distcheck
 
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(CAIRO_VERSION_MICRO)" = "`echo $(CAIRO_VERSION_MICRO)/2*2 | bc`" \
-		|| (echo "Ouch." && echo "'$(CAIRO_VERSION_MICRO)' is not an even number." \
+		|| (echo "Ouch." && echo "The version micro component '$(CAIRO_VERSION_MICRO)' is not an even number." \
 		&& echo "The version in configure.in must be incremented before a new release." \
 		&& false)
 	@echo "Good."
@@ -58,27 +65,34 @@
 		&& false)
 	@echo "Good."
 
-CVS=cvs
-release-publish: release-verify-even-micro release-verify-newer release-check
+release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	mkdir -p releases
-	scp $(tar_file) $(md5_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
-	mv $(tar_file) $(md5_file) releases
-	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && touch $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
+	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_$(CAIRO_VERSION_MAJOR)_$(CAIRO_VERSION_MINOR)_$(CAIRO_VERSION_MICRO)
+
+release-publish: release-upload releases/$(sha1_file)
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"
 	@echo ""
 	@echo "Subject: $(PACKAGE) release $(VERSION) now available"
 	@echo ""
+	@echo "============================== CUT HERE =============================="
 	@echo "A new $(PACKAGE) release $(VERSION) is now available from:"
 	@echo ""
 	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
-	@echo "	$(RELEASE_URL_BASE)/$(md5_file)"
+	@echo "	$(RELEASE_URL_BASE)/$(sha1_file)"
 	@echo -n "	"
-	@cat releases/$(md5_file)
+	@cat releases/$(sha1_file)
+	@echo "	$(RELEASE_URL_BASE)/$(gpg_file)"
+	@echo "	(signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
 	@echo ""
+	@echo "============================== CUT HERE =============================="
 	@echo "Also, please include the new entries from the NEWS file."
 	@echo ""
 	@echo "Last but not least, do not forget to bump up the micro"
 	@echo "version component to the next (odd) number and commit."
+
+.PHONY: release-check release-remove-old release-verify-even-micro release-verify-newer release-check release-publish release-upload

Index: RELEASING
===================================================================
RCS file: /cvs/cairo/cairo/RELEASING,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- RELEASING	13 Aug 2005 06:50:17 -0000	1.16
+++ RELEASING	13 Aug 2005 07:20:45 -0000	1.17
@@ -66,15 +66,17 @@
 6) Run "make release-publish" which will perform the following steps
    for you:
 
+	* Check that the version number ends with an even micro component
 	* Check that no release exists with the current version
 	* Verify that make distcheck completes successfully
 	* Generate the final tar file
-	* Generate an md5sum file
-	* scp both files to appear on http://cairographics.org/snapshots
+	* Generate an sha1sum file
+	* Sign the sha1sum using your GPG setup (asks for your GPG password)
+	* scp the three files to appear on http://cairographics.org/snapshots
+	* Place local copies of the three files in the releases directory
 	* Create a LATEST-package-version file (after deleting any old one)
-	* Place local copies of both files in the releases directory
-	* Provide some text for the release announcement (see below).
 	* Tag the entire source tree with a tag of the form RELEASE_X_Y_Z
+	* Provide some text for the release announcement (see below).
 
 7) Increment cairo_version_micro to the next larger (odd) number in
    configure, and commit.

More information about the cairo-commit mailing list