comparison nt/xemacs.mak @ 1333:1b0339b048ce

[xemacs-hg @ 2003-03-02 09:38:37 by ben] To: xemacs-patches@xemacs.org PROBLEMS: Include nt/PROBLEMS and update. Add note about incremental linking badness. cmdloop.el, custom.el, dumped-lisp.el, files.el, keydefs.el, keymap.el, lisp-mode.el, make-docfile.el, replace.el, simple.el, subr.el, view-less.el, wid-edit.el: Lots of syncing with FSF 21.2. Use if-fboundp in wid-edit.el. New file newcomment.el from FSF. internals/internals.texi: Fix typo. (Build-Time Dependencies): New node. PROBLEMS: Delete. config.inc.samp, xemacs.mak: Eliminate HAVE_VC6, use SUPPORT_EDIT_AND_CONTINUE in its place. No incremental linking unless SUPPORT_EDIT_AND_CONTINUE, since it can cause nasty crashes in pdump. Put warnings about this in config.inc.samp. Report the full compile flags used for src and lib-src in the Installation output. alloc.c, lisp.h, ralloc.c, regex.c: Use ALLOCA() in regex.c to avoid excessive stack allocation. Also fix subtle problem with REL_ALLOC() -- any call to malloc() (direct or indirect) may relocate rel-alloced data, causing buffer text to shift. After any such call, regex must update all its pointers to such data. Add a system, when ERROR_CHECK_MALLOC, whereby regex.c indicates all the places it is prepared to handle malloc()/realloc()/free(), and any calls anywhere in XEmacs outside of this will trigger an abort. alloc.c, dialog-msw.c, eval.c, event-stream.c, general-slots.h, insdel.c, lisp.h, menubar-msw.c, menubar-x.c: Change *run_hook*_trapping_problems to take a warning class, not a string. Factor out code to issue warnings, add flag to call_trapping_problems() to postpone warning issue, and make *run_hook*_trapping_problems issue their own warnings tailored to the hook, postponed in the case of safe_run_hook_trapping_problems() so that the appropriate message can be issued about resetting to nil only when not `quit'. Make record_unwind_protect_restoring_int() non-static. dumper.c: Issue notes about incremental linking problems under Windows. fileio.c: Mule-ize encrypt/decrypt-string code. text.h: Spacing changes.
author ben
date Sun, 02 Mar 2003 09:38:54 +0000
parents 4542b72c005e
children 01c57eb70ae9
comparison
equal deleted inserted replaced
1332:6aa23bb3da6b 1333:1b0339b048ce
159 PROFILE_SUPPORT=0 159 PROFILE_SUPPORT=0
160 !endif 160 !endif
161 !if !defined(DEBUG_XEMACS) 161 !if !defined(DEBUG_XEMACS)
162 DEBUG_XEMACS=0 162 DEBUG_XEMACS=0
163 !endif 163 !endif
164 !if !defined(HAVE_VC6) 164 !if !defined(SUPPORT_EDIT_AND_CONTINUE)
165 HAVE_VC6=1 165 SUPPORT_EDIT_AND_CONTINUE=0
166 !endif 166 !endif
167 167
168 !if !defined(ERROR_CHECK_ALL) 168 !if !defined(ERROR_CHECK_ALL)
169 !if "$(emacs_is_beta)" != "" 169 !if "$(emacs_is_beta)" != ""
170 ERROR_CHECK_ALL=1 170 ERROR_CHECK_ALL=1
518 !endif 518 !endif
519 519
520 !if $(DEBUG_XEMACS) 520 !if $(DEBUG_XEMACS)
521 521
522 # ---- Debugging support ---- 522 # ---- Debugging support ----
523 ! if $(HAVE_VC6) 523 ! if $(SUPPORT_EDIT_AND_CONTINUE)
524 # support edit-and-continue 524 # support edit-and-continue
525 DEBUG_FLAGS_COMPILE=-ZI 525 DEBUG_FLAGS_COMPILE=-ZI
526 # WARNING: There is a very good reason for -incremental:no, as it can cause
527 # all sorts of weird crashes in or after a pdump load. We must allow
528 # incremental linking for edit-and-continue to work, however.
529 DEBUG_FLAGS_LINK=-debug:full
526 ! else 530 ! else
527 DEBUG_FLAGS_COMPILE=-Zi 531 DEBUG_FLAGS_COMPILE=-Zi
532 DEBUG_FLAGS_LINK=-debug:full -incremental:no
528 ! endif 533 ! endif
529 DEBUG_FLAGS_LINK=-debug:full
530 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG 534 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG
531 #BROWSERFLAGS=-Fr -Fd$(OUTDIR)\temacs.pdb 535 #BROWSERFLAGS=-Fr -Fd$(OUTDIR)\temacs.pdb
532 BROWSERFLAGS=-Fr$*.sbr -Fd$(OUTDIR)\temacs.pdb 536 BROWSERFLAGS=-Fr$*.sbr -Fd$(OUTDIR)\temacs.pdb
533 537
534 !else 538 !else
880 !endif 884 !endif
881 885
882 LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link $(DEBUG_FLAGS_LINK) 886 LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link $(DEBUG_FLAGS_LINK)
883 LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib 887 LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib
884 888
889 LIB_SRC_CFLAGS = $(CFLAGS) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES)
890
885 # Inferred rule 891 # Inferred rule
886 {$(LIB_SRC)}.c{$(BLDLIB_SRC)}.exe : 892 {$(LIB_SRC)}.c{$(BLDLIB_SRC)}.exe :
887 $(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS) 893 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS)
888 894
889 # Individual dependencies 895 # Individual dependencies
890 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c 896 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c
891 $(BLDLIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS) 897 $(BLDLIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
892 $(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS) 898 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS)
893 899
894 $(BLDLIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) 900 $(BLDLIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
895 901
896 # Minitar uses zlib so just use cdecl to simplify things 902 # Minitar uses zlib so just use cdecl to simplify things
897 $(BLDLIB_SRC)/minitar.exe : $(NT)/minitar.c 903 $(BLDLIB_SRC)/minitar.exe : $(NT)/minitar.c
1129 Building XEmacs in source tree "$(SRCROOT:\=\\)". 1135 Building XEmacs in source tree "$(SRCROOT:\=\\)".
1130 !if $(SEPARATE_BUILD) 1136 !if $(SEPARATE_BUILD)
1131 Building XEmacs into compiled tree "$(BLDROOT:\=\\)". 1137 Building XEmacs into compiled tree "$(BLDROOT:\=\\)".
1132 !endif 1138 !endif
1133 !if defined(CCV) 1139 !if defined(CCV)
1134 Using compiler "$(CC) $(CFLAGS)". 1140 For src, using compiler "$(CC) $(TEMACS_CPP_FLAGS)".
1141 For lib-src, using compiler "$(CC) $(LIB_SRC_CFLAGS)".
1135 !endif 1142 !endif
1136 !if $(CPLUSPLUS_COMPILE) 1143 !if $(CPLUSPLUS_COMPILE)
1137 Compiling as C++. 1144 Compiling as C++.
1138 !endif 1145 !endif
1139 Installing XEmacs in "$(INSTALL_DIR:\=\\)". 1146 Installing XEmacs in "$(INSTALL_DIR:\=\\)".
1260 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc 1267 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc
1261 TEMACS_LIBS=$(LASTFILE) $(MSW_LIBS) \ 1268 TEMACS_LIBS=$(LASTFILE) $(MSW_LIBS) \
1262 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ 1269 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
1263 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ 1270 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
1264 mpr.lib uuid.lib imm32.lib $(LIBC_LIB) 1271 mpr.lib uuid.lib imm32.lib $(LIBC_LIB)
1265 TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) -base:0x1000000\ 1272 TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
1266 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows\ 1273 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
1267 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map \ 1274 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map \
1268 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj 1275 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj
1269 1276
1270 ########################### Definitions for running temacs.exe/xemacs.exe 1277 ########################### Definitions for running temacs.exe/xemacs.exe
1271 1278