Mercurial > hg > xemacs-beta
comparison nt/xemacs.mak @ 1315:70921960b980
[xemacs-hg @ 2003-02-20 08:19:28 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
author | ben |
---|---|
date | Thu, 20 Feb 2003 08:19:44 +0000 |
parents | f99d3d25df86 |
children | 4542b72c005e |
comparison
equal
deleted
inserted
replaced
1314:15a91d7ae2d1 | 1315:70921960b980 |
---|---|
1044 cd $(NT) | 1044 cd $(NT) |
1045 rc -Fo$@ xemacs.rc | 1045 rc -Fo$@ xemacs.rc |
1046 | 1046 |
1047 | 1047 |
1048 PROGNAME = $(TEMACS_DIR)\xemacs.exe | 1048 PROGNAME = $(TEMACS_DIR)\xemacs.exe |
1049 DO_TEMACS = "$(LIB_SRC)\i" "$(TEMACS)" | |
1050 DO_XEMACS = "$(LIB_SRC)\i" "$(PROGNAME)" | |
1051 | |
1049 BATCH = -no-packages -batch | 1052 BATCH = -no-packages -batch |
1050 BATCH_PACKAGES = -vanilla -batch | 1053 BATCH_PACKAGES = -vanilla -batch |
1051 TEMACS_BATCH = "$(LIB_SRC)\i" "$(TEMACS)" $(BATCH) | 1054 TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH) |
1052 XEMACS_BATCH = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH) | 1055 XEMACS_BATCH = $(DO_XEMACS) $(BATCH) |
1053 XEMACS_BATCH_PACKAGES = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH_PACKAGES) | 1056 XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES) |
1054 | 1057 temacs_loadup_args = -l $(LISP)/loadup.el |
1058 dump_temacs_args = $(temacs_loadup_args) dump | |
1059 run_temacs_args = $(temacs_loadup_args) run-temacs | |
1060 dump_temacs = $(TEMACS_BATCH) $(dump_temacs_args) | |
1055 | 1061 |
1056 # Section handling automated tests starts here | 1062 # Section handling automated tests starts here |
1057 | 1063 |
1058 blddir=$(MAKEDIR:\=\\)\\.. | |
1059 temacs_loadup= | |
1060 dump_temacs = $(temacs_loadup) dump | |
1061 run_temacs = $(temacs_loadup) run-temacs | |
1062 ## We have automated tests!! | 1064 ## We have automated tests!! |
1063 testdir=../tests/automated | 1065 testdir = ../tests/automated |
1064 batch_test_emacs=$(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) | 1066 batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) |
1065 | 1067 |
1066 # .PHONY: check check-temacs | 1068 # .PHONY: check check-temacs |
1067 | 1069 |
1068 check: | 1070 check: |
1069 cd $(TEMACS_DIR) | 1071 cd $(TEMACS_DIR) |
1070 $(PROGNAME) $(batch_test_emacs) | 1072 $(DO_XEMACS) $(batch_test_emacs) |
1071 | 1073 |
1072 check-temacs: | 1074 check-temacs: |
1073 cd $(TEMACS_DIR) | 1075 cd $(TEMACS_DIR) |
1074 $(TEMACS_BATCH) -l $(LISP)/loadup.el run-temacs $(batch_test_emacs) | 1076 $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs) |
1077 | |
1078 check-features: all | |
1079 cd $(TEMACS_DIR) | |
1080 $(XEMACS_BATCH) -l check-features.el | |
1075 | 1081 |
1076 # Section handling automated tests ends here | 1082 # Section handling automated tests ends here |
1077 | 1083 |
1078 # Section handling tags starts here | 1084 # Section handling tags starts here |
1079 | 1085 |
1283 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))" | 1289 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))" |
1284 @if not errorlevel 1 goto suggest_makeinfo | 1290 @if not errorlevel 1 goto suggest_makeinfo |
1285 @echo XEmacs 'info' cannot be built! | 1291 @echo XEmacs 'info' cannot be built! |
1286 @echo Install XEmacs package 'texinfo' (see README.packages). | 1292 @echo Install XEmacs package 'texinfo' (see README.packages). |
1287 :suggest_makeinfo | 1293 :suggest_makeinfo |
1288 @echo Consider specifying path to makeinfo program: MAKEINFO=path | 1294 @echo Consider specifying path to 'makeinfo' in config.inc. |
1289 @echo as this will build info docs faster than XEmacs using 'texinfo'. | 1295 @echo as this will build the info docs much faster than XEmacs using 'texinfo'. |
1290 @if errorlevel 1 exit 1 | 1296 @if errorlevel 1 exit 1 |
1291 :test_done | 1297 :test_done |
1292 <<NOKEEP | 1298 <<NOKEEP |
1293 | 1299 |
1294 # Section handling info ends here | 1300 # Section handling info ends here |
1295 | 1301 |
1296 #------------------------------------------------------------------------------ | 1302 #------------------------------------------------------------------------------ |
1297 | |
1298 # LISP bits 'n bobs | |
1299 | |
1300 LOADPATH=$(LISP) | |
1301 | 1303 |
1302 # Rebuild docfile target | 1304 # Rebuild docfile target |
1303 | 1305 |
1304 DOC=$(LIB_SRC)\DOC | 1306 DOC=$(LIB_SRC)\DOC |
1305 | 1307 |
1321 | 1323 |
1322 update-elc: | 1324 update-elc: |
1323 cd $(TEMACS_DIR) | 1325 cd $(TEMACS_DIR) |
1324 $(TEMACS_BATCH) -l $(LISP)\update-elc.el | 1326 $(TEMACS_BATCH) -l $(LISP)\update-elc.el |
1325 | 1327 |
1326 # Update out-of-date .elcs, other than needed for dumping. | 1328 ## Update out-of-date .elcs, other than needed for dumping. |
1327 update-elc-2: | 1329 update-elc-2: |
1328 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP) | 1330 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP) |
1329 | 1331 |
1330 # This file is touched by update-elc.el when redumping is necessary. | 1332 $(LISP)/finder-inf.el: |
1333 @echo Building finder database ... | |
1334 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ | |
1335 -l finder -f finder-compile-keywords | |
1336 @echo Building finder database ...(done) | |
1337 | |
1338 load-shadows: | |
1339 !if !$(QUICK_BUILD) | |
1340 @echo Testing for Lisp shadows ... | |
1341 @$(XEMACS_BATCH) -f list-load-path-shadows | |
1342 !endif | |
1343 | |
1344 ## This file is touched by update-elc.el when redumping is necessary. | |
1331 $(TEMACS_DIR)\NEEDTODUMP : | 1345 $(TEMACS_DIR)\NEEDTODUMP : |
1332 @echo >$(TEMACS_DIR)\NEEDTODUMP | 1346 @echo >$(TEMACS_DIR)\NEEDTODUMP |
1333 | 1347 |
1334 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE | 1348 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE |
1335 # requirements have changed. | 1349 # requirements have changed. |
1349 #------------------------------------------------------------------------------ | 1363 #------------------------------------------------------------------------------ |
1350 | 1364 |
1351 # use this rule to build the complete system | 1365 # use this rule to build the complete system |
1352 all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \ | 1366 all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \ |
1353 $(LIB_SRC_TOOLS) $(TEMACS) update-elc $(DOC) $(PROGNAME) \ | 1367 $(LIB_SRC_TOOLS) $(TEMACS) update-elc $(DOC) $(PROGNAME) \ |
1354 update-elc-2 info | 1368 update-elc-2 $(LISP)/finder-inf.el load-shadows info |
1355 | 1369 |
1356 temacs: $(LASTFILE) $(TEMACS) | 1370 temacs: $(LASTFILE) $(TEMACS) |
1357 | 1371 |
1358 # use this rule to install the system | 1372 # use this rule to install the system |
1359 install: all | 1373 install: all |
1497 !if $(MULE) | 1511 !if $(MULE) |
1498 Compiling in international (MULE) support. | 1512 Compiling in international (MULE) support. |
1499 !endif | 1513 !endif |
1500 !if $(HAVE_GTK) | 1514 !if $(HAVE_GTK) |
1501 -------------------------------------------------------------------- | 1515 -------------------------------------------------------------------- |
1502 WARNING: You specified HAVE_GTK=1, but we are compiling WITHOUT GTK support. | 1516 NOTE: You specified HAVE_GTK=1, but we are compiling WITHOUT GTK support. |
1503 WARNING: gtk-xemacs is not currently supported on MS Windows (mingw or msvc). | 1517 NOTE: gtk-xemacs is not currently supported on MS Windows (mingw or msvc). |
1504 WARNING: Yes, we know that gtk has been ported to native MS Windows, but | 1518 NOTE: Yes, we know that gtk has been ported to native MS Windows, but |
1505 WARNING: XEmacs is not yet ready to use that port. | 1519 NOTE: XEmacs is not yet ready to use that port. |
1506 -------------------------------------------------------------------- | 1520 -------------------------------------------------------------------- |
1507 !endif | 1521 !endif |
1508 !if $(HAVE_XPM) | 1522 !if $(HAVE_XPM) |
1509 Compiling in support for XPM images. | 1523 Compiling in support for XPM images. |
1510 !else | 1524 !else |
1511 -------------------------------------------------------------------- | 1525 -------------------------------------------------------------------- |
1512 WARNING: Compiling without XPM support. | 1526 NOTE: Compiling without XPM support. |
1513 WARNING: You should strongly consider installing XPM. | 1527 NOTE: You should strongly consider installing XPM. |
1514 WARNING: Otherwise toolbars and other graphics will look suboptimal. | 1528 NOTE: Otherwise toolbars and other graphics will look suboptimal. |
1515 WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux) | 1529 NOTE: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux) |
1516 -------------------------------------------------------------------- | 1530 -------------------------------------------------------------------- |
1517 !endif | 1531 !endif |
1518 !if $(HAVE_GIF) | 1532 !if $(HAVE_GIF) |
1519 Compiling in support for GIF images. | 1533 Compiling in support for GIF images. |
1520 !endif | 1534 !endif |
1521 !if $(HAVE_PNG) | 1535 !if $(HAVE_PNG) |
1522 Compiling in support for PNG images. | 1536 Compiling in support for PNG images. |
1523 !else | 1537 !else |
1524 -------------------------------------------------------------------- | 1538 -------------------------------------------------------------------- |
1525 WARNING: Compiling without PNG image support. | 1539 NOTE: Compiling without PNG image support. |
1526 WARNING: You should strongly consider installing the PNG libraries. | 1540 NOTE: You should strongly consider installing the PNG libraries. |
1527 WARNING: Otherwise certain images and glyphs may not display. | 1541 NOTE: Otherwise certain images and glyphs may not display. |
1528 WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux | 1542 NOTE: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux |
1529 -------------------------------------------------------------------- | 1543 -------------------------------------------------------------------- |
1530 !endif | 1544 !endif |
1531 !if $(HAVE_TIFF) | 1545 !if $(HAVE_TIFF) |
1532 Compiling in support for TIFF images. | 1546 Compiling in support for TIFF images. |
1533 !endif | 1547 !endif |
1552 !if $(HAVE_NATIVE_SOUND) | 1566 !if $(HAVE_NATIVE_SOUND) |
1553 Compiling in support for native sounds. | 1567 Compiling in support for native sounds. |
1554 !endif | 1568 !endif |
1555 !if $(USE_UNION_TYPE) | 1569 !if $(USE_UNION_TYPE) |
1556 Using union type for Lisp object storage. | 1570 Using union type for Lisp object storage. |
1557 WARNING: --------------------------------------------------------- | 1571 NOTE: --------------------------------------------------------- |
1558 WARNING: This tends to trigger compiler bugs, especially when combined | 1572 NOTE: This tends to trigger compiler bugs, especially when combined |
1559 WARNING: with MULE and ERROR_CHECKING. Crashes in pdump have recently | 1573 NOTE: with MULE and ERROR_CHECKING. Crashes in pdump have recently |
1560 WARNING: been observed using Visual C++ in combination with union type, | 1574 NOTE: been observed using Visual C++ in combination with union type, |
1561 WARNING: MULE, and ERROR_CHECKING. | 1575 NOTE: MULE, and ERROR_CHECKING. |
1562 WARNING: --------------------------------------------------------- | 1576 NOTE: --------------------------------------------------------- |
1563 !endif | 1577 !endif |
1564 !if $(USE_PORTABLE_DUMPER) | 1578 !if $(USE_PORTABLE_DUMPER) |
1565 Using portable dumper. | 1579 Using portable dumper. |
1566 !endif | 1580 !endif |
1567 !if $(USE_SYSTEM_MALLOC) | 1581 !if $(USE_SYSTEM_MALLOC) |
1570 !if $(USE_CRTDLL) | 1584 !if $(USE_CRTDLL) |
1571 Using DLL version of C runtime library. | 1585 Using DLL version of C runtime library. |
1572 !endif | 1586 !endif |
1573 !if $(ERROR_CHECK_ALL) | 1587 !if $(ERROR_CHECK_ALL) |
1574 Compiling in extra internal error-checking. | 1588 Compiling in extra internal error-checking. |
1575 WARNING: --------------------------------------------------------- | 1589 NOTE: --------------------------------------------------------- |
1576 WARNING: Compiling in support for runtime error checking. | 1590 NOTE: Compiling in support for runtime error-checking. |
1577 WARNING: XEmacs will run noticeably more slowly as a result. | 1591 NOTE: XEmacs will run noticeably more slowly as a result. |
1578 WARNING: Error checking is on by default for XEmacs beta releases. | 1592 NOTE: Error-checking is on by default for XEmacs beta releases. |
1579 WARNING: --------------------------------------------------------- | 1593 NOTE: --------------------------------------------------------- |
1580 !endif | 1594 !endif |
1581 !if $(DEBUG_XEMACS) | 1595 !if $(DEBUG_XEMACS) |
1582 Compiling in debugging support (no slowdown). | 1596 Compiling in debugging support (no slowdown). |
1583 !endif | 1597 !endif |
1584 !if $(OPTIMIZED_BUILD) | 1598 !if $(OPTIMIZED_BUILD) |