X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=Makefile.in;h=23b240bba01cc186f5b8ddfe1112a46d6fa9b903;hp=184dbe721f4b7bf54262e74c9f8e81fc923dce45;hb=a937c8dd0263adfabecdcedcbdb1eabc10c722b2;hpb=98a02086eced4bf90e159ee9ac30e1f10cf0aa5b

diff --git a/Makefile.in b/Makefile.in
index 184dbe721..23b240bba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,8 @@ XEMACS = @EMACS@
 
 GZIP_PROG = gzip -f
 
+SED_I = sed -i -e
+
 # # # # # # # # # # Release variables (for maintainer only):
 #
 # Files removed from `cvs export' output before creating the tar-ball:
@@ -25,13 +27,17 @@ CIN =
 RELEASE_COMMIT_FILES = ChangeLog README \
   lisp/ChangeLog lisp/gnus.el \
   texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi
-# Pattern matching previous version(s):
-OLD_PATTERN = 5.10.[0-9]*\|0\.3
+# Pattern matching previous version numbers:
+OLD_PATTERN = \(5\.[0-9][0-9]\.[0-9]*\|5\.[0-9][0-9]\|0\.[1-9][0-9]*\)
+# Codename pattern
+CODENAME_PATTERN = [A-Z]*[a-z]* *
 # CVS tag of the previous version:
 OLD_TAG     = v5-10-6
 # CVS tag of the current release:
 TAG  = v5-10
 #
+COMMIT_STRING = $(CODENAME)Gnus v$(VERSION) is released.
+#
 # Procedure:
 # - release-bump-version
 # - release-commit
@@ -118,32 +124,50 @@ release-check-settings:
 	@echo   release-commit
 	@echo   release-files or release-files-signed
 
+bump-version:
+	$(MAKE) COMMIT_STRING='Bump version to $(VERSION).' release-bump-version
+
+bump-version-commit:
+	$(MAKE) COMMIT_STRING='Bump version to $(VERSION).' release-commit
+
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:	release-check-settings
-	sed -i -e '/^(defconst gnus-version-number /s,"$(OLD_PATTERN)","$(VERSION)",' lisp/gnus.el
-	sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
-	sed -i -e '/^This manual corresponds to [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
-	sed -i -e '/^corresponding to this manual is [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
-	sed -i -e 's,/[a-z]*gnus-[0-9.]*/,/$(CIN)gnus-$(VERSION)/,' README
+	$(SED_I) '/^(defconst gnus-version-number /s,"$(OLD_PATTERN)","$(VERSION)",' lisp/gnus.el
+	$(SED_I) '/^.newcommand{.gnusversionname}{$(CODENAME_PATTERN)Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+	$(SED_I) '/^This manual corresponds to $(CODENAME_PATTERN)Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+	$(SED_I) '/^@samp.{$(CODENAME_PATTERN)Gnus v.*@c Adjust Makefile/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+	$(SED_I) '/^corresponding to this manual is $(CODENAME_PATTERN)Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
+	$(SED_I) 's,/[a-z]*gnus-[0-9.]*/,/$(CIN)gnus-$(VERSION)/,' README
+	if [ "x$(CODENAME)" = "x" ]; then \
+	  $(SED_I) '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
+	else \
+	  true; \
+	fi
+# Only for going from the development version to release...
 	if [ "x$(CODENAME)" = "x" ]; then \
-	  sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
+	  $(SED_I) '/^(defconst gnus-version /s,"$(CODENAME_PATTERN)Gnus v,"Gnus v,' lisp/gnus.el; \
+	  $(SED_I) '/^.newcommand{.gnusversionname}{$(CODENAME_PATTERN)Gnus v/s,$(CODENAME_PATTERN)Gnus v$(OLD_PATTERN),Gnus v$(VERSION),' texi/gnus.texi; \
+	  $(SED_I) '/^This manual corresponds to $(CODENAME_PATTERN)Gnus v/s,$(CODENAME_PATTERN)Gnus v$(OLD_PATTERN),Gnus v$(VERSION),' texi/gnus.texi; \
+	  $(SED_I) '/^corresponding to this manual is $(CODENAME_PATTERN)Gnus v/s,$(CODENAME_PATTERN)Gnus v$(OLD_PATTERN),Gnus v$(VERSION),' texi/message.texi; \
 	else \
 	  true; \
 	fi
+# Add ChangeLog entry...
 	@if grep -q "$(CODENAME)Gnus v$(VERSION) is released" ChangeLog; then \
 	  echo "ChangeLog is already updated"; \
 	else \
-	  sed -i -e "1s|^|`date -I`  $(COMMITTER)\n\n\t* README: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" ChangeLog; \
+	  $(SED_I) "1s|^|`date -I`  $(COMMITTER)\n\n\t* README: $(COMMIT_STRING)\n\n|" ChangeLog; \
 	fi
+	@echo "Updating ChangeLog files..."
 	@if grep -q "$(CODENAME)Gnus v$(VERSION) is released" texi/ChangeLog; then \
 	  echo "texi/ChangeLog is already updated"; \
 	else \
-	  sed -i -e "1s|^|`date -I`  $(COMMITTER)\n\n\t* gnus.texi, gnus-faq.texi, message.texi: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" texi/ChangeLog; \
+	  $(SED_I) "1s|^|`date -I`  $(COMMITTER)\n\n\t* gnus.texi, gnus-faq.texi, message.texi: $(COMMIT_STRING)\n\n|" texi/ChangeLog; \
 	fi
 	@if grep -q "$(CODENAME)Gnus v$(VERSION) is released" lisp/ChangeLog; then \
 	  echo "lisp/ChangeLog is already updated"; \
 	else \
-	  sed -i -e "1s|^|`date -I`  $(COMMITTER)\n\n\t* gnus.el: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" lisp/ChangeLog; \
+	  $(SED_I) "1s|^|`date -I`  $(COMMITTER)\n\n\t* gnus.el: $(COMMIT_STRING)\n\n|" lisp/ChangeLog; \
 	fi
 	cvs diff -U0 $(RELEASE_COMMIT_FILES); sleep 2
 
@@ -156,12 +180,12 @@ release-commit:	release-check-settings
 	@echo
 	@echo "Really do the release-commit for $(CODENAME)Gnus v$(VERSION)?"
 	@echo "Command line:"
-	@echo "  " cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES)
+	@echo "  " cvs commit -m "$(COMMIT_STRING)" $(RELEASE_COMMIT_FILES)
 	@echo
 	@echo "Hit RET to continue or Ctrl-C to abort."
 	@echo
 	@read dummy
-	cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES)
+	cvs commit -m "$(COMMIT_STRING)" $(RELEASE_COMMIT_FILES)
 	@echo
 	@echo "Add tag $(TAG) to CVS?"
 	@echo "Command line:"