comparison lisp/make-docfile.el @ 4547:ab9e8f0fb295

Check absolute source file names against DOC with #'file-newer-than-file-p. 2008-12-30 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.el: Use absolute source file names when checking if DOC is out of date, don't use relative paths that may not be related to the current directory.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 30 Dec 2008 16:09:59 +0000
parents 061e030e3270
children 788c38f20376
comparison
equal deleted inserted replaced
4546:44129f301385 4547:ab9e8f0fb295
149 (load "find-paths.el") 149 (load "find-paths.el")
150 (load "packages.el") 150 (load "packages.el")
151 (load "setup-paths.el") 151 (load "setup-paths.el")
152 (load "raw-process.el") 152 (load "raw-process.el")
153 153
154 (let (preloaded-file-list arg0 arg package-preloaded-file-list) 154 (let (preloaded-file-list arg0 arg package-preloaded-file-list absolute)
155 (load (expand-file-name "dumped-lisp.el" source-lisp)) 155 (load (expand-file-name "dumped-lisp.el" source-lisp))
156 156
157 (setq package-preloaded-file-list 157 (setq package-preloaded-file-list
158 (packages-collect-package-dumped-lisps late-package-load-path) 158 (packages-collect-package-dumped-lisps late-package-load-path)
159 preloaded-file-list 159 preloaded-file-list
166 ;; Include loadup.el, which is never in preloaded-file-list: 166 ;; Include loadup.el, which is never in preloaded-file-list:
167 processed (cons "loadup.el" processed)) 167 processed (cons "loadup.el" processed))
168 168
169 (while preloaded-file-list 169 (while preloaded-file-list
170 (setq arg0 (packages-add-suffix (car preloaded-file-list)) 170 (setq arg0 (packages-add-suffix (car preloaded-file-list))
171 arg (locate-library arg0)) 171 arg (locate-library arg0)
172 absolute arg)
172 (if (null arg) 173 (if (null arg)
173 (progn 174 (progn
174 (message "Error: dumped file %s does not exist" arg0) 175 (message "Error: dumped file %s does not exist" arg0)
175 ;; Uncomment in case of difficulties 176 ;; Uncomment in case of difficulties
176 ;(message "late-package-hierarchies: %S" 177 ;(message "late-package-hierarchies: %S"
189 ;; in an installed XEmacs easier: 190 ;; in an installed XEmacs easier:
190 (setq arg arg0)) 191 (setq arg arg0))
191 (if (null (member arg processed)) 192 (if (null (member arg processed))
192 (progn 193 (progn
193 (if (and (null docfile-out-of-date) 194 (if (and (null docfile-out-of-date)
194 (file-newer-than-file-p arg docfile)) 195 ;; We need to check the absolute path here:
196 (file-newer-than-file-p absolute docfile))
195 (setq docfile-out-of-date t)) 197 (setq docfile-out-of-date t))
196 (setq processed (cons arg processed))))) 198 (setq processed (cons arg processed)))))
197 (setq preloaded-file-list (cdr preloaded-file-list)))) 199 (setq preloaded-file-list (cdr preloaded-file-list))))
198 200
199 ;; Finally process the list of site-loaded files. 201 ;; Finally process the list of site-loaded files.