comparison lisp/dump-paths.el @ 1227:5636ae1c0234

[xemacs-hg @ 2003-01-22 20:31:52 by michaels] 2003-01-19 Mike Sperber <mike@xemacs.org> * startup.el (normal-top-level): Compute `emacs-data-roots.' Call `startup-setup-paths' with data-roots argument. (emacs-data-roots): Add. * dump-paths.el: Call `startup-setup-paths' with data-roots argument. (startup-setup-paths): Use `data-roots' instead of `roots' to find packages. Call `paths-find-emacs-roots' with `root-p' argument. * make-docfile.el: Call `paths-find-emacs-roots' with `root-p' argument. * find-paths.el (paths-emacs-data-root-p): Add. (paths-find-emacs-roots): Parmeterize over `root-p.'
author michaels
date Wed, 22 Jan 2003 20:31:52 +0000
parents edc95b5fe4cb
children 4542b72c005e
comparison
equal deleted inserted replaced
1226:440b3dcb60ed 1227:5636ae1c0234
29 29
30 ;; This sets up the various paths for continuing loading files for dumping. 30 ;; This sets up the various paths for continuing loading files for dumping.
31 ;; This is the only file of the basic path/package files (find-paths.el, 31 ;; This is the only file of the basic path/package files (find-paths.el,
32 ;; package.el, setup-paths.el, dump-paths.el) that actually does stuff. 32 ;; package.el, setup-paths.el, dump-paths.el) that actually does stuff.
33 33
34 (defun startup-setup-paths (roots user-init-directory 34 (defun startup-setup-paths (roots data-roots user-init-directory
35 &optional 35 &optional
36 inhibit-packages inhibit-site-lisp 36 inhibit-packages inhibit-site-lisp
37 debug-paths called-early) 37 debug-paths called-early)
38 "Setup all the various paths. 38 "Setup all the various paths.
39 ROOTS is a list of plausible roots of the XEmacs directory hierarchy. 39 ROOTS is a list of plausible roots of the XEmacs directory hierarchy.
54 late)) 54 late))
55 (setq last-packages (and (not (memq 'last inhibit-packages)) 55 (setq last-packages (and (not (memq 'last inhibit-packages))
56 last)) 56 last))
57 ) 57 )
58 (packages-find-packages 58 (packages-find-packages
59 roots 59 data-roots
60 (packages-compute-package-locations user-init-directory))) 60 (packages-compute-package-locations user-init-directory)))
61 61
62 (setq early-package-load-path (packages-find-package-load-path 62 (setq early-package-load-path (packages-find-package-load-path early-packages))
63 early-packages))
64 (setq late-package-load-path (packages-find-package-load-path late-packages)) 63 (setq late-package-load-path (packages-find-package-load-path late-packages))
65 (setq last-package-load-path (packages-find-package-load-path last-packages)) 64 (setq last-package-load-path (packages-find-package-load-path last-packages))
66 65
67 (if debug-paths 66 (if debug-paths
68 (progn 67 (progn
69 (princ (format "arguments:\nroots: %S\nuser-init-directory: %S\n" 68 (princ (format "arguments:\nroots: %S\ndata-roots: %S\nuser-init-directory: %S\n"
70 roots user-init-directory) 69 roots data-roots user-init-directory)
71 'external-debugging-output) 70 'external-debugging-output)
72 (princ (format "inhibit-packages: %S\ninhibit-site-lisp: %S\n" 71 (princ (format "inhibit-packages: %S\ninhibit-site-lisp: %S\n"
73 inhibit-packages inhibit-site-lisp) 72 inhibit-packages inhibit-site-lisp)
74 'external-debugging-output) 73 'external-debugging-output)
75 (princ (format "debug-paths: %S\ncalled-early: %S\n\n" 74 (princ (format "debug-paths: %S\ncalled-early: %S\n\n"
183 182
184 (let ((debug-paths (or debug-paths 183 (let ((debug-paths (or debug-paths
185 (and (getenv "EMACSDEBUGPATHS") 184 (and (getenv "EMACSDEBUGPATHS")
186 t))) 185 t)))
187 (roots (paths-find-emacs-roots invocation-directory 186 (roots (paths-find-emacs-roots invocation-directory
188 invocation-name))) 187 invocation-name
189 188 #'paths-emacs-root-p))
190 (if debug-paths 189 (data-roots (paths-find-emacs-roots invocation-directory
191 (princ (format "XEmacs thinks the roots of its hierarchy are:\n%S\n" 190 invocation-name
192 roots) 191 #'paths-emacs-data-root-p)))
193 'external-debugging-output)) 192
194 (startup-setup-paths roots 193 (if debug-paths
194 (progn
195 (princ (format "XEmacs thinks the roots of its hierarchy are:\n%S\n"
196 roots)
197 'external-debugging-output)
198 (princ (format "XEmacs thinks the data roots of its hierarchy are:\n%S\n"
199 data-roots)
200 'external-debugging-output)))
201 (startup-setup-paths roots data-roots
195 (paths-construct-path '("~" ".xemacs")) 202 (paths-construct-path '("~" ".xemacs"))
196 (if inhibit-all-packages t 203 (if inhibit-all-packages t
197 '(early last)) 204 '(early last))
198 inhibit-site-lisp 205 inhibit-site-lisp
199 debug-paths 206 debug-paths