[xemacs-hg @ 2003-03-01 07:25:26 by ben] build patch Makefile.in.in: Move src deletions to src/Makefile.in.in. dump-paths.el, dumped-lisp.el: Delete. Combine stuff into setup-paths.el. find-paths.el: Removed. Make this file contain generic routines only. Move stuff to compute Emacs roots to setup-paths.el. startup.el: Removed. Move these variables into setup-paths.el. setup-paths.el, startup.el: Removed. Combine all high-level code for computing the paths into setup-paths.el. Create new function startup-find-load-path to encapsulate all logic for computing `load-path'. Eliminate invocation-directory and invocation-name parameters since there is no point (false generality) -- the code references other globals, which cannot be specified. Eliminate some code duplicated between setup-paths.el and startup.el. Clean up the debug-paths code and output load-path in addition. Add logic to paths-emacs-root-p to support separated source and build trees. loadup.el, make-docfile.el, update-elc-2.el, update-elc.el: Rewrite to allow for separated source and build trees, as may occur in MS Windows. NOTE TO BUILD HACKERS: loadup.el, make-docfile.el, update-elc.el and update-elc-2.el made two assumptions that are no longer correct: (1) The source and build trees are in the same place. (2) They can make assumptions about where `.' is. These files now compute the locations of the source and build roots at the top of the file. *ALL* constant file names or path snippets must now be made absolute using expand-file-name and one of these roots. dumped-lisp.el, packages.el: Removed. Remove some unused lists of Lisp files. packages-hardcoded-lisp (empty, in any case) moved to dumped-lisp.el. startup.el: When a compiled init file is out-of-date wrt the uncompiled version, load the uncompiled version and issue a nasty warning. update-elc-2.el: Force touching of auto-autoloads files when REBUILD_AUTOLOADS was set. update-elc.el: Fix code that checks whether dumping is necessary to check against xemacs.dmp, not xemacs.exe, when Unix and pdump. lwlib-Xm.c: Fix compile warning. README, config.inc.samp, xemacs.mak: -- Major reorganization and cleanup. -- Add support for separated build tree and source tree. -- Delete all support for X Windows building, since it's totally bit-rotten and will never be fixed up. Instruct people to use Cygwin if they want such support. make-build-dir: New script to create a skeleton build tree for use with separated build and source tree compilation. m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/arm.h, m/att3b.h, m/aviion.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/plexus.h, m/powerpc.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/stride.h, m/tad68k.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/wicat.h, m/xps100.h, data.c, doc.c, editfns.c, emacs.c, lrecord.h, ntheap.c, process-unix.c, sysdep.c, unexec.c: Delete all support for bit-rotten CANNOT_DUMP. Just use pdump. Makefile.in.in: Lots o' cleanup. Use names like LISP, SRC instead of lispdir, srcdir, for consistency with xemacs.mak and the conventions in the rest of the file. Eliminate use of ${...} in favor of $(...), to make it easier to move code between this file and xemacs.mak. Fix dependency handling wrt NEEDTODUMP to eliminate problems some people (e.g. Vin) have been seeing with non-GNU makes. Write a long section about the subtle but oh-so-important differences in dependency processing between nmake, make, and GNU make. Add unicode-encapsulate target, from xemacs.mak. chartab.c, lrecord.h: Fix crash due to attempt to free objects across dump/undump.

--- a/nt/config.inc.samp	Fri Feb 28 22:52:30 2003 +0000
+++ b/nt/config.inc.samp	Sat Mar 01 07:25:56 2003 +0000
@@ -18,15 +18,7 @@
 # Native MS Windows support.
 HAVE_MS_WINDOWS=1
 
-# X Windows support.  Not working at all and probably never will.  If you
-# want X support under MS Windows, compile with Cygwin instead.
-HAVE_X_WINDOWS=0
-X11_DIR=
-
-# GTK support. Do NOT set this to 1; as of xemacs-21.5-b6
-# gtk-xemacs is not supported on MSWindows (mingw or msvc).
-# Yes, we know that gtk has been ported to native MSWindows
-# but XEmacs is not yet ready to use that port.
+# GTK support.  Do NOT set this to 1; this does not currently work.
 HAVE_GTK=0
 GTK_DIR=
 
@@ -74,6 +66,36 @@
 #                            Build settings                                #
 ############################################################################
 
+# If you want to the built files to be placed outside of the source tree
+# (e.g. this allows you to build multiple versions of XEmacs, with
+# different configuration settings, from the same source tree), run
+# `make-build-dir' to create a skeleton build tree, giving it the name of a
+# path.  This creates the specified directory and the `nt' directory below
+# it, copies config.inc (if it exists), config.inc.samp and xemacs.mak into
+# the `nt' directory, and modifies the config files to contain the path of
+# the source tree in SOURCE_DIR.  This will not overwrite files that
+# already exist, so it can safely be run more than once on the same tree.
+#
+# Running nmake in the skeleton build tree will then build XEmacs in that
+# directory tree, using the source files as specified.  The paths of the
+# `lisp' and `etc' directories in the source tree will be compiled into the
+# executable as "last-resort" values -- i.e. they will be used if you
+# simply run the executable as-is, but will not override any local copy of
+# the `lisp' and/or `etc' directories that you may have made.
+#
+# Alternatively, you can just uncomment the line below for BUILD_DIR and
+# specify a (possibly non-existent) path.  Running nmake will then put its
+# build files into a parallel directory structure underneath the specified
+# path, creating the directories as necessary.  The problem with this is
+# that the first method above allows you to have a different copy of
+# `config.inc' for each build directory, but doing it this way means you
+# have only one version of config.inc, and have to manually change it for
+# each different build.
+
+# SOURCE_DIR=c:\src\xemacs\working
+
+# BUILD_DIR=c:\src\xemacs\msbuilds\working
+
 # Set this to specify the location of makeinfo. (If not set, XEmacs will
 # attempt to use its built-in, much slower texinfo support when building
 # info files.) If you are building XEmacs yourself, you probably have