Mercurial > emacs
changeset 109056:ca8db3772b39
Fix the MS-DOS build due to changes in configury.
config.bat: Remove white space around "+" in COPY commands.
msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c
instead of lisp/version.el (see revno 100306).
msdos/sed1v2.inp (MKDEPDIR): Edit to empty.
Delete lines in rules that invoke $(MKDEPDIR).
Fix editing rules that begin with "cd ../lisp".
Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 26 Jun 2010 17:36:27 +0300 |
| parents | 07e85c9b0a5a |
| children | 384a6f7da770 |
| files | ChangeLog config.bat msdos/ChangeLog msdos/mainmake.v2 msdos/sed1v2.inp |
| diffstat | 5 files changed, 34 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jun 26 15:21:24 2010 +0300 +++ b/ChangeLog Sat Jun 26 17:36:27 2010 +0300 @@ -1,3 +1,7 @@ +2010-06-26 Eli Zaretskii <eliz@gnu.org> + + * config.bat: Remove white space around "+" in COPY commands. + 2010-06-16 Chong Yidong <cyd@stupidchicken.com> * INSTALL: Update font information (Bug#6389).
--- a/config.bat Sat Jun 26 15:21:24 2010 +0300 +++ b/config.bat Sat Jun 26 17:36:27 2010 +0300 @@ -191,7 +191,7 @@ rem Create "makefile" from "makefile.in". rm -f Makefile makefile.tmp -copy Makefile.in + deps.mk makefile.tmp +copy Makefile.in+deps.mk makefile.tmp sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile rm -f makefile.tmp
--- a/msdos/ChangeLog Sat Jun 26 15:21:24 2010 +0300 +++ b/msdos/ChangeLog Sat Jun 26 17:36:27 2010 +0300 @@ -1,3 +1,14 @@ +2010-06-26 Eli Zaretskii <eliz@gnu.org> + + * mainmake.v2 (version): Use emacs_version[] in src/emacs.c + instead of lisp/version.el (see revno 100306). + + * sed1v2.inp (MKDEPDIR): Edit to empty. + Delete lines in rules that invoke $(MKDEPDIR). + Fix editing rules that begin with "cd ../lisp". + Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}. + Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule. + 2010-06-03 Dan Nicolaescu <dann@ics.uci.edu> * sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.
--- a/msdos/mainmake.v2 Sat Jun 26 15:21:24 2010 +0300 +++ b/msdos/mainmake.v2 Sat Jun 26 17:36:27 2010 +0300 @@ -65,7 +65,7 @@ top_srcdir := $(subst \,/,$(shell cd)) # Find out which version of Emacs this is. -version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el} +version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} # Q: Do we need to bootstrap? # A: Only if we find admin/admin.el, i.e. we are building out of
--- a/msdos/sed1v2.inp Sat Jun 26 15:21:24 2010 +0300 +++ b/msdos/sed1v2.inp Sat Jun 26 17:36:27 2010 +0300 @@ -20,12 +20,6 @@ s/^[ \f\t][ \f\t]*$// s/^ / / s/\.h\.in/.h-in/ -/^ LC_ALL=C \$(RUN_TEMACS)/i\ - stubedit temacs.exe minstack=1024k -/^ LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ -/-batch -l loadup/a\ - stubify emacs\ - stubedit emacs.exe minstack=2048k /^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ @@ -124,7 +118,7 @@ /^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexec.o/ /^CANNOT_DUMP *=/s/@cannot_dump@/no/ /^DEPFLAGS *=/s/@DEPFLAGS@// -/^MKDEPDIR *=/s/@MKDEPDIR@/:/ +/^MKDEPDIR *=/s/@MKDEPDIR@// /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! @@ -132,17 +126,29 @@ /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! /^.\${libsrc}make-doc/s!>.*$!! /^[ ]*$/d +/^ if test -f/,/^ fi$/c\ + command.com /c if exist .gdbinit rm -f _gdbinit /^temacs:/s/prefix-args// /^temacs:/s/stamp-oldxmenu// +/^ if test "\${CANNOT_DUMP}" =/,/^ else /d +/^ fi/d +/^ LC_ALL=C \$(RUN_TEMACS)/i\ + stubedit temacs.exe minstack=1024k +/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ +/-batch -l loadup/a\ + stubify emacs\ + stubedit emacs.exe minstack=2048k +s/ || exit 1\; \\$// +s/ || true\; \\$// /^RUN_TEMACS *=/s|`/bin/pwd`|.| +/^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d -/^ if test -f/c\ +/^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ else mv \.\/\.gdbinit/d /^ #/d /^ cd.*make-docfile/s!$!; cd ${dot}${dot}/src! /^ @: /d -/^ -\{0,1\}ln -/s/ln -f/cp -pf/ +/^ -\{0,1\} *ln -/s/ln -f/cp -pf/ /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ s/@deps_frag@// @@ -162,7 +168,7 @@ stubedit b-emacs.exe minstack=3072k\ djecho bootlisp > bootlisp /^ -\{0,1\}rm -f/s/\\#/#/ -/^ @\{0,1\}cd ..\/lisp; /s|$|\; cd ../src| +/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | # arch-tag: c7e3aacb-4162-460e-99f9-4252bca68d2c