[PATCH] Update the version in just *one* place.

[Steve Youngs]

Kai!

To update the version in tramp.el and tramp.texi, all you need to
change is $VERSION in the toplevel Makefile.

I didn't touch the Japanese texi file (didn't want to stuff up the
encoding). 

NOTE: This patch has been committed.


Tramp patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected:               texi/ChangeLog lisp/ChangeLog ChangeLog
Source files diff command:    cvs -q diff -uN
Files affected:               texi/tramp.texi texi/Makefile lisp/tramp.el 
lisp/Makefile Makefile

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/ChangeLog,v
retrieving revision 1.18
diff -u -U0 -r1.18 ChangeLog
--- ChangeLog   23 Jul 2002 09:59:47 -0000      1.18
+++ ChangeLog   23 Jul 2002 16:44:14 -0000
@@ -0,0 +1,4 @@
+2002-07-24  Steve Youngs  <address@hidden>
+
+       * Makefile (all): Export $VERSION to the subdirectories.
+
Index: Makefile
===================================================================
RCS file: /cvsroot/tramp/tramp/Makefile,v
retrieving revision 2.13
diff -u -u -r2.13 Makefile
--- Makefile    23 Jul 2002 09:59:47 -0000      2.13
+++ Makefile    23 Jul 2002 16:43:33 -0000
@@ -23,7 +23,8 @@
 
 all:
        for a in ${DIRS}; do                                            \
-           $(MAKE) -C $$a "EMACS=$(EMACS)" "MAKEINFO=$(MAKEINFO)" all; \
+           $(MAKE) -C $$a "EMACS=$(EMACS)" "MAKEINFO=$(MAKEINFO)"      \
+               "VERSION=$(VERSION)" all;                               \
        done
 
 clean:
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.136
diff -u -U0 -r2.136 ChangeLog
--- lisp/ChangeLog      23 Jul 2002 09:59:47 -0000      2.136
+++ lisp/ChangeLog      23 Jul 2002 16:44:27 -0000
@@ -0,0 +1,9 @@
+2002-07-24  Steve Youngs  <address@hidden>
+
+       * Makefile (prepversion): New target to create tramp-version.el.
+       (all): Use it.
+       (clean): Add tramp-version.elc.
+
+       * tramp.el (tramp-version): Removed, we create it on the fly from
+       the Makefile.
+
Index: lisp/Makefile
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/Makefile,v
retrieving revision 2.4
diff -u -u -r2.4 Makefile
--- lisp/Makefile       25 Jan 2002 09:06:26 -0000      2.4
+++ lisp/Makefile       23 Jul 2002 16:43:39 -0000
@@ -11,7 +11,18 @@
 
 EM = $(EMACS) -batch $(EVAL) -f batch-byte-compile 
 
-all: tramp
+all: prepversion tramp
+
+prepversion:
+       @echo "(defconst tramp-version \"$(VERSION)\"" > tramp-version.el
+       @echo "  \"This version of tramp.\")" >> tramp-version.el
+       @echo "" >> tramp-version.el
+       @echo "(defun tramp-version (arg)" >> tramp-version.el
+       @echo "  \"Print version number of tramp.el in minibuffer or current 
buffer.\"" >> tramp-version.el
+       @echo "  (interactive \"P\")" >> tramp-version.el
+       @echo "  (if arg (insert tramp-version) (message tramp-version)))" >> 
tramp-version.el
+       @echo "" >> tramp-version.el
+       @echo "(provide 'tramp-version)" >> tramp-version.el
 
 tramp: tramp.elc tramp-vc.elc tramp-util.elc
 
@@ -23,7 +34,7 @@
        cd $(SLISP) && emacs-20.5 -batch -f batch-byte-compile tramp.el
 
 clean:
-       $(RM) *.elc
+       $(RM) *.elc tramp-version.el
 
 
 %.elc: %.el
Index: lisp/tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.141
diff -u -u -r2.141 tramp.el
--- lisp/tramp.el       23 Jul 2002 09:59:47 -0000      2.141
+++ lisp/tramp.el       23 Jul 2002 16:43:56 -0000
@@ -69,8 +69,7 @@
 
 ;;; Code:
 
-(defconst tramp-version "2.0.3"
-  "This version of tramp.")
+(require 'tramp-version)
 (defconst tramp-bug-report-address "address@hidden"
   "Email address to send bug reports to.")
 
@@ -1536,13 +1535,6 @@
     (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime))
         "Alist of handler functions.
 Operations not mentioned here will be handled by the normal Emacs functions.")
-
-;;; For better error reporting.
-
-(defun tramp-version (arg)
-  "Print version number of tramp.el in minibuffer or current buffer."
-  (interactive "P")
-  (if arg (insert tramp-version) (message tramp-version)))
 
 ;;; Internal functions which must come first.
 
Index: texi/ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/texi/ChangeLog,v
retrieving revision 2.33
diff -u -U0 -r2.33 ChangeLog
--- texi/ChangeLog      19 Jul 2002 14:37:41 -0000      2.33
+++ texi/ChangeLog      23 Jul 2002 16:44:37 -0000
@@ -0,0 +1,11 @@
+2002-07-24  Steve Youngs  <address@hidden>
+
+       * Makefile (prepversion): New target.  Creates
+       tramp-version.texi. 
+       (all): Use it.
+       (clean): Add tramp-version.texi.
+
+       * tramp.texi: Include tramp-version.texi.
+       (Top): Use macro defined in tramp-version.texi.
+       (copying): Ditto.
+
Index: texi/Makefile
===================================================================
RCS file: /cvsroot/tramp/tramp/texi/Makefile,v
retrieving revision 2.6
diff -u -u -r2.6 Makefile
--- texi/Makefile       19 Jul 2002 14:37:41 -0000      2.6
+++ texi/Makefile       23 Jul 2002 16:43:56 -0000
@@ -6,10 +6,16 @@
 INSTALL=install -m644
 SINFO=/app/unido-i06/sun4_56/edit/emacs/20.5/share/emacs/site-info
 
-all: tramp.info dvi tramp.html
+all: prepversion tramp.info dvi tramp.html
 
 clean:
-       -rm -f *.info *.html *~
+       -rm -f *.info *.html *~ tramp-version.texi
+
+prepversion:
+       @echo "@macro trampver{}" > tramp-version.texi
+       @echo "$(VERSION)" >> tramp-version.texi
+       @echo "@end macro" >> tramp-version.texi
+
 
 tramp.info: tramp.texi
        test -d ../info || mkdir ../info
Index: texi/tramp.texi
===================================================================
RCS file: /cvsroot/tramp/tramp/texi/tramp.texi,v
retrieving revision 2.32
diff -u -u -r2.32 tramp.texi
--- texi/tramp.texi     19 Jul 2002 07:51:36 -0000      2.32
+++ texi/tramp.texi     23 Jul 2002 16:44:03 -0000
@@ -8,6 +8,7 @@
 @c This is *so* much nicer :)
 @footnotestyle end
 
address@hidden tramp-version.texi
 
 @c Entries for @command{install-info} to use
 @dircategory Emacs
@@ -22,9 +23,8 @@
 @end macro
 
 @c Copying permissions, et al
address@hidden
-This file documents @tramp{}, a remote file editing package for Emacs and
-XEmacs.
address@hidden This file documents @tramp{} version @trampver{}, a remote file
+editing package for Emacs and XEmacs.
      
 Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software
 Foundation, Inc.
@@ -53,7 +53,7 @@
 @tex
 
 @titlepage
address@hidden @tramp{} User Manual
address@hidden @tramp{} version @trampver{} User Manual
 
 @author by Daniel Pittman
 @author based on documentation by Kai address@hidden
@@ -66,7 +66,7 @@
 
 @ifnottex
 @node Top, Overview, (dir), (dir)
address@hidden @tramp{} User Manual
address@hidden @tramp{} version @trampver{} User Manual
 
 @tramp{} stands for `Transparent Remote (file) Access, Multiple
 Protocol'.  This package provides remote file editing, similar to

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<address@hidden>---|