diff --git a/ChangeLog b/ChangeLog index 914673945..41b4b7422 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-12 Carl Worth + + * RELEASING: + * Makefile.am: Move tag from an instruction in RELEASING to an + automated step at the end of release-publish. + 2005-08-13 Behdad Esfahbod * Makefile.am (release-publish): Check that the micro component diff --git a/Makefile.am b/Makefile.am index 5fb29092f..7525ee201 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,11 +58,13 @@ release-verify-newer: && false) @echo "Good." +CVS=cvs release-publish: release-verify-even-micro release-verify-newer release-check 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)" + $(CVS) tag RELEASE_$(CAIRO_VERSION_MAJOR)_$(CAIRO_VERSION_MINOR)_$(CAIRO_VERSION_MICRO) @echo "" @echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)" @echo "including the following:" diff --git a/RELEASING b/RELEASING index d2904f523..979a631eb 100644 --- a/RELEASING +++ b/RELEASING @@ -74,15 +74,12 @@ fixes are committed. Here are the steps to follow: * 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 -7) Tag the entire source tree with a tag of the form RELEASE_X_Y_Z: - - cvs tag RELEASE_X_Y_Z - -8) Increment cairo_version_micro to the next larger (odd) number in +7) Increment cairo_version_micro to the next larger (odd) number in configure, and commit. -9) Send a message to cairo-announce@cairographics.org and CC +8) Send a message to cairo-announce@cairographics.org and CC gnome-announce-list@gnome.org to announce the new release using the text provided from "make release-publish".