[cairo-commit] cairo ChangeLog, 1.250, 1.251 Makefile.am, 1.6, 1.7 RELEASING, 1.5, 1.6

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog Makefile.am RELEASING 
Log Message:

        * Makefile.am (release-verify-newer): Abort release-publish if
        there's already a published tar file with the current version.
        (release-publish): Add code to update the LATEST-package-version
        file.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- ChangeLog	27 Oct 2004 20:19:39 -0000	1.250
+++ ChangeLog	28 Oct 2004 15:36:42 -0000	1.251
@@ -1,3 +1,10 @@
+2004-10-28  Carl Worth  <cworth at cworth.org>
+
+	* Makefile.am (release-verify-newer): Abort release-publish if
+	there's already a published tar file with the current version.
+	(release-publish): Add code to update the LATEST-package-version
+	file.
+
 2004-10-27  Carl Worth  <cworth at cworth.org>
 
 	* configure.in: Increment CAIRO_VERSION to 0.2.0.

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	27 Oct 2004 18:59:56 -0000	1.6
+++ Makefile.am	28 Oct 2004 15:36:42 -0000	1.7
@@ -14,7 +14,8 @@
 #		make release-check
 # or		make release-publish
 
-RELEASE_UPLOAD_DIR = 	cairographics.org:/home/www/cairo/snapshots
+RELEASE_UPLOAD_HOST =   cairographics.org
+RELEASE_UPLOAD_DIR =    /home/www/cairo/snapshots
 RELEASE_URL_BASE = 	http://cairographics.org/snapshots
 RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org
 
@@ -29,10 +30,19 @@
 
 release-check: release-remove-old distcheck $(md5_file)
 
-release-publish: release-check
+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 "The version in configure.in must be incremented before a new release." \
+		&& false)
+	@echo "Good."
+
+release-publish: release-verify-newer release-check
 	mkdir -p releases
-	scp $(tar_file) $(md5_file) $(RELEASE_UPLOAD_DIR)
+	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)"
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"

Index: RELEASING
===================================================================
RCS file: /cvs/cairo/cairo/RELEASING,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RELEASING	27 Oct 2004 20:13:39 -0000	1.5
+++ RELEASING	28 Oct 2004 15:36:42 -0000	1.6
@@ -58,17 +58,19 @@
 6) Run "make release-publish" which will perform the following steps
    for you:
 
+	* Check that no release exist with the current version
 	* Verify that make distcheck completes successfully
-	* Generate the final tar file with the correct version number
+	* Generate the final tar file
 	* Generate an md5sum file
 	* scp both files to cairographics.org:/home/www/cairo/snapshots
+	* 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
+	* Provide some text for the release announcement (see below).
 
 7) Tag the entire source tree with a tag of the form SNAPSHOT_X_Y_Z:
 
 	cvs tag SNAPSHOT_X_Y_Z
 
-8) Send a message to cairo-announce at cairographics.org to announce the
-   new snapshot using the text provided by the previous step.
+9) Send a message to cairo-announce at cairographics.org to announce the
+   new snapshot using the text provided from "make release-publish".