diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2005-08-12 21:35:31 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2005-08-12 21:35:31 +0000 |
| commit | 21dff93be5fd8fff1e4de96afaf8ff12cb7a850a (patch) | |
| tree | 103c2069122da3c2922b11e192c5a94853ef228c | |
| parent | 027157feb6a3761eca1edb4eb547ca07081c33e2 (diff) | |
Check that the micro component of the version number is even.
Fixed the pattern to find all public header files.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | RELEASING | 6 |
3 files changed, 24 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2005-08-13 Behdad Esfahbod <behdad@behdad.org> + + * Makefile.am (release-publish): Check that the micro component + of the version number is even. + + * RELEASING: Fixed the pattern to find all public header files. + 2005-08-11 Carl Worth <cworth@cworth.org> * src/cairo-font.c (_cairo_toy_font_face_fini): Fix inverted sense @@ -168,7 +175,7 @@ * configure.in: Change CAIRO_VERSION from 0.9.0-head to 0.9.1. - Patch from Behdad Esfahbod <behdad@cs.toronto.edu>: + Patch from Behdad Esfahbod <behdad@behdad.org>: * configure.in: Update to use AC_INIT and AM_INIT_AUTOMAKE in recommended ways. Add support for substituting diff --git a/Makefile.am b/Makefile.am index a900a257..5fb29092 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,15 +41,24 @@ release-remove-old: release-check: release-remove-old distcheck $(md5_file) +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 "The version in configure.in must be incremented before a new release." \ + && false) + @echo "Good." + 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." \ + && echo "Are you sure you have an updated CVS checkout?" \ + && echo "This should never happen." \ && false) @echo "Good." -release-publish: release-verify-newer release-check +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 @@ -68,3 +77,6 @@ release-publish: release-verify-newer release-check @cat releases/$(md5_file) @echo "" @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." @@ -36,10 +36,8 @@ fixes are committed. Here are the steps to follow: output of the following command should be examined using the previous release tag: - cvs diff -r RELEASE_X_Y_Z src/*.h - - [Hmm, it would be nice to have a pattern for that command that - would exclude private header files.] + find src/ -name '*.h' -not -name '*-private.h' -not -name 'cairoint.h' | \ + xargs cvs diff -r RELEASE_X_Y_Z 4) Increment cairo_version_{minor|micro} in configure.in: |