Re: -DVERSION for emacsclient

["Juanma Barranquero" <lekktu@gmail.com>]

On 11/24/06, Eli Zaretskii <eliz@gnu.org> wrote:

> Because someone needs to remember to update the hardcoded string each
> time a new version is released.

Someone needs to remember pushing up the version anyway.

> Having that in admin.el is only a
> band-aid, since someone needs to remember to run it prior to a
> release.  That's a maintenance burden that we should avoid, I think.

Releasing a version inevitably requires certain amount of
administrative steps, and running admin.el seems like the less of it.
All depends, I suppose, on whether the steps to be followed by the
release manager are documented.

> However, given the amount of files we already handle in admin.el,
> perhaps adding lib-src/makefile.w32-in to the list isn't a big deal.
> Although I'd prefer that all those files except version.el were
> handled like we do with -DVERSION in lib-src/Makefile.in.

I propose the following little patch, that uses the admin.el route and
is minimally disruptive. After the release we can change this to use
the method you suggest.

                    /L/e/k/t/u


Index: admin/admin.el
===================================================================
RCS file: /cvsroot/emacs/emacs/admin/admin.el,v
retrieving revision 1.10
diff -u -2 -r1.10 admin.el
--- admin/admin.el	15 Oct 2006 04:19:36 -0000	1.10
+++ admin/admin.el	24 Nov 2006 23:45:35 -0000
@@ -89,4 +89,7 @@
  		       (rx (and "EMACSVER" (1+ space)
  				(submatch (1+ (in "0-9."))))))
+  (set-version-in-file root "lib-src/makefile.w32-in" version
+		       (rx (and "VERSION" (0+ space) "=" (0+ space)
+				(submatch (1+ (in "0-9."))))))
   ;; nt/emacs.rc also contains the version number, but in an awkward
   ;; format. It must contain four components, separated by commas, and
Index: lib-src/makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/makefile.w32-in,v
retrieving revision 2.50
diff -u -2 -r2.50 makefile.w32-in
--- lib-src/makefile.w32-in	13 Nov 2006 11:07:47 -0000	2.50
+++ lib-src/makefile.w32-in	24 Nov 2006 23:47:02 -0000
@@ -25,4 +25,6 @@
 .PHONY: $(ALL)

+VERSION =	22.0.91
+
  LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
  		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
@@ -69,5 +71,5 @@
  		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)

-ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
+ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\""
  ECLIENTOBJS =	$(BLD)/emacsclient.$(O) \
  		$(BLD)/getopt.$(O) \