comparison lisp/setup-paths.el @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents b2472a1930f2
children ca9a9ec9c1c1
comparison
equal deleted inserted replaced
271:c7b7086b0a39 272:c5d627a313b1
49 (paths-find-version-directory roots "lisp" 49 (paths-find-version-directory roots "lisp"
50 nil 50 nil
51 configure-lisp-directory)) 51 configure-lisp-directory))
52 52
53 (defun paths-construct-load-path 53 (defun paths-construct-load-path
54 (roots early-package-load-path late-package-load-path 54 (roots early-package-load-path late-package-load-path last-package-load-path
55 &optional inhibit-site-lisp) 55 &optional inhibit-site-lisp)
56 "Construct the load path." 56 "Construct the load path."
57 (let* ((envvar-value (getenv "EMACSLOADPATH")) 57 (let* ((envvar-value (getenv "EMACSLOADPATH"))
58 (env-load-path (and envvar-value 58 (env-load-path (and envvar-value
59 (decode-path-internal envvar-value))) 59 (decode-path-internal envvar-value)))
63 (site-lisp-load-path 63 (site-lisp-load-path
64 (and site-lisp-directory 64 (and site-lisp-directory
65 (paths-find-recursive-load-path (list site-lisp-directory)))) 65 (paths-find-recursive-load-path (list site-lisp-directory))))
66 (lisp-directory (paths-find-lisp-directory roots)) 66 (lisp-directory (paths-find-lisp-directory roots))
67 (lisp-load-path 67 (lisp-load-path
68 (paths-find-recursive-load-path (list lisp-directory)))) 68 (and lisp-directory
69 (paths-find-recursive-load-path (list lisp-directory)))))
69 (append env-load-path 70 (append env-load-path
70 early-package-load-path 71 early-package-load-path
71 site-lisp-load-path 72 site-lisp-load-path
72 late-package-load-path 73 late-package-load-path
73 lisp-load-path))) 74 lisp-load-path
75 last-package-load-path)))
74 76
75 (defun paths-construct-info-path (roots early-packages late-packages) 77 (defun paths-construct-info-path (roots early-packages late-packages last-packages)
76 "Construct the info path." 78 "Construct the info path."
77 (append 79 (append
78 (packages-find-package-info-path early-packages) 80 (packages-find-package-info-path early-packages)
79 (packages-find-package-info-path late-packages) 81 (packages-find-package-info-path late-packages)
80 (let ((info-directory 82 (let ((info-directory
81 (paths-find-version-directory roots "info" 83 (paths-find-version-directory roots "info"
82 nil 84 nil
83 configure-info-directory))) 85 configure-info-directory)))
84 (and info-directory 86 (and info-directory
85 (list info-directory))) 87 (list info-directory)))
88 (packages-find-package-info-path last-packages)
86 (let ((info-path-envval (getenv "INFOPATH"))) 89 (let ((info-path-envval (getenv "INFOPATH")))
87 (if info-path-envval 90 (if info-path-envval
88 (decode-path-internal info-path-envval) 91 (decode-path-internal info-path-envval)
89 (paths-directories-which-exist configure-info-path))))) 92 (paths-directories-which-exist configure-info-path)))))
90 93
109 112
110 (defun paths-find-exec-directory (roots) 113 (defun paths-find-exec-directory (roots)
111 "Find the binary directory." 114 "Find the binary directory."
112 (paths-find-architecture-directory roots "lib-src")) 115 (paths-find-architecture-directory roots "lib-src"))
113 116
114 (defun paths-construct-exec-path (roots exec-directory early-packages late-packages) 117 (defun paths-construct-exec-path (roots exec-directory
118 early-packages late-packages last-packages)
115 "Find the binary path." 119 "Find the binary path."
116 (append 120 (append
117 (let ((path-envval (getenv "PATH"))) 121 (let ((path-envval (getenv "PATH")))
118 (if path-envval 122 (if path-envval
119 (decode-path-internal path-envval))) 123 (decode-path-internal path-envval)))
120 (packages-find-package-exec-path early-packages) 124 (packages-find-package-exec-path early-packages)
121 (packages-find-package-exec-path late-packages) 125 (packages-find-package-exec-path late-packages)
126 (packages-find-package-exec-path last-packages)
122 (let ((emacspath-envval (getenv "EMACSPATH"))) 127 (let ((emacspath-envval (getenv "EMACSPATH")))
123 (if emacspath-envval 128 (if emacspath-envval
124 (decode-path-internal emacspath-envval) 129 (decode-path-internal emacspath-envval)
125 (paths-directories-which-exist configure-exec-path))) 130 (paths-directories-which-exist configure-exec-path)))
126 (and exec-directory 131 (and exec-directory
128 133
129 (defun paths-find-data-directory (roots) 134 (defun paths-find-data-directory (roots)
130 "Find the data directory." 135 "Find the data directory."
131 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory)) 136 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory))
132 137
133 (defun paths-construct-data-directory-list (data-directory early-packages late-packages) 138 (defun paths-construct-data-directory-list (data-directory
139 early-packages late-packages last-packages)
134 "Find the data path." 140 "Find the data path."
135 (append 141 (append
136 (packages-find-package-data-path early-packages) 142 (packages-find-package-data-path early-packages)
137 (packages-find-package-data-path late-packages) 143 (packages-find-package-data-path late-packages)
144 (packages-find-package-data-path last-packages)
138 (list data-directory))) 145 (list data-directory)))
139 146
140 ;;; setup-paths.el ends here 147 ;;; setup-paths.el ends here