comparison nt/xemacs.mak @ 814:a634e3b7acc8

[xemacs-hg @ 2002-04-14 12:41:59 by ben] latest changes TODO.ben-mule-21-5: Update. make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse the basic charset designation sequences so we know whether we're in ASCII and have to pay attention to end quotes and such. Reformat code according to coding standards. abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if non-nil, defining an abbrev through an interactive function will automatically turn on abbrev-mode, either globally or locally depending on the command. This is the "what you'd expect" behavior. indent.el: general function for indenting a balanced expression in a mode-correct way. Works similar to indent-region in that a mode can specify a specific command to do the whole operation; if not, figure out the region using forward-sexp and indent each line using indent-according-to-mode. keydefs.el: Removed. Modify M-C-backslash to do indent-region-or-balanced-expression. Make S-Tab just insert a TAB char, like it's meant to do. make-docfile.el: Now that we're using the call-process-in-lisp, we need to load an extra file win32-native.el because we're running a bare temacs. menubar-items.el: Totally redo the Cmds menu so that most used commands appear directly on the menu and less used commands appear in submenus. The old way may have been very pretty, but rather impractical. process.el: Under Windows, don't ever use old-call-process-internal, even in batch mode. We can do processes in batch mode. subr.el: Someone recoded truncate-string-to-width, saying "the FSF version is too complicated and does lots of hard-to-understand stuff" but the resulting recoded version was *totally* wrong! it misunderstood the basic point of this function, which is work in *columns* not chars. i dumped ours and copied the version from FSF 21.1. Also added truncate-string-with-continuation-dots, since this idiom is used often. config.inc.samp, xemacs.mak: Separate out debug and optimize flags. Remove all vestiges of USE_MINIMAL_TAGBITS, USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those ifdefs have long been removed. Make error-checking support actually work. Some rearrangement of config.inc.samp to make it more logical. Remove callproc.c and ntproc.c from xemacs.mak, no longer used. Make pdump the default. lisp.h: Add support for strong type-checking of Bytecount, Bytebpos, Charcount, Charbpos, and others, by making them classes, overloading the operators to provide integer-like operation and carefully controlling what operations are allowed. Not currently enabled in C++ builds because there are still a number of compile errors, and it won't really work till we merge in my "8-bit-Mule" workspace, in which I make use of the new types Charxpos, Bytexpos, Memxpos, representing a "position" either in a buffer or a string. (This is especially important in the extent code.) abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type checking of Bytecount, Charbpos, etc. dired.c: Caught an actual error due to strong type checking -- char len being passed when should be byte len. alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall: -- process arg list at compiled-function creation time, converting into an array for extra-quick access at funcall time. -- rewrite funcall_compiled_function to use it, and inline this function. -- change the order of check for magic stuff in SPECBIND_FAST_UNSAFE to be faster. -- move the check for need to garbage collect into the allocation code, so only a single flag needs to be checked in funcall. buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and strings. eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under pdump. Redo a bit some of the init routines; convert some complex_vars_of() into simple vars_of(), because they didn't need complex processing. callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god but Allah!!! fix so that processes can be invoked in bare temacs -- thereby eliminating any need for callproc.c. (currently only eliminated under NT.) remove all crufty and unnecessary old process code in ntproc.c and elsewhere. move non-callproc-specific stuff (mostly environment) into process.c, so callproc.c can be left out under NT. console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs. change handling of "character mode" so callers don't have to manually set it (quite error-prone). event-msw.c: spacing fixes. lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code. lrecord.h: improve pdump description docs. buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized before by simply always calling the ...A versions of functions, but that won't cut it -- eventually we want to be able to run properly even if XEmacs has been installed in a Japanese directory. (The current problem is the timing of the loading of the Unicode tables; this will eventually be fixed.) Go through and fix various other places where the code was not Mule-clean. Provide a function mswindows_get_module_file_name() to get our own name without resort to PATH_MAX and such. Add a big comment in main() about the problem with Unicode table load timing that I just alluded to. emacs.c: When error-checking is enabled (interpreted as "user is developing XEmacs"), don't ask user to "pause to read messages" when a fatal error has occurred, because it will wedge if we are in an inner modal loop (typically when a menu is popped up) and make us unable to get a useful stack trace in the debugger. text.c: Correct update_entirely_ascii_p_flag to actually work. lisp.h, symsinit.h: declarations for above changes.
author ben
date Sun, 14 Apr 2002 12:43:31 +0000
parents f846c2ef930d
children 66265f190a16
comparison
equal deleted inserted replaced
813:9541922fb765 814:a634e3b7acc8
181 USE_UNION_TYPE=0 181 USE_UNION_TYPE=0
182 !endif 182 !endif
183 !if !defined(USE_MINITAR) 183 !if !defined(USE_MINITAR)
184 USE_MINITAR=$(HAVE_ZLIB) 184 USE_MINITAR=$(HAVE_ZLIB)
185 !endif 185 !endif
186 !if !defined(USE_MINIMAL_TAGBITS)
187 USE_MINIMAL_TAGBITS=0
188 !endif
189 !if !defined(USE_INDEXED_LRECORD_IMPLEMENTATION)
190 USE_INDEXED_LRECORD_IMPLEMENTATION=0
191 !endif
192 !if !defined(USE_PORTABLE_DUMPER) 186 !if !defined(USE_PORTABLE_DUMPER)
193 USE_PORTABLE_DUMPER=0 187 USE_PORTABLE_DUMPER=1
194 !endif
195 !if !defined(GUNG_HO)
196 GUNG_HO=0
197 !endif 188 !endif
198 189
199 # A little bit of adhockery. Default to use system malloc and 190 # A little bit of adhockery. Default to use system malloc and
200 # DLL version of the C runtime library when using portable 191 # DLL version of the C runtime library when using portable
201 # dumping. These are the optimal settings. 192 # dumping. These are the optimal settings.
319 !if $(CONFIG_ERROR) 310 !if $(CONFIG_ERROR)
320 !error Configuration error(s) found 311 !error Configuration error(s) found
321 !endif 312 !endif
322 313
323 # 314 #
324 # Handle GUNG_HO
325 #
326 !if defined(GUNG_HO)
327 USE_MINIMAL_TAGBITS=$(GUNG_HO)
328 USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO)
329 !endif
330
331 #
332 # Whether to use dependency information generated by make-src-depend 315 # Whether to use dependency information generated by make-src-depend
333 # 316 #
334 !if !defined(DEPEND) 317 !if !defined(DEPEND)
335 DEPEND=0 318 DEPEND=0
336 !endif 319 !endif
357 !else 340 !else
358 CCV=@$(CC) 341 CCV=@$(CC)
359 !endif 342 !endif
360 343
361 !if $(DEBUG_XEMACS) 344 !if $(DEBUG_XEMACS)
362 OPT=-Od -Zi 345 DEBUGFLAGS=-Zi
363 !else 346 !else
364 OPT=-O2 -G5 347 DEBUGFLAGS=
348 !endif
349
350 !if $(OPTIMIZED_BUILD)
351 OPTFLAGS=-O2 -G5
352 !else
353 OPTFLAGS=-Od
365 !endif 354 !endif
366 355
367 !if $(USE_CRTDLL) 356 !if $(USE_CRTDLL)
368 !if $(DEBUG_XEMACS) 357 !if $(DEBUG_XEMACS)
369 C_LIBFLAG=-MDd 358 C_LIBFLAG=-MDd
375 !else 364 !else
376 C_LIBFLAG=-ML 365 C_LIBFLAG=-ML
377 LIBC_LIB=libc.lib 366 LIBC_LIB=libc.lib
378 !endif 367 !endif
379 368
380 CFLAGS=-nologo -W3 $(OPT) $(C_LIBFLAG) 369 CFLAGS=-nologo -W3 $(DEBUGFLAGS) $(OPTFLAGS) $(C_LIBFLAG)
381 370
382 !if $(HAVE_X_WINDOWS) 371 !if $(HAVE_X_WINDOWS)
383 X_DEFINES=-DHAVE_X_WINDOWS 372 X_DEFINES=-DHAVE_X_WINDOWS
384 X_INCLUDES=-I$(X11_DIR)\include 373 X_INCLUDES=-I$(X11_DIR)\include
385 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib 374 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib
457 446
458 !if $(QUICK_BUILD) 447 !if $(QUICK_BUILD)
459 QUICK_DEFINES=-DQUICK_BUILD 448 QUICK_DEFINES=-DQUICK_BUILD
460 !endif 449 !endif
461 450
462 !if $(USE_MINIMAL_TAGBITS) 451 !if $(ERROR_CHECK_ALL)
463 TAGBITS_DEFINES=-DUSE_MINIMAL_TAGBITS 452 ERROR_CHECK_DEFINES=-DERROR_CHECK_ALL
464 !endif 453 !endif
465 !if $(USE_INDEXED_LRECORD_IMPLEMENTATION) 454
466 LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION
467 !endif
468 !if $(USE_UNION_TYPE) 455 !if $(USE_UNION_TYPE)
469 UNION_DEFINES=-DUSE_UNION_TYPE 456 UNION_DEFINES=-DUSE_UNION_TYPE
470 !endif 457 !endif
471 458
472 !if $(USE_PORTABLE_DUMPER) 459 !if $(USE_PORTABLE_DUMPER)
491 478
492 # Generic variables 479 # Generic variables
493 480
494 INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR) 481 INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
495 482
496 DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \ 483 DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) $(UNION_DEFINES) \
497 $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
498 $(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \ 484 $(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
485 $(ERROR_CHECK_DEFINES) \
499 -DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \ 486 -DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
500 -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES) 487 -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
501 488
502 #------------------------------------------------------------------------------ 489 #------------------------------------------------------------------------------
503 490
792 $(OUTDIR)\alloc.obj \ 779 $(OUTDIR)\alloc.obj \
793 $(OUTDIR)\blocktype.obj \ 780 $(OUTDIR)\blocktype.obj \
794 $(OUTDIR)\buffer.obj \ 781 $(OUTDIR)\buffer.obj \
795 $(OUTDIR)\bytecode.obj \ 782 $(OUTDIR)\bytecode.obj \
796 $(OUTDIR)\callint.obj \ 783 $(OUTDIR)\callint.obj \
797 $(OUTDIR)\callproc.obj \
798 $(OUTDIR)\casefiddle.obj \ 784 $(OUTDIR)\casefiddle.obj \
799 $(OUTDIR)\casetab.obj \ 785 $(OUTDIR)\casetab.obj \
800 $(OUTDIR)\chartab.obj \ 786 $(OUTDIR)\chartab.obj \
801 $(OUTDIR)\cmdloop.obj \ 787 $(OUTDIR)\cmdloop.obj \
802 $(OUTDIR)\cmds.obj \ 788 $(OUTDIR)\cmds.obj \
849 $(OUTDIR)\marker.obj \ 835 $(OUTDIR)\marker.obj \
850 $(OUTDIR)\md5.obj \ 836 $(OUTDIR)\md5.obj \
851 $(OUTDIR)\minibuf.obj \ 837 $(OUTDIR)\minibuf.obj \
852 $(OUTDIR)\nt.obj \ 838 $(OUTDIR)\nt.obj \
853 $(OUTDIR)\ntplay.obj \ 839 $(OUTDIR)\ntplay.obj \
854 $(OUTDIR)\ntproc.obj \
855 $(OUTDIR)\objects.obj \ 840 $(OUTDIR)\objects.obj \
856 $(OUTDIR)\opaque.obj \ 841 $(OUTDIR)\opaque.obj \
857 $(OUTDIR)\print.obj \ 842 $(OUTDIR)\print.obj \
858 $(OUTDIR)\process.obj \ 843 $(OUTDIR)\process.obj \
859 $(OUTDIR)\process-nt.obj \ 844 $(OUTDIR)\process-nt.obj \
1372 !endif 1357 !endif
1373 !if $(HAVE_MS_WINDOWS) 1358 !if $(HAVE_MS_WINDOWS)
1374 Compiling in support for Microsoft Windows native GUI. 1359 Compiling in support for Microsoft Windows native GUI.
1375 !endif 1360 !endif
1376 !if $(HAVE_X_WINDOWS) 1361 !if $(HAVE_X_WINDOWS)
1377 Compiling in support for X-Windows. 1362 Compiling in support for X Windows.
1378 !endif 1363 !endif
1379 !if $(MULE) 1364 !if $(MULE)
1380 Compiling in international (MULE) support. 1365 Compiling in international (MULE) support.
1381 !endif 1366 !endif
1382 !if $(HAVE_GTK) 1367 !if $(HAVE_GTK)
1441 WARNING: Define HAVE_MSW_C_DIRED to be non-zero if you want XEmacs 1426 WARNING: Define HAVE_MSW_C_DIRED to be non-zero if you want XEmacs
1442 WARNING: to use C primitives to significantly speed up dired, at the 1427 WARNING: to use C primitives to significantly speed up dired, at the
1443 WARNING: expense of an additional ~4KB of code. 1428 WARNING: expense of an additional ~4KB of code.
1444 -------------------------------------------------------------------- 1429 --------------------------------------------------------------------
1445 !endif 1430 !endif
1446 !if $(USE_MINIMAL_TAGBITS)
1447 Using minimal tagbits.
1448 !endif
1449 !if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
1450 Using indexed lrecord implementation.
1451 !endif
1452 !if $(USE_UNION_TYPE) 1431 !if $(USE_UNION_TYPE)
1453 Using union type for Lisp object storage. 1432 Using union type for Lisp object storage.
1454 !endif 1433 !endif
1455 !if $(USE_PORTABLE_DUMPER) 1434 !if $(USE_PORTABLE_DUMPER)
1456 Using portable dumper. 1435 Using portable dumper.
1459 Using system malloc. 1438 Using system malloc.
1460 !endif 1439 !endif
1461 !if $(USE_CRTDLL) 1440 !if $(USE_CRTDLL)
1462 Using DLL version of C runtime library 1441 Using DLL version of C runtime library
1463 !endif 1442 !endif
1443 !if $(ERROR_CHECK_ALL)
1444 Compiling in extra internal error-checking. XEmacs will be slow!
1445 !endif
1464 !if $(DEBUG_XEMACS) 1446 !if $(DEBUG_XEMACS)
1465 Compiling in extra debug checks. XEmacs will be slow! 1447 Compiling in debugging support (no slowdown).
1448 !endif
1449 !if $(OPTIMIZED_BUILD)
1450 Compiling with optimization.
1466 !endif 1451 !endif
1467 !if $(QUICK_BUILD) 1452 !if $(QUICK_BUILD)
1468 Disabling non-essential build actions. Use with care! 1453 Disabling non-essential build actions. Use with care!
1469 !endif 1454 !endif
1470 <<NOKEEP 1455 <<NOKEEP