msdos build patch

msdos build patch

[Glenn Morris]

Hi,

Does this patch (or something like it) look ok for the msdos build?
The motivation is to remove the last use of cpp in lib-src/Makefile.in.

(Sorry, Gnus complains about non-printable characters, so the
config.bat patch may have mangled line-endings.)

BTW, config.bat still seems to contain code for the
no-longer-supported DJGPP v1.x case.


*** config.bat	2010-05-07 11:21:29 +0000
--- config.bat	2010-05-10 06:03:53 +0000
***************
*** 231,236 ****
--- 231,241 ----
  sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
  :libsrc2
  rm -f makefile.new junk.c
+ if "%X11%" == "" goto libsrc2a
+ mv Makefile makefile.tmp
+ sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile
+ rm -f makefile.tmp
+ :libsrc2a
  if "%nodebug%" == "" goto libsrc3
  sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp
  sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile

*** lib-src/Makefile.in	2010-05-10 02:16:09 +0000
--- lib-src/Makefile.in	2010-05-10 05:55:58 +0000
***************
*** 167,177 ****
  # ========================== start of cpp stuff =======================
  /* From here on, comments must be done in C syntax.  */
  
- #ifdef MSDOS
- #include "../src/config.h"
- LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
- #endif
- 
  LOADLIBES=$(LIBS_SYSTEM)
  
  \f
--- 167,172 ----

*** msdos/sed1x.inp	2010-01-04 05:35:18 +0000
--- msdos/sed1x.inp	2010-05-10 05:58:19 +0000
***************
*** 5,10 ****
--- 5,11 ----
  s!^	@true *$!	@rem!
  s/DOC/DOC-X/g
  #/^LIBXMENU *=/s!= *!= ../oldxmenu/!
+ /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
  /^temacs *:/s!OLDXMENU!LIBXMENU!
  
  # arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19

*** src/Makefile.in	2010-05-10 02:16:09 +0000
--- src/Makefile.in	2010-05-10 05:56:13 +0000
***************
*** 322,328 ****
  #endif
  
  #ifdef MSDOS
- LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
  #ifdef HAVE_X_WINDOWS
  MSDOS_OBJ = dosfns.o msdos.o
  #else
--- 322,327 ----

*** src/s/msdos.h	2010-05-10 02:16:09 +0000
--- src/s/msdos.h	2010-05-10 06:04:34 +0000
***************
*** 140,148 ****
     commentary below, in the non-X branch.  The 140KB number was
     measured on GNU/Linux and on MS-WIndows.  */
  #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
- #define MSDOS_LIBS_SYSTEM -lxext -lsys
  #else
- #define MSDOS_LIBS_SYSTEM
  /* We need a little extra space, see ../../lisp/loadup.el.
     As of 20091024, DOS-specific files use up 62KB of pure space.  But
     overall, we end up wasting 130KB of pure space, because
--- 140,146 ----

*** /dev/null	2010-05-09 15:35:46.968393334 -0700
--- sed3x.inp	2010-05-09 23:01:24.000000000 -0700
***************
*** 0 ****
--- 1,5 ----
+ # -sed3x.inp------------------------------------------------------------
+ # Extra configuration script for lib-src/makefile for DesqView/X
+ # ----------------------------------------------------------------------
+ /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
+ 

Re: msdos build patch

[Eli Zaretskii]

> cc: emacs-devel@gnu.org
> From: Glenn Morris <rgm@gnu.org>
> Date: Mon, 10 May 2010 02:14:25 -0400
> 
> Does this patch (or something like it) look ok for the msdos build?
> The motivation is to remove the last use of cpp in lib-src/Makefile.in.

It's hard to say at a glance, and I don't have more than that for the
moment.  Go ahead and commit it, and I will try the result when I have
time.

> BTW, config.bat still seems to contain code for the
> no-longer-supported DJGPP v1.x case.

Right, I will remove that.

Thanks.

Re: msdos build patch

[Glenn Morris]

Eli Zaretskii wrote:

> It's hard to say at a glance, and I don't have more than that for the
> moment.  Go ahead and commit it, and I will try the result when I have
> time.

Thanks. The aim is that LIBS_SYSTEM in src and lib-src should be empty
in the non-X11 case, and -lxext -lsys otherwise.

Re: msdos build patch

[Eli Zaretskii]

> Date: Mon, 10 May 2010 20:13:12 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> > BTW, config.bat still seems to contain code for the
> > no-longer-supported DJGPP v1.x case.
> 
> Right, I will remove that.

Done.