X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=Makefile.in;h=9c7c7cbb763188d4fa8907671c4689f8b53a8dc2;hp=9e1466d1e5191f9cd361798b31f3d131747cc1ca;hb=97d82b45ea314d211c74dbc4121a4610df881fe6;hpb=828982bb6d18f42994d348f8840729419c194d28

diff --git a/Makefile.in b/Makefile.in
index 9e1466d1e..9c7c7cbb7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,6 @@
 prefix = @prefix@
+# Avoid "WARNING:  Makefile.in seems to ignore the --datarootdir setting":
+datarootdir = @datarootdir@
 datadir = @datadir@
 lispdir = @lispdir@
 srcdir = @srcdir@
@@ -7,33 +9,37 @@ srcdir = @srcdir@
 EMACS = @EMACS@
 XEMACS = @EMACS@
 
+GZIP_PROG = gzip -f
+
+SED_I = sed -i -e
+
 # # # # # # # # # # Release variables (for maintainer only):
 #
-# Release files, not included in CVS:
-TAR_BALL_EXTRA = README
 # Files removed from `cvs export' output before creating the tar-ball:
 CVS_IGNORE_FILES = .cvsignore contrib/.cvsignore etc/.cvsignore	\
-  lisp/.cvsignore texi/.cvsignore
+  lisp/.cvsignore texi/.cvsignore texi/ps/.cvsignore .arch-inventory
 # Name and mail address in ChangeLog format for the release commit:
 COMMITTER = Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 # CODENAME for development releases (CODENAME must have a trailing space,
 # (e.g. "Oort ")
 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 \
-  texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi
-# Pattern matching previous version(s):
-OLD_PATTERN = 5.10.[0-9]*
+RELEASE_COMMIT_FILES = ChangeLog \
+  etc/ChangeLog lisp/ChangeLog texi/ChangeLog \
+  README lisp/gnus.el \
+  texi/gnus.texi texi/message.texi texi/gnus-faq.texi
+# 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
 #
-# Procedure:
-# - release-bump-version
-# - release-commit
-# - release-files
-#
+COMMIT_STRING = $(CODENAME)Gnus v$(VERSION) is released.
 # # # # # # # # # # End of release variables
 
 all: lick info
@@ -100,9 +106,12 @@ release-check-settings:
 	@echo "COMMITTER = '$(COMMITTER)'"
 	@echo "  (example: 'Foo Bar  <foo.bar@somewhere.invalid>')"
 	@echo "VERSION   = '$(VERSION)' (example: '5.10.6')"
-	@echo "CODENAME  = '$(CODENAME)' (example: 'Oort ')"
 	@echo "TAG       = '$(TAG)' (example: 'v5-10-6')"
-	@echo "OLDTAG    = '$(OLDTAG)' (example: 'v5-10-5')"
+	@echo "OLD_TAG   = '$(OLD_TAG)' (example: 'v5-10-5')"
+	@echo
+	@echo "# Only for development versions:"
+	@echo "CODENAME  = '$(CODENAME)' (example: 'No ')"
+	@echo "CIN       = '$(CIN)' (example: 'n', codename initial)"
 	@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
@@ -111,30 +120,94 @@ release-check-settings:
 	@echo
 	@echo You may now make...
 	@echo   release-bump-version
+	@echo   release-add-changelog
 	@echo   release-commit
-	@echo   release-files
+	@echo   release-files or release-files-signed
+
+release-help:
+	@echo "Available targets for releases:"
+	@echo
+	@echo "[0]  release-help"
+	@echo "         Display this help message."
+	@echo
+	@echo "[1]  release-check-settings"
+	@echo "         Check it all required variables are specified on the command line."
+	@echo "         Run this target to display the variable names and current values."
+	@echo
+	@echo "[2]  release-bump-version"
+	@echo "         Bump the version to VERSION"
+	@echo
+	@echo "[3]  release-add-changelog"
+	@echo "         Add COMMITTER and COMMIT_STRING to the ChangeLogs."
+	@echo
+	@echo "[4]  release-commit"
+	@echo "         Commit the ChangeLogs and tag repository with TAG."
+	@echo
+	@echo "[5]  release-files or release-files-signed"
+	@echo "         Create the release tar-ball and diff file."
+	@echo "         release-files-signed creates detached GPG signature files as well."
+	@echo
+	@echo "For a release, steps [1]-[5] need to be done.  Immediately after"
+	@echo "the release, we bump the version again by performing steps [1]-[4]"
+	@echo "with the next VERSION and TAG."
+	@echo
+
+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 ]*Gnusv/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" -a "$(CODENAME_TO_STABLE)" = t ]; 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
+	$(MAKE) release-diff-commit-files
+
+# Add ChangeLog entry...
+release-add-changelog:	release-check-settings
+	@echo "Updating ChangeLog files..."
+	@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
+	@if grep -q "$(CODENAME)Gnus v$(VERSION) is released" etc/ChangeLog; then \
+	  echo "etc/ChangeLog is already updated"; \
+	else \
+	  $(SED_I) "1s|^|`date -I`  $(COMMITTER)\n\n\t* ChangeLog: $(COMMIT_STRING)\n\n|" etc/ChangeLog; \
+	fi
 	@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
+	$(MAKE) release-diff-commit-files
+
+release-diff-commit-files: release-check-settings
 	cvs diff -U0 $(RELEASE_COMMIT_FILES); sleep 2
 
 release-revert-files:
@@ -145,13 +218,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
@@ -159,34 +236,49 @@ release-commit:	release-check-settings
 
 release-files:	release-make-tar-ball release-diff
 	@echo "Release files have been created:"
-	@ls -l gnus-$(TAG).tar.gz
-	@ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
+	@ls -l $(CIN)gnus-$(VERSION).tar.gz
+	@ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
-release-cvs-export gnus-$(TAG):	release-check-settings
-	rm -fr gnus-$(TAG)
-	cvs export -d gnus-$(TAG) -r $(TAG) gnus
+release-files-signed:	release-files release-sign-files
 
-release-make-tar-ball:	gnus-$(TAG) $(TAR_BALL_EXTRA)
-	[ -d gnus-$(TAG) ] && cd gnus-$(TAG) && \
-	  rm $(CVS_IGNORE_FILES) || true
-	cp -p $(TAR_BALL_EXTRA) gnus-$(TAG)/
-	tar zcvf gnus-$(TAG).tar.gz gnus-$(TAG)
-	ls -l gnus-$(TAG).tar.gz
+# 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 \
+	   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,}
+	@gpg --verify $(CIN)gnus-$(VERSION).tar.gz{.sig,}
+	@gpg --verify $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,}
+
+release-cvs-export $(CIN)gnus-$(VERSION):	release-check-settings
+	rm -fr $(CIN)gnus-$(VERSION)
+	umask 0022; cvs export -d $(CIN)gnus-$(VERSION) -r $(TAG) gnus
 
-README:
-	@echo README is not in CVS.  Get it from Lars.
-	false
+release-make-tar-ball:	$(CIN)gnus-$(VERSION)
+	[ -d $(CIN)gnus-$(VERSION) ] && cd $(CIN)gnus-$(VERSION) && \
+	  rm $(CVS_IGNORE_FILES) || true
+	tar zcvf $(CIN)gnus-$(VERSION).tar.gz $(CIN)gnus-$(VERSION)
+	ls -l $(CIN)gnus-$(VERSION).tar.gz
 
 # Make a diff between current and previous release.  Example:
 # ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz
 release-diff:	release-check-settings
 	cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true
-	mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
-	gzip         gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
-	ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
+	mv temp.diff $(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
-	rm -fr gnus-$(TAG) temp.diff
+	rm -fr $(CIN)gnus-$(TAG) temp.diff
 
 # # # # # # # # # # End of release targets