[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/lisp/make-docfile.el	Fri Feb 28 22:52:30 2003 +0000
+++ b/lisp/make-docfile.el	Sat Mar 01 07:25:56 2003 +0000
@@ -4,7 +4,7 @@
 ;; Copyright (C) 2002, 2003 Ben Wing.
 
 ;; Author: Unknown
-;; Maintainer: Steven L Baur <steve@xemacs.org>
+;; Maintainer: XEmacs Development Team
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
@@ -45,6 +45,12 @@
 (defvar site-file-list nil)
 (defvar docfile-out-of-date nil)
 
+(defvar build-root (expand-file-name ".." invocation-directory))
+(defvar build-lib-src (expand-file-name "lib-src" build-root))
+(defvar source-lisp (file-name-directory (expand-file-name
+					  (nth 2 command-line-args))))
+(defvar source-src (expand-file-name "../src" source-lisp))
+
 (defun message (fmt &rest args)
   (princ (apply #'format fmt args))
   (terpri))
@@ -73,7 +79,7 @@
 ;; (message (concat "Options: " (prin1-to-string options)))
 
 ;; insert-file-contents-internal calls out to `format-decode' afterwards,
-;; so it must be defined.  if non-zero, it tries to be a bunch more stuff
+;; so it must be defined.  if non-zero, it tries to do a bunch more stuff
 ;; so say, "NOOOOOOOOOOOOO!  Basta!  Ca soufit!   Enough, already, OK?"
 (defun format-decode (fuck me harder) 0)
 
@@ -118,33 +124,34 @@
 	(when (and (not (string-match "\\(NEEDTODUMP\\|\\.exe$\\)" arg))
 		   (not (member arg processed)))
 	  (when (string-match "\\(.*\\)\\.obj$" arg)
-	    (setq arg (concat (file-name-nondirectory
-			       ;; no match-string so use its implementation.
-			       (substring arg (match-beginning 1)
-					  (match-end 1)))
-			      ".c")))
+	    (setq arg (expand-file-name
+		       (concat 
+			(file-name-nondirectory
+			 ;; no match-string so use its implementation.
+			 (substring arg (match-beginning 1)
+				    (match-end 1)))
+			".c")
+		       source-src)))
 	  (if (and (null docfile-out-of-date)
 		   (file-newer-than-file-p arg docfile))
 	      (setq docfile-out-of-date t))
 	  (setq processed (cons arg processed))))
       (setq args (cdr args)))))
 
+;; Then process the list of Lisp files.
 (process-args command-line-args)
 
-;; Then process the list of Lisp files.
-(let ((build-root (expand-file-name ".." invocation-directory)))
-  (setq load-path (list (expand-file-name "lisp" build-root))))
+(setq load-path (list source-lisp))
 
 ;; Then process the autoloads
 (setq autoload-file-name "auto-autoloads.elc")
 (load "find-paths.el")
 (load "packages.el")
 (load "setup-paths.el")
-(load "dump-paths.el")
 (load "raw-process.el")
 
 (let (preloaded-file-list)
-  (load (expand-file-name "../lisp/dumped-lisp.el"))
+  (load (expand-file-name "dumped-lisp.el" source-lisp))
 
   (let ((package-preloaded-file-list
 	 (packages-collect-package-dumped-lisps late-package-load-path)))
@@ -216,7 +223,7 @@
   (message "Spawning make-docfile ...")
   ;; (message (prin1-to-string (append options processed)))
 
-  (setq exec-path (list (concat default-directory "../lib-src")))
+  (setq exec-path (list build-lib-src))
 
   ;; (locate-file-clear-hashing nil)
   (if (memq system-type '(berkeley-unix next-mach))
@@ -232,12 +239,13 @@
        (mapconcat
 	#'identity
 	(append
-	 (list (concat default-directory "../lib-src/make-docfile"))
+	 (list (expand-file-name "make-docfile" build-lib-src))
 	 options processed)
 	" "))
     ;; (message (prin1-to-string (append options processed)))
     (apply 'call-process-internal
-	   ;; (concat default-directory "../lib-src/make-docfile")
+	   ;; exec-path is set.
+	   ;; (expand-file-name "make-docfile" build-lib-src)
 	   "make-docfile"
 	   nil
 	   t
@@ -247,7 +255,6 @@
   (message "Spawning make-docfile ...done")
   ;; (write-region-internal (point-min) (point-max) "/tmp/DOC")
   )
-(message "DOC file is up to date")
 
 (kill-emacs)