annotate lisp/packages.el @ 233:52952cbfc5b5 r20-5b15

Import from CVS: tag r20-5b15
author cvs
date Mon, 13 Aug 2007 10:14:14 +0200
parents 0e522484dd2a
children 85a06df23a9a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1 ;;; packages.el --- Low level support for XEmacs packages
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3 ;; Copyright (C) 1997 Free Software Foundation, Inc.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
4
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
5 ;; Author: Steven L Baur <steve@altair.xemacs.org>
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
6 ;; Keywords: internal, lisp, dumped
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
7
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
9
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
13 ;; any later version.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
14
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
18 ;; General Public License for more details.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
19
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
23 ;; 02111-1307, USA.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
24
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
25 ;;; Synched up with: Not in FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
26
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
27 ;;; Commentary:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
28
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
29 ;; This file is dumped with XEmacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
30
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
31 ;; This file provides low level facilities for XEmacs startup --
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
32 ;; particularly regarding the package setup. This code has to run in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
33 ;; what we call "bare temacs" -- i.e. XEmacs without the usual Lisp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
34 ;; environment. Pay special attention:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
35
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
36 ;; - not to use the `lambda' macro. Use #'(lambda ...) instead.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
37 ;; (this goes for any package loaded before `subr.el'.)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
38 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
39 ;; - not to use macros, because they are not yet available (and this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
40 ;; file must be loadable uncompiled.) This rules out CL-style
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
41 ;; macros like `when', for instance.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
42 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
43 ;; - not to use `defcustom'. If you must add user-customizable
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
44 ;; variables here, use `defvar', and add the variable to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
45 ;; `cus-start.el'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
46
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
47 ;; Because of all this, make sure that the stuff you put here really
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
48 ;; belongs here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
49
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
50
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
51 ;;; Code:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
52
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
53 ;;; Package versioning
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
54
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
55 (defvar packages-package-list nil
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
56 "database of loaded packages and version numbers")
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
57
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
58 (defun package-provide (name version)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
59 (if (not (assq name packages-package-list))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
60 (setq packages-package-list
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
61 (cons (cons name version) packages-package-list))))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
62
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
63 (defun package-require (name version)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
64 (let ((pkg (assq name packages-package-list)))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
65 (cond ((null pkg)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
66 (error "Package %s has not been loaded into this XEmacsen"
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
67 name))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
68 ((< (cdr pkg) version)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
69 (error "Need version %g of package %s, got version %g"
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
70 version name (cdr pkg)))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
71 (t t))))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
72
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
73 ;;; Build time stuff
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
74
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
75 (defvar autoload-file-name "auto-autoloads.el"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
76 "Filename that autoloads are expected to be found in.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
77
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
78 (defvar packages-hardcoded-lisp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
79 '(
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
80 ;; "startup"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
81 )
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
82 "Lisp packages that are always dumped with XEmacs")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
83
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
84 (defvar packages-useful-lisp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
85 '("bytecomp"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
86 "byte-optimize"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
87 "shadow"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
88 "cl-macs")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
89 "Lisp packages that need early byte compilation.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
90
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
91 (defvar packages-unbytecompiled-lisp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
92 '("paths.el"
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
93 "dumped-lisp.el"
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
94 "dumped-pkg-lisp.el"
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
95 "version.el")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
96 "Lisp packages that should not be byte compiled.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
97
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
98
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
99 ;; Copied from help.el, could possibly move it to here permanently.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
100 ;; Unlike the FSF version, our `locate-library' uses the `locate-file'
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
101 ;; primitive, which should make it lightning-fast.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
102
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
103 (defun locate-library (library &optional nosuffix path interactive-call)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
104 "Show the precise file name of Emacs library LIBRARY.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
105 This command searches the directories in `load-path' like `M-x load-library'
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
106 to find the file that `M-x load-library RET LIBRARY RET' would load.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
107 Optional second arg NOSUFFIX non-nil means don't add suffixes `.elc' or `.el'
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
108 to the specified name LIBRARY.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
109
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
110 If the optional third arg PATH is specified, that list of directories
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
111 is used instead of `load-path'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
112 (interactive (list (read-string "Locate library: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
113 nil nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
114 t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
115 (let ((result
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
116 (locate-file
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
117 library
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
118 (or path load-path)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
119 (cond ((or (rassq 'jka-compr-handler file-name-handler-alist)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
120 (and (boundp 'find-file-hooks)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
121 (member 'crypt-find-file-hook find-file-hooks)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
122 ;; Compression involved.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
123 (if nosuffix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
124 ":.gz:.Z"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
125 ".elc:.elc.gz:elc.Z:.el:.el.gz:.el.Z::.gz:.Z"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
126 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
127 ;; No compression.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
128 (if nosuffix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
129 ""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
130 ".elc:.el:")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
131 4)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
132 (and interactive-call
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
133 (if result
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
134 (message "Library is file %s" result)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
135 (message "No library %s in search path" library)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
136 result))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
137
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
138 (defun packages-add-suffix (str)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
139 (if (null (string-match "\\.el\\'" str))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
140 (concat str ".elc")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
141 str))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
142
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
143 (defun list-autoloads-path ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
144 "List autoloads from precomputed load-path."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
145 (let ((path load-path)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
146 autoloads)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
147 (while path
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
148 (if (file-exists-p (concat (car path)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
149 autoload-file-name))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
150 (setq autoloads (cons (concat (car path)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
151 autoload-file-name)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
152 autoloads)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
153 (setq path (cdr path)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
154 autoloads))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
155
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
156 (defun list-autoloads ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
157 "List autoload files in (what will be) the normal lisp search path.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
158 This function is used during build to find where the global symbol files so
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
159 they can be perused for their useful information."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
160 ;; Source directory may not be initialized yet.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
161 ;; (print (prin1-to-string load-path))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
162 (if (null source-directory)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
163 (setq source-directory (concat (car load-path) "./")))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
164 (let ((files (directory-files (file-name-as-directory source-directory) t ".*"))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
165 file autolist)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
166 ;; (print (prin1-to-string source-directory))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
167 ;; (print (prin1-to-string files))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
168 (while (setq file (car-safe files))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
169 (if (and (file-directory-p file)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
170 (file-exists-p (concat file "/" autoload-file-name)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
171 (setq autolist (cons (concat file "/" autoload-file-name)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
172 autolist)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
173 (setq files (cdr files)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
174 autolist))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
175
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
176 ;; The following function is called from temacs
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
177 (defun packages-find-packages-1 (package path-only append-p user-package)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
178 "Search the supplied directory for associated directories.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
179 The top level is assumed to look like:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
180 info/ Contain texinfo files for lisp installed in this hierarchy
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
181 etc/ Contain data files for lisp installled in this hiearchy
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
182 lisp/ Contain directories which either have straight lisp code
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
183 or are self-contained packages of their own.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
184
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
185 If the argument `append-p' is non-nil, the found directories will be
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
186 appended to the paths, otherwise, they will be prepended.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
187
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
188 This is an internal function. Do not call it after startup."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
189 ;; Info files
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
190 (if (and (null path-only) (file-directory-p (concat package "/info")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
191 (let ((dir (concat package "/info/")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
192 (if (not (member dir Info-default-directory-list))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
193 (nconc Info-default-directory-list (list dir)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
194 ;; Data files
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
195 (if (and (null path-only) (file-directory-p (concat package "/etc")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
196 (setq data-directory-list
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
197 (if append-p
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
198 (append data-directory-list (list (concat package "/etc/")))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
199 (cons (concat package "/etc/") data-directory-list))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
200 ;; Lisp files
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
201 (if (file-directory-p (concat package "/lisp"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
202 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
203 ; (print (concat "DIR: "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
204 ; (if user-package "[USER]" "")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
205 ; package
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
206 ; "/lisp/"))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
207 (setq load-path
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
208 (if append-p
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
209 (append load-path (list (concat package "/lisp/")))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
210 (cons (concat package "/lisp/") load-path)))
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
211
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
212 ;; Locate and process a dumped-lisp.el file if it exists
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
213 (if (and (running-temacs-p)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
214 (file-exists-p (concat package "/lisp/dumped-lisp.el")))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
215 (let (package-lisp)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
216 (load (concat package "/lisp/dumped-lisp.el"))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
217 (if package-lisp
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
218 (progn
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
219 (if (boundp 'preloaded-file-list)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
220 (setq preloaded-file-list
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
221 (append preloaded-file-list package-lisp)))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
222 (if (fboundp 'load-gc)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
223 (setq dumped-lisp-packages
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
224 (append dumped-lisp-packages package-lisp)))))))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
225
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
226 (if user-package
233
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
227 (condition-case error
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
228 (load (concat package "/lisp/"
233
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
229 (file-name-sans-extension autoload-file-name))
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
230 t)
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
231 (error
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
232 (warn (format "Autoload error in: %s/lisp/:\n\t%s"
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
233 package
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
234 (with-output-to-string
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
235 (display-error error nil)))))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
236 (let ((dirs (directory-files (concat package "/lisp/")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
237 t "^[^-.]" nil 'dirs-only))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
238 dir)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
239 (while dirs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
240 (setq dir (car dirs))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
241 ; (print (concat "DIR: " dir "/"))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
242 (setq load-path
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
243 (if append-p
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
244 (append load-path (list (concat dir "/")))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
245 (cons (concat dir "/") load-path)))
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
246
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
247 ;; Locate and process a dumped-lisp.el file if it exists
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
248 (if (and (running-temacs-p)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
249 (file-exists-p (concat dir "/dumped-lisp.el")))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
250 (let (package-lisp)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
251 (load (concat dir "/dumped-lisp.el"))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
252 (if package-lisp
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
253 (progn
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
254 (if (boundp 'preloaded-file-list)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
255 (setq preloaded-file-list
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
256 (append preloaded-file-list package-lisp)))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
257 (if (fboundp 'load-gc)
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
258 (setq dumped-lisp-packages
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
259 (append dumped-lisp-packages package-lisp)))))))
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 217
diff changeset
260
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
261 (if user-package
233
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
262 (condition-case error
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
263 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
264 ; (print
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
265 ; (concat dir "/"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
266 ; (file-name-sans-extension autoload-file-name)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
267 (load
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
268 (concat dir "/"
233
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
269 (file-name-sans-extension autoload-file-name))
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
270 t))
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
271 (error
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
272 (warn (format "Autoload error in: %s/:\n\t%s"
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
273 dir
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
274 (with-output-to-string
52952cbfc5b5 Import from CVS: tag r20-5b15
cvs
parents: 227
diff changeset
275 (display-error error nil)))))))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
276 (packages-find-packages-1 dir path-only append-p user-package)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
277 (setq dirs (cdr dirs)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
278
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
279 ;; The following function is called from temacs
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
280 (defun packages-find-packages-2 (path path-only append-p suppress-user)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
281 "Search the supplied path for associated directories.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
282 If the argument `append-p' is non-nil, the found directories will be
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
283 appended to the paths, otherwise, they will be prepended.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
284
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
285 This is an internal function. Do not call it after startup."
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
286 (let (dir)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
287 (while path
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
288 (setq dir (car path))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
289 ;; (prin1 (concat "Find: " (expand-file-name dir) "\n"))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
290 (if (null (and (or suppress-user inhibit-package-init)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
291 (string-match "^~" dir)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
292 (progn
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
293 ;; (print dir)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
294 (packages-find-packages-1 (expand-file-name dir)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
295 path-only
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
296 append-p
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
297 (string-match "^~" dir))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
298 (setq path (cdr path)))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
299
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
300 ;; The following function is called from temacs
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
301 (defun packages-find-packages (pkg-path path-only &optional suppress-user)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
302 "Search the supplied path for additional info/etc/lisp directories.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
303 Lisp directories if configured prior to build time will have equivalent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
304 status as bundled packages.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
305 If the argument `path-only' is non-nil, only the `load-path' will be set,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
306 otherwise data directories and info directories will be added.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
307 If the optional argument `suppress-user' is non-nil, package directories
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
308 rooted in a user login directory (like ~/.xemacs) will not be searched.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
309 This is used at dump time to suppress the builder's local environment."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
310 (let ((prefix-path nil))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
311 (while (and pkg-path (car pkg-path))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
312 (setq prefix-path (cons (car pkg-path) prefix-path)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
313 pkg-path (cdr pkg-path)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
314 (packages-find-packages-2 (cdr pkg-path) path-only t suppress-user)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
315 (packages-find-packages-2 prefix-path path-only nil suppress-user)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
316
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
317
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
318 ;; Data-directory is really a list now. Provide something to search it for
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
319 ;; directories.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
320
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
321 (defun locate-data-directory (name &optional dir-list)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
322 "Locate a directory in a search path DIR-LIST (a list of directories).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
323 If no DIR-LIST is supplied, it defaults to `data-directory-list'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
324 (unless dir-list
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
325 (setq dir-list data-directory-list))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
326 (let (found found-dir)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
327 (while (and (null found-dir) dir-list)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
328 (setq found (concat (car dir-list) name "/")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
329 found-dir (file-directory-p found))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
330 (or found-dir
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
331 (setq found nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
332 (setq dir-list (cdr dir-list)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
333 found))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
334
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
335 ;; Data-directory is really a list now. Provide something to search it for
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
336 ;; files.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
337
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
338 (defun locate-data-file (name &optional dir-list)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
339 "Locate a file in a search path DIR-LIST (a list of directories).
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
340 If no DIR-LIST is supplied, it defaults to `data-directory-list'."
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
341 (unless dir-list
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
342 (setq dir-list data-directory-list))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
343 (let (found found-file)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
344 (while (and (null found-file) dir-list)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
345 (setq found (concat (car dir-list) name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
346 found-file (and (file-exists-p found)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
347 (not (file-directory-p found))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
348 (or found-file
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
349 (setq found nil))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
350 (setq dir-list (cdr dir-list)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
351 found))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
352
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
353 ;; If we are being loaded as part of being dumped, bootstrap the rest of the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
354 ;; load-path for loaddefs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
355 (if (fboundp 'load-gc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
356 (packages-find-packages package-path t t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
357
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
358 (provide 'packages)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
359
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
360 ;;; packages.el ends here