(OLD_PATTERN): Catch stable and trunk.

(CIN): New variable.
(release-files, release-files-signed, release-cvs-export)
(release-make-tar-ball, release-diff, release-post-clean): Add
CIN.

diff --git a/ChangeLog b/ChangeLog
index 07abfaf..0375384 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
        Remove; README is in CVS now.
        (release-files, release-files-signed, release-cvs-export)
        (release-make-tar-ball): Use $(VERSION) instead of $(TAG).
+       (OLD_PATTERN): Catch stable and trunk.
+       (CIN): New variable.
+       (release-files, release-files-signed, release-cvs-export)
+       (release-make-tar-ball, release-diff, release-post-clean): Add
+       CIN.
 
        * etc/images/README: Add more Emacs 22 icons.  Add suggestion on
        how to use those in Emacs 21.

diff --git a/Makefile.in b/Makefile.in
index 766a430..a7d4c04 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,11 +17,13 @@ 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]*
+OLD_PATTERN = '5.10.[0-9]*\|0\.3'
 # CVS tag of the previous version:
 OLD_TAG     = v5-10-6
 # CVS tag of the current release:
@@ -98,7 +100,8 @@ 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 "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
@@ -157,40 +160,40 @@ release-commit:   release-check-settings
 
 release-files: release-make-tar-ball release-diff
        @echo "Release files have been created:"
-       @ls -l gnus-$(VERSION).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-files-signed:  release-files
        read -sp "Enter pass phrase: " phrase ; \
-       for i in gnus-$(VERSION).tar.gz \
-                gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz; do \
+       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 ; \
        done; true
-       @ls -l gnus-$(VERSION).tar.gz{.sig,}
-       @ls -l gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,}
-       @gpg --verify gnus-$(VERSION).tar.gz{.sig,}
-       @gpg --verify gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,}
+       @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 gnus-$(VERSION):    release-check-settings
-       rm -fr gnus-$(VERSION)
-       cvs export -d gnus-$(VERSION) -r $(TAG) gnus
+release-cvs-export $(CIN)gnus-$(VERSION):      release-check-settings
+       rm -fr $(CIN)gnus-$(VERSION)
+       cvs export -d $(CIN)gnus-$(VERSION) -r $(TAG) gnus
 
-release-make-tar-ball: gnus-$(VERSION)
-       [ -d gnus-$(VERSION) ] && cd gnus-$(VERSION) && \
+release-make-tar-ball: $(CIN)gnus-$(VERSION)
+       [ -d $(CIN)gnus-$(VERSION) ] && cd $(CIN)gnus-$(VERSION) && \
          rm $(CVS_IGNORE_FILES) || true
-       tar zcvf gnus-$(VERSION).tar.gz gnus-$(VERSION)
-       ls -l gnus-$(VERSION).tar.gz
+       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         $(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