Mercurial > emacs
changeset 108593:5daf8821df70
config.bat: Remove support for DJGPP v1.x.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 15 May 2010 10:51:52 +0300 |
| parents | d1257e56bb95 |
| children | a5969c855306 |
| files | ChangeLog config.bat |
| diffstat | 2 files changed, 8 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 15 10:19:59 2010 +0300 +++ b/ChangeLog Sat May 15 10:51:52 2010 +0300 @@ -1,3 +1,7 @@ +2010-05-15 Eli Zaretskii <eliz@gnu.org> + + * config.bat: Remove support for DJGPP v1.x. + 2010-05-15 Glenn Morris <rgm@gnu.org> * configure.in (OLDXMENU_TARGET): New output variable.
--- a/config.bat Sat May 15 10:19:59 2010 +0300 +++ b/config.bat Sat May 15 10:51:52 2010 +0300 @@ -23,7 +23,7 @@ rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: rem rem + msdos version 3 or better. -rem + DJGPP version 1.12maint1 or later (version 2.03 or later recommended). +rem + DJGPP version 2.0 or later (version 2.03 or later recommended). rem + make utility that allows breaking of the 128 chars limit on rem command lines. ndmake (as of version 4.5) won't work due to a rem line length limit. The make that comes with DJGPP does work (and is @@ -125,11 +125,10 @@ Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed! Goto End :go32Ok -set djgpp_ver=1 -If ErrorLevel 20 set djgpp_ver=2 +set djgpp_ver=2 +If Not ErrorLevel 20 Echo To build 'Emacs' you need DJGPP v2.0 or later! +If Not ErrorLevel 20 Goto End rm -f junk.c junk junk.exe -rem The v1.x build does not need djecho -if "%DJGPP_VER%" == "1" Goto djechoOk rem DJECHO is used by the top-level Makefile in the v2.x build Echo Checking whether 'djecho' is available... redir -o Nul -eo djecho -o junk.$$$ foo @@ -159,12 +158,7 @@ if "%X11%" == "" goto src4 sed -f ../msdos/sed2x.inp <config.in >config.tmp :src4 -if "%DJGPP_VER%" == "2" Goto src41 -sed -f ../msdos/sed2.inp <config.tmp >config.h2 -goto src42 -:src41 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2 -:src42 Rem See if DECL_ALIGN can be supported with this GCC rm -f junk.c junk.o junk junk.exe echo struct { int i; char *p; } __attribute__((__aligned__(8))) foo; >junk.c @@ -198,12 +192,7 @@ rem Create "makefile" from "makefile.in". rm -f Makefile junk.c sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c -If "%DJGPP_VER%" == "1" Goto mfV1 gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile -goto mfDone -:mfV1 -gcc -E -traditional junk.c | sed -f ../msdos/sed1.inp >Makefile -:mfDone rm -f junk.c if "%X11%" == "" goto src5 @@ -221,12 +210,7 @@ rem ---------------------------------------------------------------------- Echo Configuring the library source directory... cd lib-src -If "%DJGPP_VER%" == "2" goto libsrc-v2 -sed -f ../msdos/sed3.inp <Makefile.in >Makefile -Goto libsrc2 -:libsrc-v2 sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile -:libsrc2 if "%X11%" == "" goto libsrc2a mv Makefile makefile.tmp sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile @@ -272,7 +256,6 @@ Echo Configuring the main directory... If Exist .dir-locals.el update .dir-locals.el _dir-locals.el If Exist src\.dbxinit update src/.dbxinit src/_dbxinit -If "%DJGPP_VER%" == "1" goto mainv1 Echo Looking for the GDB init file... If Exist src\.gdbinit update src/.gdbinit src/_gdbinit If Exist src\_gdbinit goto gdbinitOk @@ -287,8 +270,6 @@ :gdbinitOk Echo Looking for the GDB init file...found copy msdos\mainmake.v2 Makefile >nul -:mainv1 -If "%DJGPP_VER%" == "1" copy msdos\mainmake Makefile >nul rem ---------------------------------------------------------------------- goto End :SmallEnv