Maybe I'm the only one who uses "make major" or who has been bothered about the semantic mismatch in doing so for a so-called "minor" (yet stable) release.
I debated whether to keep "major" for a transition period, but I don't think that would be worthwhile. Any objection? >From 1c233a6b61e3aca04d0edd02ad31a276d35bfcf4 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Thu, 1 Oct 2009 10:09:30 +0200 Subject: [PATCH] maint.mk: requiring "make major" was annoying, for a "minor" release. What is intended is "stable", to contrast with alpha and beta, so require "make stable", not "make major". * build-aux/announce-gen (%valid_release_types): s/major/stable/. (get_tool_versions): Likewise. * top/maint.mk (ALL_RECURSIVE_TARGETS): s/major/stable/ --- ChangeLog | 9 +++++++++ build-aux/announce-gen | 4 ++-- top/maint.mk | 10 +++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50500fd..3cecf35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-10-01 Jim Meyering <[email protected]> + + maint.mk: requiring "make major" was annoying, for a "minor" release. + What is intended is "stable", to contrast with alpha and beta, + so require "make stable", not "make major". + * build-aux/announce-gen (%valid_release_types): s/major/stable/. + (get_tool_versions): Likewise. + * top/maint.mk (ALL_RECURSIVE_TARGETS): s/major/stable/ + 2009-09-30 Ben Pfaff <[email protected]> Fix broken build of replacement for Windows tmpfile(). diff --git a/build-aux/announce-gen b/build-aux/announce-gen index d4e289a..972b881 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -33,7 +33,7 @@ use POSIX qw(strftime); (my $ME = $0) =~ s|.*/||; -my %valid_release_types = map {$_ => 1} qw (alpha beta major); +my %valid_release_types = map {$_ => 1} qw (alpha beta stable); my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz'); sub usage ($) @@ -468,7 +468,7 @@ EOF print_news_deltas ($_, $prev_version, $curr_version) foreach @news_file; - $release_type eq 'major' + $release_type eq 'stable' or print_changelog_deltas ($package_name, $prev_version); exit 0; diff --git a/top/maint.mk b/top/maint.mk index fe6b3ff..68bd8f9 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -696,11 +696,11 @@ no-submodule-changes: : ; \ fi -.PHONY: alpha beta major -ALL_RECURSIVE_TARGETS += alpha beta major -alpha beta major: $(local-check) writable-files no-submodule-changes - test $@ = major \ - && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \ +.PHONY: alpha beta stable +ALL_RECURSIVE_TARGETS += alpha beta stable +alpha beta stable: $(local-check) writable-files no-submodule-changes + test $@ = stable \ + && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \ || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\ || : $(MAKE) vc-diff-check -- 1.6.5.rc2.177.ga9dd6
