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

diff --git a/Makefile.in b/Makefile.in
index 9a1d2a1ed..23b240bba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,10 @@ srcdir = @srcdir@
 EMACS = @EMACS@
 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:
@@ -20,15 +24,20 @@ CODENAME =
 # Codename initial (lower case), e.g. 'n' for "No Gnus".
 CIN =
 # Files with hard-coded versions numbers:
-RELEASE_COMMIT_FILES = lisp/ChangeLog lisp/gnus.el \
+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
@@ -103,7 +112,7 @@ release-check-settings:
 	@echo "CODENAME  = '$(CODENAME)' (example: 'No ')"
 	@echo "CIN       = '$(CIN)' (example: 'n', codename initial)"
 	@echo "TAG       = '$(TAG)' (example: 'v5-10-6')"
-	@echo "OLDTAG    = '$(OLDTAG)' (example: 'v5-10-5')"
+	@echo "OLD_TAG   = '$(OLD_TAG)' (example: 'v5-10-5')"
 	@echo
 	@if [ x"$(VERSION)" = x ]; then echo "error: No VERSION given."; exit 1; else :; fi
 	@if [ x"$(TAG)" = x ]; then echo "error: No TAG given."; exit 1; else :; fi
@@ -115,26 +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) '/^(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 -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
+	  $(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) '/^(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) "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
 
@@ -146,13 +179,17 @@ release-commit:	release-check-settings
 	@echo -e '\007'
 	@echo
 	@echo "Really do the release-commit for $(CODENAME)Gnus v$(VERSION)?"
+	@echo "Command line:"
+	@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:"
+	@echo "  " cvs tag $(TAG)
 	@echo "Hit RET to continue or Ctrl-C to abort."
 	@echo
 	@read dummy
@@ -163,11 +200,20 @@ release-files:	release-make-tar-ball release-diff
 	@ls -l $(CIN)gnus-$(VERSION).tar.gz
 	@ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
-release-files-signed:	release-files
-	read -sp "Enter pass phrase: " phrase ; \
+release-files-signed:	release-files release-sign-files
+
+# Sign prepared files:
+release-sign-files:
+	if [ "x$$GPG_AGENT_INFO" = "x" ]; then \
+	  read -sp "Enter pass phrase: " phrase ; \
+	  gpg_opt="--passphrase-fd 0"; \
+	else \
+	  gpg_opt=""; phrase=""; \
+	fi; \
 	for i in $(CIN)gnus-$(VERSION).tar.gz \
 	         $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz; do \
-	   echo "$$phrase" | gpg --passphrase-fd 0 --detach-sign $$i ; \
+	   rm -f $$i.sig; \
+	   echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i; \
 	done; true
 	@ls -l $(CIN)gnus-$(VERSION).tar.gz{.sig,}
 	@ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,}
@@ -189,7 +235,7 @@ release-make-tar-ball:	$(CIN)gnus-$(VERSION)
 release-diff:	release-check-settings
 	cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true
 	mv temp.diff $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
-	gzip         $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
+	$(GZIP_PROG) $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
 	ls -l        $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
 release-post-clean:	release-check-settings