Pushing newer nt/subdirs.el into site-lisp/

Pushing newer nt/subdirs.el into site-lisp/

[Juanma Barranquero]

nt/configure.bat does not copy subdirs.el to site-lisp/ if it already
exists. That precludes pushing any changes in nt/subdirs.el into
site-lisp/.

Is that by design, or would be better to apply the following patch?


                    /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	30 Jan 2007 10:07:36 -0000
@@ -520,5 +520,6 @@
 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
+if exist ..\site-lisp\subdirs.el del ..\site-lisp\subdirs.el
+copy subdirs.el ..\site-lisp\subdirs.el

 echo.

Re: Pushing newer nt/subdirs.el into site-lisp/

[Eli Zaretskii]

> Date: Tue, 30 Jan 2007 11:16:39 +0100
> From: "Juanma Barranquero" <lekktu@gmail.com>
> 
> nt/configure.bat does not copy subdirs.el to site-lisp/ if it already
> exists. That precludes pushing any changes in nt/subdirs.el into
> site-lisp/.
> 
> Is that by design, or would be better to apply the following patch?

I don't think it's by design, but your patch is too intrusive: it
_always_ copies subdirs.el.  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.  Look in the section of configure.bat that
begins with "Rem See if fc.exe returns a meaningful exit status."

Re: Pushing newer nt/subdirs.el into site-lisp/

[Juanma Barranquero]

On 1/30/07, Eli Zaretskii <eliz@gnu.org> 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.

Re: Pushing newer nt/subdirs.el into site-lisp/

[Eli Zaretskii]

> Date: Wed, 31 Jan 2007 02:47:25 +0100
> From: "Juanma Barranquero" <lekktu@gmail.com>
> Cc: emacs-devel@gnu.org
> 
> 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).

Your patch is fine with me.