[Emacs-diffs] /srv/bzr/emacs/trunk r104295: Fix the MSDOS build following revisions 104265, 104280, 104289.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104295 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-20 12:55:14 +0300
message:
  Fix the MSDOS build following revisions 104265, 104280, 104289.
  
   config.bat: Concatenate lisp.mk onto the end of src/Makefile.
   msdos/sed1v2.inp (make-docfile commands): Recognize only if the line
   begins with a TAB.  Use $(etc) rather than a literal "../etc".
   (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
   (@lisp_frag@): Edit out.
   msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
   zero.
   src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to
   report_file_error introduced by the change from 2011-05-07.
   .bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h.
modified:
  .bzrignore
  ChangeLog
  config.bat
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sedlibmk.inp
  src/ChangeLog
  src/callproc.c

=== modified file '.bzrignore'
--- a/.bzrignore        2011-05-19 06:04:16 +0000
+++ b/.bzrignore        2011-05-20 09:54:04 +0000
@@ -51,7 +51,9 @@
 lib/c++defs.h
 lib/getopt.h
 lib/inttypes.h
+lib/stdbool.h
 lib/stdio.h
+lib/stdint.h
 lib/stdlib.h
 lib/sys/
 lib/time.h
@@ -61,6 +63,7 @@
 lib/stdbool.in-h
 lib/stddef.in-h
 lib/stdint.in-h
+lib/stdio.in-h
 lib/stdlib.in-h
 lib/sys_stat.in-h
 lib/time.in-h

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-05-20 00:41:03 +0000
+++ b/ChangeLog 2011-05-20 09:54:04 +0000
@@ -1,3 +1,9 @@
+2011-05-20  Eli Zaretskii  <address@hidden>
+
+       * .bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h.
+
+       * config.bat: Concatenate lisp.mk onto the end of src/Makefile.
+
 2011-05-20  Glenn Morris  <address@hidden>
 
        * configure.in (lisp_frag): New output file.

=== modified file 'config.bat'
--- a/config.bat        2011-03-31 04:24:03 +0000
+++ b/config.bat        2011-05-20 09:47:59 +0000
@@ -211,7 +211,7 @@
 
 rem   Create "makefile" from "makefile.in".
 rm -f Makefile makefile.tmp
-copy Makefile.in+deps.mk makefile.tmp
+copy Makefile.in+lisp.mk+deps.mk makefile.tmp
 sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile
 rm -f makefile.tmp
 

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2011-05-19 06:04:16 +0000
+++ b/msdos/ChangeLog   2011-05-20 09:47:59 +0000
@@ -1,3 +1,13 @@
+2011-05-20  Eli Zaretskii  <address@hidden>
+
+       * sed1v2.inp (make-docfile commands): Recognize only if the line
+       begins with a TAB.  Use $(etc) rather than a literal "../etc".
+       (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
+       (@lisp_frag@): Edit out.
+
+       * sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
+       zero.
+
 2011-05-19  Glenn Morris  <address@hidden>
 
        * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2011-05-19 06:04:16 +0000
+++ b/msdos/sed1v2.inp  2011-05-20 09:47:59 +0000
@@ -127,9 +127,10 @@
 /^M_FILE *=/address@hidden@!$(srcdir)/m/intel386.h!
 /^S_FILE *=/address@hidden@!$(srcdir)/s/msdos.h!
 /address@hidden@$/s/@SET_MAKE@//
-/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o 
../etc/DOC!
-/^.\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
+/^     [       
]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
+/^     [       
]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
 /^.\$(libsrc)\/make-doc/s!>.*$!!
+/^     [       ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp)!
 /^[   ]*$/d
 /^     if test -f/,/^  fi$/c\
        command.com /c if exist .gdbinit rm -f _gdbinit
@@ -161,6 +162,7 @@
 /^     -\{0,1\} *ln -/s/ln -f/cp -pf/
 /^[    ]touch /s/touch/djecho $@ >/
 s/@YMF_PASS_LDFLAGS@/flags/
+s/@lisp_frag@//
 s/@deps_frag@//
 s/@ns_frag@//
 s/@PRE_EDIT_LDFLAGS@//

=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp        2011-05-07 10:24:55 +0000
+++ b/msdos/sedlibmk.inp        2011-05-20 09:47:59 +0000
@@ -197,6 +197,7 @@
 /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/
 /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/
 /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/
+/^GNULIB_GROUP_MEMBER *=/s/@GNULIB_GROUP_MEMBER@/0/
 /^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/
 /^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/
 /^GNULIB_LINK *=/s/@GNULIB_LINK@/0/
@@ -328,6 +329,7 @@
 /^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/
 /^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/
 /^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/
+/^HAVE_GROUP_MEMBER *=/s/@HAVE_GROUP_MEMBER@/0/
 /^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/
 /^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/
 /^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-20 06:37:13 +0000
+++ b/src/ChangeLog     2011-05-20 09:47:59 +0000
@@ -1,3 +1,8 @@
+2011-05-20  Eli Zaretskii  <address@hidden>
+
+       * callproc.c (Fcall_process) [MSDOS]: Fix arguments to
+       report_file_error introduced by the change from 2011-05-07.
+
 2011-05-20  Paul Eggert  <address@hidden>
 
        * systime.h (Time): Define only if emacs is defined.
@@ -176,11 +181,11 @@
        (Fget_screen_color): New function.
        (syms_of_ntterm): Defsubr it.
 
-       * callproc.c (call_process_cleanup): Don't close and unlink the
-       temporary file if Fcall_process didn't create it in the first
-       place.
-       (Fcall_process): Don't create tempfile if stdout of the child
-       process will be redirected to a file specified with `:file'.
+       * callproc.c (call_process_cleanup) [MSDOS]: Don't close and
+       unlink the temporary file if Fcall_process didn't create it in the
+       first place.
+       (Fcall_process) [MSDOS]: Don't create tempfile if stdout of the
+       child process will be redirected to a file specified with `:file'.
        Don't try to re-open tempfile in that case, and set fd[0] to -1 as
        cue to call_process_cleanup not to close that handle.
 

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2011-05-07 11:25:05 +0000
+++ b/src/callproc.c    2011-05-20 09:47:59 +0000
@@ -577,7 +577,7 @@
            unlink (tempfile);
            emacs_close (filefd);
            report_file_error ("Cannot re-open temporary file",
-                              Fcons (tempfile, Qnil));
+                              Fcons (build_string (tempfile), Qnil));
          }
       }
     else