X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=Makefile.in;h=537ef843b43742b783d0e38e4d453ec1c8c1829e;hp=23b240bba01cc186f5b8ddfe1112a46d6fa9b903;hb=f0bddc315ea0e052416bdd68b1b3166a9e1e9d22;hpb=a937c8dd0263adfabecdcedcbdb1eabc10c722b2 diff --git a/Makefile.in b/Makefile.in index 23b240bba..537ef843b 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@ @@ -24,9 +26,10 @@ CODENAME = # Codename initial (lower case), e.g. 'n' for "No Gnus". CIN = # Files with hard-coded versions numbers: -RELEASE_COMMIT_FILES = ChangeLog README \ - lisp/ChangeLog lisp/gnus.el \ - texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi +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 @@ -37,19 +40,18 @@ OLD_TAG = v5-10-6 TAG = v5-10 # COMMIT_STRING = $(CODENAME)Gnus v$(VERSION) is released. -# -# Procedure: -# - release-bump-version -# - release-commit -# - release-files or release-files-signed -# # # # # # # # # # # 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 @@ -69,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 @@ -109,11 +114,13 @@ release-check-settings: @echo "COMMITTER = '$(COMMITTER)'" @echo " (example: 'Foo Bar ')" @echo "VERSION = '$(VERSION)' (example: '5.10.6')" - @echo "CODENAME = '$(CODENAME)' (example: 'No ')" - @echo "CIN = '$(CIN)' (example: 'n', codename initial)" @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 @@ -121,9 +128,38 @@ release-check-settings: @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 @@ -144,7 +180,7 @@ release-bump-version: release-check-settings true; \ fi # Only for going from the development version to release... - if [ "x$(CODENAME)" = "x" ]; then \ + 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; \ @@ -152,13 +188,21 @@ release-bump-version: release-check-settings 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 - @echo "Updating ChangeLog files..." + @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 \ @@ -169,6 +213,9 @@ release-bump-version: release-check-settings 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: @@ -222,7 +269,7 @@ release-sign-files: release-cvs-export $(CIN)gnus-$(VERSION): release-check-settings rm -fr $(CIN)gnus-$(VERSION) - cvs export -d $(CIN)gnus-$(VERSION) -r $(TAG) gnus + 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) && \