Mercurial > hg > xemacs-beta
annotate lisp/update-elc.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 8608eadee6ba |
| children | a9094f28f9a9 |
| rev | line source |
|---|---|
| 1303 | 1 ;;; update-elc.el --- Bytecompile out-of-date dumped files, pre-dumping |
| 428 | 2 |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 442 | 4 ;; Copyright (C) 1996 Sun Microsystems, Inc. |
| 1261 | 5 ;; Copyright (C) 2001, 2003 Ben Wing. |
| 428 | 6 |
| 528 | 7 ;; Author: Ben Wing <ben@xemacs.org> |
| 8 ;; Based On: Original by Steven L Baur <steve@xemacs.org> | |
| 428 | 9 ;; Maintainer: XEmacs Development Team |
| 10 ;; Keywords: internal | |
| 11 | |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
| 14 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 15 ;; under the terms of the GNU General Public License as published by | |
| 16 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 17 ;; any later version. | |
| 18 | |
| 19 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 22 ;; General Public License for more details. | |
| 23 | |
| 24 ;; You should have received a copy of the GNU General Public License | |
| 25 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 26 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 27 ;; Boston, MA 02111-1307, USA. | |
| 28 | |
| 29 ;;; Synched up with: Not in FSF. | |
| 30 | |
| 31 ;;; Commentary: | |
| 32 | |
| 33 ;; Byte compile the .EL files necessary to dump out xemacs. | |
| 1261 | 34 ;; Also update the auto-autoloads.el files. |
| 35 | |
| 428 | 36 ;; Use this file like this: |
| 37 | |
| 38 ;; temacs -batch -l ../lisp/update-elc.el $lisp | |
| 39 | |
| 40 ;; where $lisp comes from the Makefile. .elc files listed in $lisp will | |
| 41 ;; cause the corresponding .el file to be compiled. .el files listed in | |
| 42 ;; $lisp will be ignored. | |
| 43 | |
| 44 ;; (the idea here is that you can bootstrap if your .ELC files | |
| 45 ;; are missing or badly out-of-date) | |
| 46 | |
| 442 | 47 ;; See also update-elc-2.el |
| 428 | 48 |
| 49 ;;; Code: | |
| 50 | |
| 1261 | 51 ;; Help debug problems. |
| 52 (setq stack-trace-on-error t | |
| 53 load-always-display-messages t) | |
| 54 | |
| 428 | 55 (defvar processed nil) |
| 56 (defvar update-elc-files-to-compile nil) | |
| 528 | 57 (defvar need-to-rebuild-autoloads nil) |
| 58 (defvar need-to-rebuild-mule-autoloads nil) | |
| 59 (defvar need-to-recompile-autoloads nil) | |
| 60 (defvar need-to-recompile-mule-autoloads nil) | |
| 1330 | 61 (defvar exe-target nil) |
| 62 (defvar dump-target nil) | |
| 63 (defvar dump-target-out-of-date-wrt-dump-files nil) | |
| 64 ;(defvar dump-target-out-of-date-wrt-exe-target nil) | |
| 428 | 65 |
| 66 ;(setq update-elc-files-to-compile | |
| 67 ; (delq nil | |
| 68 ; (mapcar (function | |
| 69 ; (lambda (x) | |
| 70 ; (if (string-match "\.elc$" x) | |
| 71 ; (let ((src (substring x 0 -1))) | |
| 72 ; (if (file-newer-than-file-p src x) | |
| 73 ; (progn | |
| 74 ; (and (file-exists-p x) | |
| 75 ; (null (file-writable-p x)) | |
| 76 ; (set-file-modes x (logior (file-modes x) 128))) | |
| 77 ; src)))))) | |
| 78 ; ;; -batch gets filtered out. | |
| 79 ; (nthcdr 3 command-line-args)))) | |
| 80 | |
| 1330 | 81 |
| 3511 | 82 (defvar build-directory (expand-file-name ".." invocation-directory)) |
| 83 | |
| 1330 | 84 (defvar source-lisp (file-name-directory (expand-file-name |
| 3511 | 85 (nth 2 command-line-args)))) |
| 86 | |
| 1330 | 87 (defvar source-lisp-mule (expand-file-name "mule" source-lisp)) |
| 3511 | 88 (defvar source-directory (expand-file-name ".." source-lisp)) |
| 1330 | 89 (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp)) |
| 90 (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp)) | |
| 91 (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule)) | |
| 92 (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule)) | |
| 93 | |
| 94 (setq load-path (list source-lisp)) | |
| 428 | 95 |
| 96 (load "find-paths.el") | |
| 97 (load "packages.el") | |
| 98 (load "setup-paths.el") | |
| 1261 | 99 |
| 100 ;; Lisp files loaded in order to byte compile anything. If any are out of | |
| 101 ;; date, we need to load them as .el's, byte compile them, and reload as | |
| 102 ;; .elc's. | |
| 103 (defvar lisp-files-needed-for-byte-compilation | |
| 104 '("bytecomp" | |
|
5319
ed5d4f081fa9
cl-macs belongs in lisp-files-needed-for-byte-compilation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5264
diff
changeset
|
105 "cl-macs" |
| 1261 | 106 "byte-optimize")) |
| 107 | |
| 1263 | 108 ;; Lisp files not in `lisp-files-needed-for-byte-compilation' that need |
| 109 ;; early byte compilation. These are files loaded by update-elc.el in | |
| 110 ;; order to do the compilation of all the rest of the files. | |
| 1261 | 111 (defvar lisp-files-needing-early-byte-compilation |
| 2548 | 112 '("easy-mmode" |
| 1261 | 113 "autoload" |
|
5319
ed5d4f081fa9
cl-macs belongs in lisp-files-needed-for-byte-compilation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5264
diff
changeset
|
114 "shadow")) |
| 1261 | 115 |
| 116 (defvar unbytecompiled-lisp-files | |
| 117 '("paths.el" | |
| 118 "dumped-lisp.el" | |
| 119 "dumped-pkg-lisp.el" | |
| 4246 | 120 "raw-process.el") |
| 2367 | 121 "Lisp files that should not be byte compiled. |
| 122 Files in `additional-dump-dependencies' do not need to be listed here.") | |
| 123 | |
| 124 (defvar additional-dump-dependencies | |
|
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
125 (nconc '("loadup.el" |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
126 "loadup-el.el" |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
127 "update-elc.el") |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
128 (if (featurep 'mule) |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
129 '("mule/make-coding-system"))) |
| 2367 | 130 "Lisp files that are not dumped but which the dump depends on. |
| 131 If any of these files are changed, we need to redump.") | |
| 428 | 132 |
| 1298 | 133 (defvar lisp-files-ignored-when-checking-for-autoload-updating |
| 134 '("custom-load.el" | |
| 135 "auto-autoloads.el") | |
| 136 "Lisp files that should not trigger auto-autoloads rebuilding.") | |
| 137 | |
| 528 | 138 (defun update-elc-chop-extension (file) |
| 139 (if (string-match "\\.elc?$" file) | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4995
diff
changeset
|
140 (subseq file 0 (match-beginning 0)) |
| 528 | 141 file)) |
| 428 | 142 |
| 528 | 143 ;; we used to call packages-list-autoloads here, but it's false generality. |
| 144 ;; we need to handle each autoload file differently and there are only | |
| 145 ;; two of them. | |
| 428 | 146 |
| 1261 | 147 (let (preloaded-file-list site-load-packages files-to-process) |
| 528 | 148 |
| 1330 | 149 (load (expand-file-name "dumped-lisp.el" source-lisp)) |
| 442 | 150 |
| 1330 | 151 ;; two setups here: |
| 152 ;; (1) temacs.exe is undumped, dumped into xemacs.exe. Happens with | |
| 153 ;; unexec, but also with pdump under MS Windows native, since | |
| 154 ;; the dumped data is stored as a resource in the xemacs.exe | |
| 155 ;; executable. | |
| 156 ;; (2) xemacs.exe is dumped or undumped. Running `xemacs -nd' gets | |
| 157 ;; you the equivalent of `temacs'. Dumping creates a file | |
| 158 ;; `xemacs.dmp'. | |
| 1261 | 159 |
| 1330 | 160 (cond ((eq system-type 'windows-nt) |
| 161 (setq exe-target "src/temacs.exe" | |
| 162 dump-target "src/xemacs.exe")) | |
| 163 ;; #### need better ways of getting config params | |
| 164 ((not (memq 'pdump (emacs-run-status))) | |
| 165 (setq exe-target "src/temacs" | |
| 166 dump-target "src/xemacs")) | |
| 167 (t | |
| 168 (setq exe-target "src/xemacs" | |
| 169 dump-target "src/xemacs.dmp"))) | |
| 1261 | 170 |
| 3511 | 171 (setq exe-target (expand-file-name exe-target build-directory)) |
| 172 (setq dump-target (expand-file-name dump-target build-directory)) | |
| 1330 | 173 |
| 174 ;; Not currently used. | |
| 175 ; (setq dump-target-out-of-date-wrt-exe-target | |
| 176 ; (cond ((not dump-target) t) | |
| 177 ; (temacs-exe (file-newer-than-file-p temacs-exe dump-target)) | |
| 178 ; ((not data-file) t) | |
| 179 ; (t (file-newer-than-file-p dump-target data-file)))) | |
| 180 ; (setq dump-target-exists (or (and temacs-exe dump-target) | |
| 181 ; (and data-file dump-target)))) | |
| 1261 | 182 |
| 428 | 183 ;; Path setup |
| 184 (let ((package-preloaded-file-list | |
| 185 (packages-collect-package-dumped-lisps late-package-load-path))) | |
| 186 | |
| 187 (setq preloaded-file-list | |
| 188 (append package-preloaded-file-list | |
| 189 preloaded-file-list | |
| 190 packages-hardcoded-lisp))) | |
| 191 | |
| 3511 | 192 (load (expand-file-name "site-packages" source-directory) t t) |
| 428 | 193 (setq preloaded-file-list |
| 194 (append packages-hardcoded-lisp | |
| 195 preloaded-file-list | |
| 196 site-load-packages)) | |
| 1261 | 197 ;; bytecomp, byte-optimize, autoload, etc. are mentioned specially |
| 198 ;; in the lisp-files-need* variables. | |
| 199 (setq files-to-process (append lisp-files-needed-for-byte-compilation | |
| 200 lisp-files-needing-early-byte-compilation | |
| 2367 | 201 additional-dump-dependencies |
| 1261 | 202 preloaded-file-list)) |
| 528 | 203 (while files-to-process |
| 204 (let* ((arg (car files-to-process)) | |
| 2367 | 205 (arg-is-dump-dependency |
| 206 (or (member arg preloaded-file-list) | |
| 207 (member arg additional-dump-dependencies))) | |
| 528 | 208 (arg-sans-extension (update-elc-chop-extension arg)) |
| 209 (full-arg (locate-library arg-sans-extension)) | |
| 210 (full-arg-sans-extension | |
| 211 (if (null full-arg) | |
| 212 (progn | |
| 213 (print (format "Error: Library file %s not found" arg)) | |
| 1261 | 214 (backtrace) |
| 528 | 215 ;; Uncomment in case of trouble |
| 2456 | 216 ;;(print (format "late-package-hierarchies: %S" late-package-hierarchies)) |
| 528 | 217 ;;(print (format "guessed-roots: %S" |
| 218 ;; (paths-find-emacs-roots | |
| 219 ;; invocation-directory invocation-name))) | |
| 220 (kill-emacs)) | |
| 221 (update-elc-chop-extension full-arg))) | |
| 222 (full-arg-el (concat full-arg-sans-extension ".el")) | |
| 223 (full-arg-elc (concat full-arg-sans-extension ".elc")) | |
| 1261 | 224 (full-arg-dir (file-name-directory full-arg-el))) |
| 528 | 225 |
| 2367 | 226 ; (print full-arg-el) |
| 442 | 227 |
| 228 ;; now check if .el or .elc is newer than the dumped exe. | |
| 229 ;; if so, need to redump. | |
| 2367 | 230 (when (and dump-target arg-is-dump-dependency |
| 1298 | 231 ;; no need to check for existence of either of the files |
| 232 ;; because of the definition of file-newer-than-file-p. | |
| 1330 | 233 (or (file-newer-than-file-p full-arg-el dump-target) |
| 234 (file-newer-than-file-p full-arg-elc dump-target))) | |
| 235 (setq dump-target-out-of-date-wrt-dump-files t)) | |
| 528 | 236 |
| 237 (if (and (not (member (file-name-nondirectory arg) | |
| 1261 | 238 unbytecompiled-lisp-files)) |
| 2367 | 239 (not (member (file-name-nondirectory arg) |
| 240 additional-dump-dependencies)) | |
| 528 | 241 (not (member full-arg-el processed)) |
| 1298 | 242 ;; no need to check for existence of either of the files |
| 243 ;; because of the definition of file-newer-than-file-p. | |
| 244 (file-newer-than-file-p full-arg-el full-arg-elc)) | |
| 528 | 245 (setq processed (cons full-arg-el processed))) |
| 246 | |
| 247 (setq files-to-process (cdr files-to-process)))) | |
| 442 | 248 |
| 1261 | 249 ;; Check if we need to rebuild the auto-autoloads.el files -- that is, |
| 250 ;; if ANY .el files have changed. | |
| 1330 | 251 (let ((dirs-to-check (list source-lisp source-lisp-mule))) |
| 1261 | 252 (while dirs-to-check |
| 253 (let* ((dir (car dirs-to-check)) | |
| 254 (full-dir (expand-file-name dir)) | |
| 255 (all-files-in-dir (directory-files full-dir t "\\.el$" nil t)) | |
| 256 (autoload-file | |
| 257 (expand-file-name "auto-autoloads.el" full-dir)) | |
| 1330 | 258 (autoload-is-mule (equal dir source-lisp-mule))) |
| 1261 | 259 (while all-files-in-dir |
| 260 (let* ((full-arg (car all-files-in-dir))) | |
| 1298 | 261 ;; custom-load.el always gets regenerated so don't let that |
| 262 ;; trigger us. | |
| 263 (when (and (not | |
| 264 (member | |
| 265 (file-name-nondirectory full-arg) | |
| 266 lisp-files-ignored-when-checking-for-autoload-updating | |
| 267 )) | |
| 268 (file-newer-than-file-p full-arg autoload-file)) | |
| 1261 | 269 (if autoload-is-mule |
| 270 (setq need-to-rebuild-mule-autoloads t) | |
| 271 (setq need-to-rebuild-autoloads t)))) | |
| 272 (setq all-files-in-dir (cdr all-files-in-dir)))) | |
| 273 (setq dirs-to-check (cdr dirs-to-check)))) | |
| 274 | |
| 1330 | 275 (if dump-target-out-of-date-wrt-dump-files |
| 442 | 276 (condition-case nil |
| 1330 | 277 (write-region-internal |
| 3511 | 278 "foo" nil (expand-file-name "src/NEEDTODUMP" build-directory)) |
| 442 | 279 (file-error nil))) |
| 280 | |
| 281 ) | |
| 428 | 282 |
| 528 | 283 (when (or need-to-rebuild-autoloads |
| 1298 | 284 ;; no real need for the following check either, because if the file |
| 285 ;; doesn't exist, need-to-rebuild-autoloads gets set above. but | |
| 286 ;; it's only one call, so it won't slow things down much and it keeps | |
| 287 ;; the logic cleaner. | |
| 1330 | 288 (not (file-exists-p aa-lisp)) |
| 1298 | 289 ;; no need to check for file-exists of .elc due to definition |
| 290 ;; of file-newer-than-file-p | |
| 1330 | 291 (file-newer-than-file-p aa-lisp aac-lisp)) |
| 528 | 292 (setq need-to-recompile-autoloads t)) |
| 293 | |
| 294 (when (or need-to-rebuild-mule-autoloads | |
| 1298 | 295 ;; not necessary but ... see comment above. |
| 1330 | 296 (not (file-exists-p aa-lisp-mule)) |
| 1298 | 297 ;; no need to check for file-exists of .elc due to definition |
| 298 ;; of file-newer-than-file-p | |
| 1330 | 299 (file-newer-than-file-p aa-lisp-mule aac-lisp-mule)) |
| 528 | 300 (setq need-to-recompile-mule-autoloads t)) |
| 301 | |
| 302 (when (not (featurep 'mule)) | |
| 303 ;; sorry charlie. | |
| 304 (setq need-to-rebuild-mule-autoloads nil | |
| 305 need-to-recompile-mule-autoloads nil)) | |
| 306 | |
| 428 | 307 (setq update-elc-files-to-compile (append update-elc-files-to-compile |
| 622 | 308 (nreverse processed))) |
| 428 | 309 |
| 1261 | 310 ;(print update-elc-files-to-compile) |
| 428 | 311 |
| 1261 | 312 (let ((do-autoload-commands |
| 313 (append | |
| 314 (if (or need-to-rebuild-autoloads | |
| 315 need-to-rebuild-mule-autoloads) | |
| 1330 | 316 (list "-l" "autoload")) |
| 1261 | 317 (if need-to-rebuild-autoloads |
| 2548 | 318 (list "-f" "batch-update-directory-autoloads" |
| 1330 | 319 "auto" source-lisp)) |
| 1261 | 320 (if need-to-rebuild-mule-autoloads |
| 2548 | 321 (list "-f" "batch-update-directory-autoloads" |
| 1330 | 322 "mule" source-lisp-mule)) |
| 1261 | 323 (if need-to-recompile-autoloads |
| 1330 | 324 (list "-f" "batch-byte-compile-one-file" |
| 325 aa-lisp)) | |
| 1261 | 326 (if need-to-recompile-mule-autoloads |
| 1330 | 327 (list "-f" "batch-byte-compile-one-file" |
| 328 aa-lisp-mule))))) | |
| 1298 | 329 (condition-case nil |
| 3511 | 330 (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-directory)) |
| 1298 | 331 (file-error nil)) |
| 1261 | 332 (cond ((and (not update-elc-files-to-compile) |
| 333 (not need-to-rebuild-autoloads) | |
| 334 (not need-to-rebuild-mule-autoloads) | |
| 335 (not need-to-recompile-autoloads) | |
| 336 (not need-to-recompile-mule-autoloads)) | |
| 1315 | 337 ;; (1) Nothing to do at all. |
| 338 ) | |
| 1298 | 339 ((not update-elc-files-to-compile) |
| 1261 | 340 ;; (2) We have no files to byte-compile, but we do need to |
| 1298 | 341 ;; regenerate and compile the auto-autoloads file, so signal |
| 342 ;; update-elc-2 to do it. This is much faster than loading | |
| 343 ;; all the .el's and doing it here. (We only need to rebuild | |
| 344 ;; the autoloads here when we have files to compile, since | |
| 345 ;; they may depend on the updated autoloads.) | |
| 346 (condition-case nil | |
| 1330 | 347 (write-region-internal |
| 3511 | 348 "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-directory)) |
| 1298 | 349 (file-error nil)) |
| 1315 | 350 ) |
| 1261 | 351 (t |
| 352 (let ((bc-bootstrap | |
| 353 (mapcar #'(lambda (arg) | |
| 354 (concat (update-elc-chop-extension | |
| 355 (locate-library arg)) ".el")) | |
| 356 lisp-files-needed-for-byte-compilation)) | |
| 357 (bootstrap-other | |
| 358 (mapcar #'(lambda (arg) | |
| 359 (concat (update-elc-chop-extension | |
| 360 (locate-library arg)) ".el")) | |
| 361 lisp-files-needing-early-byte-compilation))) | |
| 362 (setq inhibit-autoloads t) | |
| 528 | 363 ;; if bytecomp or byte-optimize need recompiling, then load |
| 364 ;; the .el version of them first, recompile them, and reload | |
| 365 ;; the .elc versions to recompile everything else (so we won't | |
| 366 ;; be waiting until the cows come home). we need to set | |
| 367 ;; load-ignore-elc-files because byte-optimize gets autoloaded | |
| 368 ;; from bytecomp. | |
| 1261 | 369 (let ((recompile-bc-bootstrap |
|
5264
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
370 (mapcan |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
371 #'(lambda (arg) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
372 (when (member arg update-elc-files-to-compile) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
373 (append '("-f" "batch-byte-compile-one-file") |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
374 (list arg)))) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
375 bc-bootstrap)) |
| 1261 | 376 (recompile-bootstrap-other |
|
5264
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
377 (mapcan |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
378 #'(lambda (arg) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
379 (when (member arg update-elc-files-to-compile) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
380 (append '("-f" "batch-byte-compile-one-file") |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
381 (list arg)))) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
382 bootstrap-other))) |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4690
diff
changeset
|
383 (mapc |
| 1261 | 384 #'(lambda (arg) |
| 385 (setq update-elc-files-to-compile | |
|
5338
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5319
diff
changeset
|
386 (delete* arg update-elc-files-to-compile |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5319
diff
changeset
|
387 :test (if default-file-system-ignore-case |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5319
diff
changeset
|
388 #'equalp |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5319
diff
changeset
|
389 #'equal)))) |
| 1261 | 390 (append bc-bootstrap bootstrap-other)) |
| 391 (setq command-line-args | |
| 392 (append | |
| 393 '("-l" "loadup-el.el" "run-temacs" | |
| 394 "-batch" "-no-packages" "-no-autoloads" | |
| 395 "-eval" "(setq stack-trace-on-error t)" | |
| 396 "-eval" "(setq load-always-display-messages t)") | |
| 397 (when recompile-bc-bootstrap | |
| 398 (append | |
| 399 '("-eval" "(setq load-ignore-elc-files t)" | |
| 400 "-l" "bytecomp") | |
| 401 recompile-bc-bootstrap | |
| 402 '("-eval" "(setq load-ignore-elc-files nil)"))) | |
| 403 '("-l" "bytecomp") | |
| 404 ;; likewise, recompile autoload.el etc. if out-of-date. | |
| 405 recompile-bootstrap-other | |
| 406 ;; then generate autoloads for lisp and maybe lisp/mule. | |
| 407 do-autoload-commands | |
| 408 ;; now load the autoloads and compile alles anderes. | |
| 409 '("-eval" "(setq inhibit-autoloads nil)" | |
| 410 "-f" "startup-load-autoloads" | |
| 411 "-f" "batch-byte-compile") | |
| 412 update-elc-files-to-compile | |
| 413 )))) | |
| 414 | |
| 415 ;;(print command-line-args) | |
| 416 (load "loadup-el.el")))) | |
| 428 | 417 |
| 1303 | 418 (kill-emacs) |
| 428 | 419 |
| 420 ;;; update-elc.el ends here |