[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100649: Fix the MS-DOS build due to
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100649: Fix the MS-DOS build due to changes in configury. |
Date: |
Sat, 26 Jun 2010 17:41:12 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100649 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2010-06-26 17:41:12 +0300
message:
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.
modified:
ChangeLog
config.bat
msdos/ChangeLog
msdos/mainmake.v2
msdos/sed1v2.inp
=== modified file 'ChangeLog'
--- a/ChangeLog 2010-06-16 20:08:41 +0000
+++ b/ChangeLog 2010-06-26 14:36:27 +0000
@@ -1,3 +1,7 @@
+2010-06-26 Eli Zaretskii <address@hidden>
+
+ * config.bat: Remove white space around "+" in COPY commands.
+
2010-06-16 Chong Yidong <address@hidden>
* INSTALL: Update font information (Bug#6389).
=== modified file 'config.bat'
--- a/config.bat 2010-05-27 05:43:27 +0000
+++ b/config.bat 2010-06-26 14:36:27 +0000
@@ -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
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2010-06-03 22:16:02 +0000
+++ b/msdos/ChangeLog 2010-06-26 14:36:27 +0000
@@ -1,3 +1,14 @@
+2010-06-26 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.
=== modified file 'msdos/mainmake.v2'
--- a/msdos/mainmake.v2 2010-05-21 00:33:54 +0000
+++ b/msdos/mainmake.v2 2010-06-26 14:36:27 +0000
@@ -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
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2010-06-03 22:16:02 +0000
+++ b/msdos/sed1v2.inp 2010-06-26 14:36:27 +0000
@@ -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/@address@hidden@/./
@@ -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/@address@hidden@//
/^M_FILE *=/address@hidden@address@hidden/intel386.h!
/^S_FILE *=/address@hidden@address@hidden/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`|.|
+/^ address@hidden(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100649: Fix the MS-DOS build due to changes in configury.,
Eli Zaretskii <=