From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: -DVERSION for emacsclient Date: Sat, 25 Nov 2006 00:55:36 +0100 Message-ID: References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1164412589 25278 80.91.229.2 (24 Nov 2006 23:56:29 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 24 Nov 2006 23:56:29 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 25 00:56:27 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GnkuA-00065m-U8 for ged-emacs-devel@m.gmane.org; Sat, 25 Nov 2006 00:56:27 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GnkuA-0006V3-BK for ged-emacs-devel@m.gmane.org; Fri, 24 Nov 2006 18:56:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Gnktq-0006Ti-SI for emacs-devel@gnu.org; Fri, 24 Nov 2006 18:56:06 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Gnktk-0006Sk-Bb for emacs-devel@gnu.org; Fri, 24 Nov 2006 18:56:06 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gnktk-0006Sh-6C for emacs-devel@gnu.org; Fri, 24 Nov 2006 18:56:00 -0500 Original-Received: from [64.233.166.178] (helo=py-out-1112.google.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1Gnktj-00059g-By for emacs-devel@gnu.org; Fri, 24 Nov 2006 18:55:59 -0500 Original-Received: by py-out-1112.google.com with SMTP id u77so604970pyb for ; Fri, 24 Nov 2006 15:55:36 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=eCqImD/2TsioZyRP0Kbr6g6NaCy3HWf2321yQOIglmNHGo0/OIbfqkk9G5HeKpGCsX1FiOIT13o0UTKOK85ZiCtKzaWYrTvzQLaG8mC1Zfh/B4BCgeZWxr3Lm5kiAgPvtPUtY1Otyx5G4HkJnUemTG03gg6m/UIFcjevBqB2Oac= Original-Received: by 10.35.50.1 with SMTP id c1mr6978244pyk.1164412536229; Fri, 24 Nov 2006 15:55:36 -0800 (PST) Original-Received: by 10.35.95.18 with HTTP; Fri, 24 Nov 2006 15:55:36 -0800 (PST) Original-To: "Eli Zaretskii" In-Reply-To: Content-Disposition: inline X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:62751 Archived-At: On 11/24/06, Eli Zaretskii 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) \