X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=Makefile.in;h=ad78f7aafe0dc9a71b3b3d904a7827cf5d6ab7ff;hp=d5bc65a1422704560a9d6d2e4e1e0f03f2b0fbb1;hb=b5137c40bb0c051fc7cd5698d11f1d31b04b7170;hpb=e1ca34fbd3b08b29a47ed2929b460bd546d4cc25

diff --git a/Makefile.in b/Makefile.in
index d5bc65a14..ad78f7aaf 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,16 +9,60 @@ srcdir = @srcdir@
 EMACS = @EMACS@
 XEMACS = @EMACS@
 
+GZIP_PROG = @GZIP_PROG@
+
+SED_I = sed -i -e
+
+# # # # # # # # # # Release variables (for maintainer only):
+#
+# Files removed from `cvs export' output before creating the tar-ball:
+CVS_IGNORE_FILES = .cvsignore contrib/.cvsignore etc/.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 = 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
+#
+COMMIT_STRING = $(CODENAME)Gnus v$(VERSION) is released.
+# # # # # # # # # # End of release variables
+
 all: lick info
 
+fail-on-warning: lick-fail-on-warning info
+
 lick:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
+lick-fail-on-warning:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" fail-on-warning
+
 install:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
 	cd texi && $(MAKE) EMACS="$(EMACS)" install
 	cd etc && $(MAKE) EMACS="$(EMACS)" install
 
+list-installed-shadows:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" list-installed-shadows
+
+remove-installed-shadows:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" remove-installed-shadows
+
 uninstall:
 	cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall
 	cd texi && $(MAKE) uninstall
@@ -25,6 +71,9 @@ uninstall:
 GNUS-NEWS: texi/gnus-news.texi
 	cd texi && $(MAKE) GNUS-NEWS
 
+check:	
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" check
+
 # Rule for Lars and nobody else.
 some:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" some
@@ -35,10 +84,11 @@ info:
 	cd texi && $(MAKE) EMACS="$(EMACS)" all
 
 clean:
-	rm -f */*.orig */*.rej *.orig *.rej
+	for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) clean); done
+	rm -f *.orig *.rej *~
 
 elclean:
-	rm lisp/*.elc
+	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el gnus-load.el
 
 x:
 	$(MAKE) EMACS=$(XEMACS)
@@ -46,10 +96,8 @@ x:
 xsome:
 	$(MAKE) EMACS="$(XEMACS)" some
 
-distclean:
-	make clean
-	rm -rf *~
-	for i in lisp texi etc texi/ps; do (cd $$i; make distclean); done
+distclean: clean
+	for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) distclean); done
 	rm -f config.log config.status config.cache Makefile
 
 config.status: $(srcdir)/configure
@@ -59,6 +107,189 @@ $(srcdir)/configure: $(srcdir)/configure.in
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+# # # # # # # # # # Release targets (for maintainer only):
+
+release-check-settings:
+	@echo
+	@echo "COMMITTER = '$(COMMITTER)'"
+	@echo "  (example: 'Foo Bar  <foo.bar@somewhere.invalid>')"
+	@echo "VERSION   = '$(VERSION)' (example: '5.10.6')"
+	@echo "TAG       = '$(TAG)' (example: 'v5-10-6')"
+	@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
+	@echo
+	@echo Settings checked successfully.
+	@echo
+	@echo You may now make...
+	@echo   release-bump-version
+	@echo   release-add-changelog
+	@echo   release-commit
+	@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) '/^(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" -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) "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) "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:
+	rm -i      $(RELEASE_COMMIT_FILES)
+	cvs update $(RELEASE_COMMIT_FILES)
+
+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 "$(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
+	cvs tag $(TAG)
+
+release-files:	release-make-tar-ball release-diff
+	@echo "Release files have been created:"
+	@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 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 \
+	   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
+
+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 $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
+	$(GZIP_PROG) -f $(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 $(CIN)gnus-$(TAG) temp.diff
+
+# # # # # # # # # # End of release targets
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: