diff options
author | Eli Zaretskii <eliz@gnu.org> | 2016-04-30 13:45:33 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2016-04-30 13:45:33 +0300 |
commit | ccdaf04cfdaa42fb85d456274405cce32ee9f5d4 (patch) | |
tree | 631c59e4dad1db81cca00edeaa721ae8c0e522e5 /msdos/sed1v2.inp | |
parent | ffe701cb07cfb3584c4e4894976f0c9487d02c59 (diff) | |
download | emacs-ccdaf04cfdaa42fb85d456274405cce32ee9f5d4.tar.gz |
Fix the MSDOS build
* config.bat:
* msdos/sedlisp.inp:
* msdos/sedlibmk.inp:
* msdos/sedleim.inp:
* msdos/sedadmin.inp:
* msdos/sed6.inp:
* msdos/sed3v2.inp:
* msdos/sed2v2.inp:
* msdos/sed1v2.inp: Adapt to Emacs 25.
* src/process.c (remove_slash_colon): Move out of "#ifdef
subprocesses" block, as it its called unconditionally. Move
ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they
reference variables only defined in that block.
* src/msdos.h: Provide prototypes for IT_set_frame_parameters,
faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask,
dos_keysns, dos_keyread, run_msdos_command, and
syms_of_win16select, to avoid compiler warnings.
* src/msdos.c (SYS_ENVIRON): Define to either '_environ' or
'environ', depending on the DJGPP version.
Remove declarations of externally-visible Lisp objects, like
Qbackground_color and Qreverse.
(run_msdos_command): First argument is not signed, not unsigned.
Use SYS_ENVIRON.
(sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as
the latter doesn't work when 'time_t' is an unsigned data type.
This caused idle timers to behave incorrectly: they only fired
after a keyboard input event.
* src/frame.c (adjust_frame_size) [MSDOS]: Account for
FRAME_TOP_MARGIN that isn't counted in the frame's number of
lines, but dos_set_window_size needs it to be added.
* src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions.
* src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype
that works around compilation errors with older GCC versions.
* src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp
Objects.
* src/filelock.c [MSDOS]: Ifdef away most of the code. Provide
no-op implementations for 'lock_file' and 'unlock_file'.
(Ffile_locked_p) [MSDOS]: Always return nil. This avoids multiple
ifdefs in all users of filelock.c functionality.
* src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define.
* src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler
warnings.
* src/dosfns.h: Provide prototypes for dos_cleanup,
syms_of_dosfns, and init_dosfns.
* src/deps.mk (atimer.o): Depend on msdos.h.
(emacs.o): Depend on dosfns.h.
* src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler
warnings.
* lisp/window.el (window--adjust-process-windows): Skip the body
if 'process-list' is not available. This avoids failure to start
up on MS-DOS.
* lisp/vc/diff.el (diff-no-select): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
* lisp/textmodes/ispell.el (ispell-async-processp): Replace
'start-process' with 'make-process' in a comment.
* lisp/term/internal.el (IT-unicode-translations): Modify and add
a few translations to display Info files with Unicode markup. Fix
an ancient off-by-one mismatch error with Unicode codepoints.
* lisp/progmodes/compile.el (compilation-start): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/man.el (Man-build-man-command, Man-getpage-in-background):
Test 'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/international/mule-cmds.el (set-coding-system-map): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc
fix.
(eshell-execute-pipeline): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
Diffstat (limited to 'msdos/sed1v2.inp')
-rw-r--r-- | msdos/sed1v2.inp | 119 |
1 files changed, 62 insertions, 57 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 71646821a59..383105a3f30 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -15,32 +15,24 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- -s/^#.*// s/^[ \f\t][ \f\t]*$// s/^ / / s/\.h\.in/.h-in/ -/^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ -/^abs_builddir *=/s|@abs_builddir@|../src| -/^VPATH *=/s/@[^@\n]*@/./ -/^CC *=/s/@[^@\n]*@/gcc/ -/^CPP *=/s/@[^@\n]*@/gcc -e/ +/^top_srcdir *=/s/@[^@\n]*@/../ +/^CC *=/s/@[^@\n]*@/gcc -std=gnu99/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/ /^ALL_CFLAGS *=/s/@[^@\n]*@//g /^ALL_CFLAGS *=/s/ -I\.//g /^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos| /^LDFLAGS *=/s/@[^@\n]*@// -/^LD_FIRSTFLAG *=/s/@[^@\n]*@// -/^LIBS *=/s/@[^@\n]*@// -/^LIBES *=/,/^ *$/ { - s/@[^@\n]*@//g -} /^LIBOBJS *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +/^PNG_CFLAGS *=/s/@PNG_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// @@ -64,6 +56,7 @@ s/ *@LIBPNG@// s/ *@LIBGIF@// s/ *@LIBXPM@// /^XFT_LIBS *=/s/@XFT_LIBS@// +/^XCB_LIBS *=/s/@XCB_LIBS@// /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// /^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@// @@ -78,7 +71,8 @@ s/ *@LIBXPM@// /^NOTIFY_OBJ *=/s/@NOTIFY_OBJ@// /^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@// /^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@// -/^GFILENOTIFY_LIBS *=/s/@GFILENOTIFY_LIBS@// +/^NOTIFY_LIBS *=/s/@NOTIFY_LIBS@// +/^NOTIFY_CFLAGS *=/s/@NOTIFY_CFLAGS@// /^GTK_OBJ *=/s/@GTK_OBJ@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ @@ -92,7 +86,7 @@ s/ *@LIBXPM@// /^XGSELOBJ *=/s/@XGSELOBJ@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// -/^LIBS_GNUSTEP *=/s/@LIBS_GNUSTEP@// +/^LIBS_GNUSTEP *=/s/=.*$/=/ /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// @@ -101,15 +95,23 @@ s/ *@LIBXPM@// /^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@// /^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// +/^XWIDGETS_OBJ *=/s/@XWIDGETS_OBJ@// +/^WEBKIT_LIBS *=/s/@WEBKIT_LIBS@// +/^WEBKIT_CFLAGS *=/s/@WEBKIT_CFLAGS@// +/^CAIRO_LIBS *=/s/@CAIRO_LIBS@// +/^CAIRO_CFLAGS *=/s/@CAIRO_CFLAGS@// +/^XFIXES_LIBS *=/s/@XFIXES_LIBS@// +/^XFIXES_CFLAGS *=/s/@XFIXES_CFLAGS@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ /^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// -/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// +/^GNU_OBJC_CFLAGS*=/s/=.*$/=/ /^LIBRESOLV *=/s/@LIBRESOLV@// +/^LIBMODULES *=/s/@LIBMODULES@// +/^MODULES_OBJ *=/s/@MODULES_OBJ@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// -/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIB_EXECINFO *=/s/@[^@\n]*@//g @@ -145,65 +147,59 @@ s/ *@LIBXPM@// /^W32_LIBS *=/s/@W32_LIBS@// /^version *=/s/@[^@\n]*@// /^EMACSRES *=/s/@EMACSRES@// -/^EMACS_MANIFEST *=/s/@EMACS_MANIFEST@// /^W32_RES_LINK *=/s/@W32_RES_LINK@// /^CM_OBJ *=/s/@CM_OBJ@/cm.o/ /^@SET_MAKE@$/s/@SET_MAKE@// -/^TEMACS_POST_LINK *=/s/@TEMACS_POST_LINK@/stubedit temacs.exe minstack=1024k/ /^ADDSECTION *=/s/@ADDSECTION@// -/^ [ ]*\$(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); cd ../src! -/^[ ]*$/d -/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/temacs$(EXEEXT) $(BOOTSTRAPEMACS)/ +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ +/^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/ +/^PAXCTL_if_present *=/s/=.*$/=@Rem/ +/^lisp\.mk:/,/^$/c\ +lisp.mk: $(lispsource)/loadup.el\ + @rm -f $@\ + ${AM_V_GEN}printf 'shortlisp = \\n' > $@\ + ${AM_V_GEN}sed -n 's/^[ \t]*(load "\([^"]*\)".*/\1/p' $< | sed -e "s/$/.elc \/" -e "s/\.el\.elc/.el/" >> $@\ + ${AM_V_GEN}djecho "" >> $@ + +#" + +/^ [ ]*\$(AM_V_at)\$(libsrc)\/make-docfile -d/s!make-docfile!make-docfile -o $(etc)/DOC! +/ > \$(etc)\/DOC *$/s/ >.*$// +/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-docfile.*>.*globals.tmp/s!make-docfile!make-docfile -o globals.tmp! +/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-doc/s!>.*$!! +/^\$(libsrc)\/make-docfile\$(EXEEXT): /i\ + cd ../src +/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/ /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ *test "X\$(PAXCTL)" = X/d -/^ *test "\$(CANNOT_DUMP)" = "yes"/d -/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d -/^ *\$(SETFATTR) -n/d -/^ -\{0,1\} *ln /s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/ +/^ *\$(PAXCTL_if_present) -zex/d +/^ *ln /s/ln /cp / +/^ *\$(SETFATTR_if_present) -n/d /^ fi/d +/^ *\$(RUN_TEMACS) /i\ + stubedit temacs.exe minstack=1024k /^ *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\; \\$// + stubedit emacs.exe minstack=3072k s/ @true *$/ @rem/ s/^ [^ ]*move-if-change / update / -/^ echo[ ][ ]*timestamp/s/echo /djecho / +/^ [^ ]*echo[ ][ ]*timestamp/s/echo /djecho / /^ .*djecho timestamp/a\ - @rm -f gl.tmp -/^ cd ..\/leim && \$(MAKE)/i\ - $(RUN_TEMACS) -batch -l loadup dump\ - stubify emacs\ - stubedit emacs.exe minstack=2048k\ - rm -f b-emacs$(EXEEXT)\ - cp emacs$(EXEEXT) b-emacs$(EXEEXT) -/^ cd ..\/leim && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C ../leim leim-list.el EMACS=$(bootstrap_exe) -/^ cd ..\/admin\/unidata && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" -/^ cd \$(lib) && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C $(lib) libgnu.a -/^RUN_TEMACS *=/s|`/bin/pwd`|.| + @rm -f globals.tmp /^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit /^ #/d -/^ cd.*make-docfile/s!$!; cd ../src! /^ @: /d /^ -\{0,1\} *ln /s/ln /cp / /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ -s/@lisp_frag@// -s/@deps_frag@// -s/@ns_frag@// s/@PRE_EDIT_LDFLAGS@// s/@POST_EDIT_LDFLAGS@// s/bootstrap-emacs/b-emacs/ @@ -211,21 +207,24 @@ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/ /rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/ s/echo.*buildobj.lst/dj&/ -/ --load loadup bootstrap/i\ - stubedit temacs.exe minstack=1024k / --load loadup bootstrap/a\ stubify emacs /^ mv -f emacs/a\ stubedit b-emacs.exe minstack=3072k\ djecho bootlisp > bootlisp /^ -\{0,1\}rm -f/s/\\#/#/ -/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| -/^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | -/^buildobj\.h:/,/^ mv /{ - /^ *for /,/^ *done /c\ +/^buildobj\.h:/,/^ *\$(AM_V_at)mv /{ + /^ *\$(AM_V_GEN)for /,/^ *done /c\ djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"/' -e 's/ */", "/g' >>$@.tmp } +# Remove or replace dependencies we cannot have +/^\.PRECIOUS: /s!\.\./config.status !! +/^\.\.\/config.status: /d +/^Makefile: /s!\.\./config.status !! +/^\$(top_srcdir)\/aclocal\.m4 /,/^doc\.o:/c\ +\ +doc.o: buildobj.h # Make the GCC command line fit one screen line /^[ ][ ]*\$(GNUSTEP_CFLAGS)/d /^[ ][ ]*\$(GCONF_CFLAGS)/d @@ -233,7 +232,13 @@ s/echo.*buildobj.lst/dj&/ s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) // s/ \$(C_SWITCH_X_SITE)// s/ \$(DBUS_CFLAGS)// -s| -I\$(srcdir)/../lib|| +s/ \$(PNG_CFLAGS) // +s/ \$(XINERAMA_CFLAGS)// +s/ \$(XFIXES_CFLAGS)// +s/ \$(FREETYPE_CFLAGS)// +s/ \$(FONTCONFIG_CFLAGS)// +s| -I\$(srcdir)/\.\./lib|| +s| -I\$(top_srcdir)/lib|| # Add our local inttypes.h to prerequisites where needed /^lread\.o:/s|lread\.c|& ../msdos/inttypes.h| /^ *test "X/d |