summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.maint24
2 files changed, 8 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c5e129a0..3d0f9af8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-12-01 Jim Meyering <meyering@redhat.com>
+ Change release procedure: tag *before* running e.g., "make stable".
+ * Makefile.maint (vc-dist): Don't tag. Now, you must apply the tag
+ before running "make beta", "make stable", etc.
+ (vc-tag-check): Remove rule. No longer makes sense.
+
* Makefile.maint (vc-tag-check): Correct check for existing git tag.
Defer NEWS and ChangeLog checks until after the version-changing tag.
diff --git a/Makefile.maint b/Makefile.maint
index 7a7326d4b..e9ab2e6b0 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -513,22 +513,6 @@ copyright-check:
exit 1; }; \
fi
-
-# Sanity checks with the repository.
-# Abort early if this tag has already been used.
-vc-tag-check:
- used=no; \
- if $(VC) --help | grep CVS; then \
- $(CVS) -n log -h README|grep -e $(this-vc-tag-regexp): >/dev/null \
- && used=yes; \
- else \
- test -n `$(GIT) tag -l '$(this-vc-tag)'` && used=yes; \
- fi; \
- if test "$$used" = yes; then \
- echo "$(this-vc-tag) has already been used; not tagging" 1>&2; \
- exit 1; \
- fi
-
vc-diff-check:
$(VC) diff > vc-diffs || :
if test -s vc-diffs; then \
@@ -539,18 +523,16 @@ vc-diff-check:
rm vc-diffs; \
fi
-cvs-check: vc-diff-check vc-tag-check
+cvs-check: vc-diff-check
maintainer-distcheck:
$(MAKE) distcheck
$(MAKE) my-distcheck
-# Tag before making distribution. Also, don't make a distribution if
-# checks fail. Also, make sure the NEWS file is up-to-date.
-# FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
+# Don't make a distribution if checks fail.
+# Also, make sure the NEWS file is up-to-date.
vc-dist: $(local-check) cvs-check maintainer-distcheck
- $(VC-tag) $(this-vc-tag)
$(MAKE) dist
# Use this to make sure we don't run these programs when building