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: Pushing newer nt/subdirs.el into site-lisp/ Date: Wed, 31 Jan 2007 02:47:25 +0100 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1170208069 9298 80.91.229.12 (31 Jan 2007 01:47:49 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 31 Jan 2007 01:47:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Eli Zaretskii" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 31 02:47:38 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HC4ZW-00005K-8j for ged-emacs-devel@m.gmane.org; Wed, 31 Jan 2007 02:47:38 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HC4ZV-0006Sh-M0 for ged-emacs-devel@m.gmane.org; Tue, 30 Jan 2007 20:47:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HC4ZL-0006SS-Iy for emacs-devel@gnu.org; Tue, 30 Jan 2007 20:47:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HC4ZK-0006SG-U9 for emacs-devel@gnu.org; Tue, 30 Jan 2007 20:47:27 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HC4ZK-0006SD-PC for emacs-devel@gnu.org; Tue, 30 Jan 2007 20:47:26 -0500 Original-Received: from an-out-0708.google.com ([209.85.132.250]) by monty-python.gnu.org with esmtp (Exim 4.52) id 1HC4ZK-0005dg-Cx for emacs-devel@gnu.org; Tue, 30 Jan 2007 20:47:26 -0500 Original-Received: by an-out-0708.google.com with SMTP id b8so41737ana for ; Tue, 30 Jan 2007 17:47:26 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=nfZdHa9KC9+X6DLH3VZhNIxumpTWDtKtf2iT1f2g+WZ2NhTEFJecEe4LJCnVapQZP+nHmRX34l9pzgwNLXYljuHCCdU1tD+14NGxRT+rL6YvBm7GlGX2YA35SQqnw7Cb9CvMylFZvnhL6nDqRyhHqMWW5Dy0VuGs9ZC7XkWhoYw= Original-Received: by 10.114.181.1 with SMTP id d1mr11200waf.1170208045452; Tue, 30 Jan 2007 17:47:25 -0800 (PST) Original-Received: by 10.115.93.4 with HTTP; Tue, 30 Jan 2007 17:47:25 -0800 (PST) In-Reply-To: Content-Disposition: inline X-detected-kernel: Linux 2.6 (newer, 2) 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:65660 Archived-At: On 1/30/07, Eli Zaretskii wrote: > I don't think it's by design, but your patch is too intrusive: it > _always_ copies subdirs.el. Well, nothing depends on site-lisp/subdirs.el, so it's not like copying it is gonna cause any recompilation or something. > I'd rather use the technique we already > have in configure.bat to copy it only if it's different from the > already existing file. See the attached patch. AFAICS, the "fc /b foo.bar foo.bar" test is used to determine whether fc.exe exists and returns a meaningful value, so I've copied that too (but perhaps it'd be better to set a flag the first time the check is done instead of repeating it). /L/e/k/t/u Index: nt/configure.bat =================================================================== RCS file: /cvsroot/emacs/emacs/nt/configure.bat,v retrieving revision 1.35 diff -u -2 -r1.35 configure.bat --- nt/configure.bat 21 Jan 2007 04:26:22 -0000 1.35 +++ nt/configure.bat 31 Jan 2007 01:42:47 -0000 @@ -520,6 +520,15 @@ Rem Some people use WinZip which doesn't create empty directories! if not exist ..\site-lisp\nul mkdir ..\site-lisp\ -if not exist ..\site-lisp\subdirs.el copy subdirs.el ..\site-lisp\subdirs.el +Rem Update subdirs.el only if it is different or fc.exe doesn't work. +if exist foo.bar del foo.bar +fc /b foo.bar foo.bar >nul 2>&1 +if not errorlevel 2 goto doUpdateSubdirs +fc /b subdirs.el ..\site-lisp\subdirs.el >nul 2>&1 +if not errorlevel 1 goto dontUpdateSubdirs +:doUpdateSubdirs +if exist ..\site-lisp\subdirs.el del ..\site-lisp\subdirs.el +copy subdirs.el ..\site-lisp\subdirs.el +:dontUpdateSubdirs echo. echo Emacs successfully configured.