Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/nt/xemacs.mak Thu Feb 20 08:16:21 2003 +0000 +++ b/nt/xemacs.mak Thu Feb 20 08:19:44 2003 +0000 @@ -1046,32 +1046,38 @@ PROGNAME = $(TEMACS_DIR)\xemacs.exe +DO_TEMACS = "$(LIB_SRC)\i" "$(TEMACS)" +DO_XEMACS = "$(LIB_SRC)\i" "$(PROGNAME)" + BATCH = -no-packages -batch BATCH_PACKAGES = -vanilla -batch -TEMACS_BATCH = "$(LIB_SRC)\i" "$(TEMACS)" $(BATCH) -XEMACS_BATCH = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH) -XEMACS_BATCH_PACKAGES = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH_PACKAGES) - +TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH) +XEMACS_BATCH = $(DO_XEMACS) $(BATCH) +XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES) +temacs_loadup_args = -l $(LISP)/loadup.el +dump_temacs_args = $(temacs_loadup_args) dump +run_temacs_args = $(temacs_loadup_args) run-temacs +dump_temacs = $(TEMACS_BATCH) $(dump_temacs_args) # Section handling automated tests starts here -blddir=$(MAKEDIR:\=\\)\\.. -temacs_loadup= -dump_temacs = $(temacs_loadup) dump -run_temacs = $(temacs_loadup) run-temacs ## We have automated tests!! -testdir=../tests/automated -batch_test_emacs=$(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) +testdir = ../tests/automated +batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) # .PHONY: check check-temacs check: cd $(TEMACS_DIR) - $(PROGNAME) $(batch_test_emacs) + $(DO_XEMACS) $(batch_test_emacs) check-temacs: cd $(TEMACS_DIR) - $(TEMACS_BATCH) -l $(LISP)/loadup.el run-temacs $(batch_test_emacs) + $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs) + +check-features: all + cd $(TEMACS_DIR) + $(XEMACS_BATCH) -l check-features.el # Section handling automated tests ends here @@ -1285,8 +1291,8 @@ @echo XEmacs 'info' cannot be built! @echo Install XEmacs package 'texinfo' (see README.packages). :suggest_makeinfo -@echo Consider specifying path to makeinfo program: MAKEINFO=path -@echo as this will build info docs faster than XEmacs using 'texinfo'. +@echo Consider specifying path to 'makeinfo' in config.inc. +@echo as this will build the info docs much faster than XEmacs using 'texinfo'. @if errorlevel 1 exit 1 :test_done <<NOKEEP @@ -1295,10 +1301,6 @@ #------------------------------------------------------------------------------ -# LISP bits 'n bobs - -LOADPATH=$(LISP) - # Rebuild docfile target DOC=$(LIB_SRC)\DOC @@ -1323,11 +1325,23 @@ cd $(TEMACS_DIR) $(TEMACS_BATCH) -l $(LISP)\update-elc.el -# Update out-of-date .elcs, other than needed for dumping. +## Update out-of-date .elcs, other than needed for dumping. update-elc-2: $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP) -# This file is touched by update-elc.el when redumping is necessary. +$(LISP)/finder-inf.el: + @echo Building finder database ... + $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ + -l finder -f finder-compile-keywords + @echo Building finder database ...(done) + +load-shadows: +!if !$(QUICK_BUILD) + @echo Testing for Lisp shadows ... + @$(XEMACS_BATCH) -f list-load-path-shadows +!endif + +## This file is touched by update-elc.el when redumping is necessary. $(TEMACS_DIR)\NEEDTODUMP : @echo >$(TEMACS_DIR)\NEEDTODUMP @@ -1351,7 +1365,7 @@ # use this rule to build the complete system all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \ $(LIB_SRC_TOOLS) $(TEMACS) update-elc $(DOC) $(PROGNAME) \ - update-elc-2 info + update-elc-2 $(LISP)/finder-inf.el load-shadows info temacs: $(LASTFILE) $(TEMACS) @@ -1499,20 +1513,20 @@ !endif !if $(HAVE_GTK) -------------------------------------------------------------------- - WARNING: You specified HAVE_GTK=1, but we are compiling WITHOUT GTK support. - WARNING: gtk-xemacs is not currently supported on MS Windows (mingw or msvc). - WARNING: Yes, we know that gtk has been ported to native MS Windows, but - WARNING: XEmacs is not yet ready to use that port. + NOTE: You specified HAVE_GTK=1, but we are compiling WITHOUT GTK support. + NOTE: gtk-xemacs is not currently supported on MS Windows (mingw or msvc). + NOTE: Yes, we know that gtk has been ported to native MS Windows, but + NOTE: XEmacs is not yet ready to use that port. -------------------------------------------------------------------- !endif !if $(HAVE_XPM) Compiling in support for XPM images. !else -------------------------------------------------------------------- - WARNING: Compiling without XPM support. - WARNING: You should strongly consider installing XPM. - WARNING: Otherwise toolbars and other graphics will look suboptimal. - WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux) + NOTE: Compiling without XPM support. + NOTE: You should strongly consider installing XPM. + NOTE: Otherwise toolbars and other graphics will look suboptimal. + NOTE: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux) -------------------------------------------------------------------- !endif !if $(HAVE_GIF) @@ -1522,10 +1536,10 @@ Compiling in support for PNG images. !else -------------------------------------------------------------------- - WARNING: Compiling without PNG image support. - WARNING: You should strongly consider installing the PNG libraries. - WARNING: Otherwise certain images and glyphs may not display. - WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux + NOTE: Compiling without PNG image support. + NOTE: You should strongly consider installing the PNG libraries. + NOTE: Otherwise certain images and glyphs may not display. + NOTE: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux -------------------------------------------------------------------- !endif !if $(HAVE_TIFF) @@ -1554,12 +1568,12 @@ !endif !if $(USE_UNION_TYPE) Using union type for Lisp object storage. - WARNING: --------------------------------------------------------- - WARNING: This tends to trigger compiler bugs, especially when combined - WARNING: with MULE and ERROR_CHECKING. Crashes in pdump have recently - WARNING: been observed using Visual C++ in combination with union type, - WARNING: MULE, and ERROR_CHECKING. - WARNING: --------------------------------------------------------- + NOTE: --------------------------------------------------------- + NOTE: This tends to trigger compiler bugs, especially when combined + NOTE: with MULE and ERROR_CHECKING. Crashes in pdump have recently + NOTE: been observed using Visual C++ in combination with union type, + NOTE: MULE, and ERROR_CHECKING. + NOTE: --------------------------------------------------------- !endif !if $(USE_PORTABLE_DUMPER) Using portable dumper. @@ -1572,11 +1586,11 @@ !endif !if $(ERROR_CHECK_ALL) Compiling in extra internal error-checking. - WARNING: --------------------------------------------------------- - WARNING: Compiling in support for runtime error checking. - WARNING: XEmacs will run noticeably more slowly as a result. - WARNING: Error checking is on by default for XEmacs beta releases. - WARNING: --------------------------------------------------------- + NOTE: --------------------------------------------------------- + NOTE: Compiling in support for runtime error-checking. + NOTE: XEmacs will run noticeably more slowly as a result. + NOTE: Error-checking is on by default for XEmacs beta releases. + NOTE: --------------------------------------------------------- !endif !if $(DEBUG_XEMACS) Compiling in debugging support (no slowdown).