Mercurial > hg > xemacs-beta
annotate lisp/update-elc.el @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
| author | ben |
|---|---|
| date | Thu, 04 Nov 2004 23:08:28 +0000 |
| parents | 4542b72c005e |
| children | f4e405a9d18d |
| 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 |
| 82 (defvar build-root (expand-file-name ".." invocation-directory)) | |
| 83 (defvar source-lisp (file-name-directory (expand-file-name | |
| 84 (nth 2 command-line-args)))) | |
| 85 (defvar source-lisp-mule (expand-file-name "mule" source-lisp)) | |
| 86 (defvar source-root (expand-file-name ".." source-lisp)) | |
| 87 (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp)) | |
| 88 (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp)) | |
| 89 (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule)) | |
| 90 (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule)) | |
| 91 | |
| 92 (setq load-path (list source-lisp)) | |
| 428 | 93 |
| 94 (load "find-paths.el") | |
| 95 (load "packages.el") | |
| 96 (load "setup-paths.el") | |
| 1261 | 97 |
| 98 ;; Lisp files loaded in order to byte compile anything. If any are out of | |
| 99 ;; date, we need to load them as .el's, byte compile them, and reload as | |
| 100 ;; .elc's. | |
| 101 (defvar lisp-files-needed-for-byte-compilation | |
| 102 '("bytecomp" | |
| 103 "byte-optimize")) | |
| 104 | |
| 1263 | 105 ;; Lisp files not in `lisp-files-needed-for-byte-compilation' that need |
| 106 ;; early byte compilation. These are files loaded by update-elc.el in | |
| 107 ;; order to do the compilation of all the rest of the files. | |
| 1261 | 108 (defvar lisp-files-needing-early-byte-compilation |
| 109 '(;"easy-mmode" | |
| 110 "autoload" | |
| 111 "shadow" | |
| 112 "cl-macs")) | |
| 113 | |
| 114 (defvar unbytecompiled-lisp-files | |
| 115 '("paths.el" | |
| 116 "dumped-lisp.el" | |
| 117 "dumped-pkg-lisp.el" | |
| 1275 | 118 "raw-process.el" |
| 1315 | 119 "version.el") |
| 2367 | 120 "Lisp files that should not be byte compiled. |
| 121 Files in `additional-dump-dependencies' do not need to be listed here.") | |
| 122 | |
| 123 (defvar additional-dump-dependencies | |
| 124 '("loadup.el" | |
| 125 "loadup-el.el" | |
| 126 "update-elc.el") | |
| 127 "Lisp files that are not dumped but which the dump depends on. | |
| 128 If any of these files are changed, we need to redump.") | |
| 428 | 129 |
| 1298 | 130 (defvar lisp-files-ignored-when-checking-for-autoload-updating |
| 131 '("custom-load.el" | |
| 132 "auto-autoloads.el") | |
| 133 "Lisp files that should not trigger auto-autoloads rebuilding.") | |
| 134 | |
| 528 | 135 (defun update-elc-chop-extension (file) |
| 136 (if (string-match "\\.elc?$" file) | |
| 137 (substring file 0 (match-beginning 0)) | |
| 138 file)) | |
| 428 | 139 |
| 528 | 140 ;; we used to call packages-list-autoloads here, but it's false generality. |
| 141 ;; we need to handle each autoload file differently and there are only | |
| 142 ;; two of them. | |
| 428 | 143 |
| 1261 | 144 (let (preloaded-file-list site-load-packages files-to-process) |
| 528 | 145 |
| 1330 | 146 (load (expand-file-name "dumped-lisp.el" source-lisp)) |
| 442 | 147 |
| 1330 | 148 ;; two setups here: |
| 149 ;; (1) temacs.exe is undumped, dumped into xemacs.exe. Happens with | |
| 150 ;; unexec, but also with pdump under MS Windows native, since | |
| 151 ;; the dumped data is stored as a resource in the xemacs.exe | |
| 152 ;; executable. | |
| 153 ;; (2) xemacs.exe is dumped or undumped. Running `xemacs -nd' gets | |
| 154 ;; you the equivalent of `temacs'. Dumping creates a file | |
| 155 ;; `xemacs.dmp'. | |
| 1261 | 156 |
| 1330 | 157 (cond ((eq system-type 'windows-nt) |
| 158 (setq exe-target "src/temacs.exe" | |
| 159 dump-target "src/xemacs.exe")) | |
| 160 ;; #### need better ways of getting config params | |
| 161 ((not (memq 'pdump (emacs-run-status))) | |
| 162 (setq exe-target "src/temacs" | |
| 163 dump-target "src/xemacs")) | |
| 164 (t | |
| 165 (setq exe-target "src/xemacs" | |
| 166 dump-target "src/xemacs.dmp"))) | |
| 1261 | 167 |
| 1330 | 168 (setq exe-target (expand-file-name exe-target build-root)) |
| 169 (setq dump-target (expand-file-name dump-target build-root)) | |
| 170 | |
| 171 ;; Not currently used. | |
| 172 ; (setq dump-target-out-of-date-wrt-exe-target | |
| 173 ; (cond ((not dump-target) t) | |
| 174 ; (temacs-exe (file-newer-than-file-p temacs-exe dump-target)) | |
| 175 ; ((not data-file) t) | |
| 176 ; (t (file-newer-than-file-p dump-target data-file)))) | |
| 177 ; (setq dump-target-exists (or (and temacs-exe dump-target) | |
| 178 ; (and data-file dump-target)))) | |
| 1261 | 179 |
| 428 | 180 ;; Path setup |
| 181 (let ((package-preloaded-file-list | |
| 182 (packages-collect-package-dumped-lisps late-package-load-path))) | |
| 183 | |
| 184 (setq preloaded-file-list | |
| 185 (append package-preloaded-file-list | |
| 186 preloaded-file-list | |
| 187 packages-hardcoded-lisp))) | |
| 188 | |
| 1330 | 189 (load (expand-file-name "site-packages" source-root) t t) |
| 428 | 190 (setq preloaded-file-list |
| 191 (append packages-hardcoded-lisp | |
| 192 preloaded-file-list | |
| 193 site-load-packages)) | |
| 1261 | 194 ;; bytecomp, byte-optimize, autoload, etc. are mentioned specially |
| 195 ;; in the lisp-files-need* variables. | |
| 196 (setq files-to-process (append lisp-files-needed-for-byte-compilation | |
| 197 lisp-files-needing-early-byte-compilation | |
| 2367 | 198 additional-dump-dependencies |
| 1261 | 199 preloaded-file-list)) |
| 528 | 200 (while files-to-process |
| 201 (let* ((arg (car files-to-process)) | |
| 2367 | 202 (arg-is-dump-dependency |
| 203 (or (member arg preloaded-file-list) | |
| 204 (member arg additional-dump-dependencies))) | |
| 528 | 205 (arg-sans-extension (update-elc-chop-extension arg)) |
| 206 (full-arg (locate-library arg-sans-extension)) | |
| 207 (full-arg-sans-extension | |
| 208 (if (null full-arg) | |
| 209 (progn | |
| 210 (print (format "Error: Library file %s not found" arg)) | |
| 1261 | 211 (backtrace) |
| 528 | 212 ;; Uncomment in case of trouble |
| 213 ;;(print (format "late-packages: %S" late-packages)) | |
| 214 ;;(print (format "guessed-roots: %S" | |
| 215 ;; (paths-find-emacs-roots | |
| 216 ;; invocation-directory invocation-name))) | |
| 217 (kill-emacs)) | |
| 218 (update-elc-chop-extension full-arg))) | |
| 219 (full-arg-el (concat full-arg-sans-extension ".el")) | |
| 220 (full-arg-elc (concat full-arg-sans-extension ".elc")) | |
| 1261 | 221 (full-arg-dir (file-name-directory full-arg-el))) |
| 528 | 222 |
| 2367 | 223 ; (print full-arg-el) |
| 442 | 224 |
| 225 ;; now check if .el or .elc is newer than the dumped exe. | |
| 226 ;; if so, need to redump. | |
| 2367 | 227 (when (and dump-target arg-is-dump-dependency |
| 1298 | 228 ;; no need to check for existence of either of the files |
| 229 ;; because of the definition of file-newer-than-file-p. | |
| 1330 | 230 (or (file-newer-than-file-p full-arg-el dump-target) |
| 231 (file-newer-than-file-p full-arg-elc dump-target))) | |
| 232 (setq dump-target-out-of-date-wrt-dump-files t)) | |
| 528 | 233 |
| 234 (if (and (not (member (file-name-nondirectory arg) | |
| 1261 | 235 unbytecompiled-lisp-files)) |
| 2367 | 236 (not (member (file-name-nondirectory arg) |
| 237 additional-dump-dependencies)) | |
| 528 | 238 (not (member full-arg-el processed)) |
| 1298 | 239 ;; no need to check for existence of either of the files |
| 240 ;; because of the definition of file-newer-than-file-p. | |
| 241 (file-newer-than-file-p full-arg-el full-arg-elc)) | |
| 528 | 242 (setq processed (cons full-arg-el processed))) |
| 243 | |
| 244 (setq files-to-process (cdr files-to-process)))) | |
| 442 | 245 |
| 1261 | 246 ;; Check if we need to rebuild the auto-autoloads.el files -- that is, |
| 247 ;; if ANY .el files have changed. | |
| 1330 | 248 (let ((dirs-to-check (list source-lisp source-lisp-mule))) |
| 1261 | 249 (while dirs-to-check |
| 250 (let* ((dir (car dirs-to-check)) | |
| 251 (full-dir (expand-file-name dir)) | |
| 252 (all-files-in-dir (directory-files full-dir t "\\.el$" nil t)) | |
| 253 (autoload-file | |
| 254 (expand-file-name "auto-autoloads.el" full-dir)) | |
| 1330 | 255 (autoload-is-mule (equal dir source-lisp-mule))) |
| 1261 | 256 (while all-files-in-dir |
| 257 (let* ((full-arg (car all-files-in-dir))) | |
| 1298 | 258 ;; custom-load.el always gets regenerated so don't let that |
| 259 ;; trigger us. | |
| 260 (when (and (not | |
| 261 (member | |
| 262 (file-name-nondirectory full-arg) | |
| 263 lisp-files-ignored-when-checking-for-autoload-updating | |
| 264 )) | |
| 265 (file-newer-than-file-p full-arg autoload-file)) | |
| 1261 | 266 (if autoload-is-mule |
| 267 (setq need-to-rebuild-mule-autoloads t) | |
| 268 (setq need-to-rebuild-autoloads t)))) | |
| 269 (setq all-files-in-dir (cdr all-files-in-dir)))) | |
| 270 (setq dirs-to-check (cdr dirs-to-check)))) | |
| 271 | |
| 1330 | 272 (if dump-target-out-of-date-wrt-dump-files |
| 442 | 273 (condition-case nil |
| 1330 | 274 (write-region-internal |
| 275 "foo" nil (expand-file-name "src/NEEDTODUMP" build-root)) | |
| 442 | 276 (file-error nil))) |
| 277 | |
| 278 ) | |
| 428 | 279 |
| 528 | 280 (when (or need-to-rebuild-autoloads |
| 1298 | 281 ;; no real need for the following check either, because if the file |
| 282 ;; doesn't exist, need-to-rebuild-autoloads gets set above. but | |
| 283 ;; it's only one call, so it won't slow things down much and it keeps | |
| 284 ;; the logic cleaner. | |
| 1330 | 285 (not (file-exists-p aa-lisp)) |
| 1298 | 286 ;; no need to check for file-exists of .elc due to definition |
| 287 ;; of file-newer-than-file-p | |
| 1330 | 288 (file-newer-than-file-p aa-lisp aac-lisp)) |
| 528 | 289 (setq need-to-recompile-autoloads t)) |
| 290 | |
| 291 (when (or need-to-rebuild-mule-autoloads | |
| 1298 | 292 ;; not necessary but ... see comment above. |
| 1330 | 293 (not (file-exists-p aa-lisp-mule)) |
| 1298 | 294 ;; no need to check for file-exists of .elc due to definition |
| 295 ;; of file-newer-than-file-p | |
| 1330 | 296 (file-newer-than-file-p aa-lisp-mule aac-lisp-mule)) |
| 528 | 297 (setq need-to-recompile-mule-autoloads t)) |
| 298 | |
| 299 (when (not (featurep 'mule)) | |
| 300 ;; sorry charlie. | |
| 301 (setq need-to-rebuild-mule-autoloads nil | |
| 302 need-to-recompile-mule-autoloads nil)) | |
| 303 | |
| 428 | 304 (setq update-elc-files-to-compile (append update-elc-files-to-compile |
| 622 | 305 (nreverse processed))) |
| 428 | 306 |
| 1261 | 307 ;(print update-elc-files-to-compile) |
| 428 | 308 |
| 1261 | 309 (let ((do-autoload-commands |
| 310 (append | |
| 311 (if (or need-to-rebuild-autoloads | |
| 312 need-to-rebuild-mule-autoloads) | |
| 1330 | 313 (list "-l" "autoload")) |
| 1261 | 314 (if need-to-rebuild-autoloads |
| 1330 | 315 (list "-f" "autoload-update-directory-autoloads" |
| 316 "auto" source-lisp)) | |
| 1261 | 317 (if need-to-rebuild-mule-autoloads |
| 1330 | 318 (list "-f" "autoload-update-directory-autoloads" |
| 319 "mule" source-lisp-mule)) | |
| 1261 | 320 (if need-to-recompile-autoloads |
| 1330 | 321 (list "-f" "batch-byte-compile-one-file" |
| 322 aa-lisp)) | |
| 1261 | 323 (if need-to-recompile-mule-autoloads |
| 1330 | 324 (list "-f" "batch-byte-compile-one-file" |
| 325 aa-lisp-mule))))) | |
| 1298 | 326 (condition-case nil |
| 1330 | 327 (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-root)) |
| 1298 | 328 (file-error nil)) |
| 1261 | 329 (cond ((and (not update-elc-files-to-compile) |
| 330 (not need-to-rebuild-autoloads) | |
| 331 (not need-to-rebuild-mule-autoloads) | |
| 332 (not need-to-recompile-autoloads) | |
| 333 (not need-to-recompile-mule-autoloads)) | |
| 1315 | 334 ;; (1) Nothing to do at all. |
| 335 ) | |
| 1298 | 336 ((not update-elc-files-to-compile) |
| 1261 | 337 ;; (2) We have no files to byte-compile, but we do need to |
| 1298 | 338 ;; regenerate and compile the auto-autoloads file, so signal |
| 339 ;; update-elc-2 to do it. This is much faster than loading | |
| 340 ;; all the .el's and doing it here. (We only need to rebuild | |
| 341 ;; the autoloads here when we have files to compile, since | |
| 342 ;; they may depend on the updated autoloads.) | |
| 343 (condition-case nil | |
| 1330 | 344 (write-region-internal |
| 345 "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-root)) | |
| 1298 | 346 (file-error nil)) |
| 1315 | 347 ) |
| 1261 | 348 (t |
| 349 (let ((bc-bootstrap | |
| 350 (mapcar #'(lambda (arg) | |
| 351 (concat (update-elc-chop-extension | |
| 352 (locate-library arg)) ".el")) | |
| 353 lisp-files-needed-for-byte-compilation)) | |
| 354 (bootstrap-other | |
| 355 (mapcar #'(lambda (arg) | |
| 356 (concat (update-elc-chop-extension | |
| 357 (locate-library arg)) ".el")) | |
| 358 lisp-files-needing-early-byte-compilation))) | |
| 359 (setq inhibit-autoloads t) | |
| 528 | 360 ;; if bytecomp or byte-optimize need recompiling, then load |
| 361 ;; the .el version of them first, recompile them, and reload | |
| 362 ;; the .elc versions to recompile everything else (so we won't | |
| 363 ;; be waiting until the cows come home). we need to set | |
| 364 ;; load-ignore-elc-files because byte-optimize gets autoloaded | |
| 365 ;; from bytecomp. | |
| 1261 | 366 (let ((recompile-bc-bootstrap |
| 367 (apply #'nconc | |
| 368 (mapcar | |
| 369 #'(lambda (arg) | |
| 370 (when (member arg update-elc-files-to-compile) | |
| 371 (append '("-f" "batch-byte-compile-one-file") | |
| 372 (list arg)))) | |
| 373 bc-bootstrap))) | |
| 374 (recompile-bootstrap-other | |
| 375 (apply #'nconc | |
| 376 (mapcar | |
| 377 #'(lambda (arg) | |
| 378 (when (member arg update-elc-files-to-compile) | |
| 379 (append '("-f" "batch-byte-compile-one-file") | |
| 380 (list arg)))) | |
| 381 bootstrap-other)))) | |
| 382 (mapc-internal | |
| 383 #'(lambda (arg) | |
| 384 (setq update-elc-files-to-compile | |
| 385 (delete arg update-elc-files-to-compile))) | |
| 386 (append bc-bootstrap bootstrap-other)) | |
| 387 (setq command-line-args | |
| 388 (append | |
| 389 '("-l" "loadup-el.el" "run-temacs" | |
| 390 "-batch" "-no-packages" "-no-autoloads" | |
| 391 "-eval" "(setq stack-trace-on-error t)" | |
| 392 "-eval" "(setq load-always-display-messages t)") | |
| 393 (when recompile-bc-bootstrap | |
| 394 (append | |
| 395 '("-eval" "(setq load-ignore-elc-files t)" | |
| 396 "-l" "bytecomp") | |
| 397 recompile-bc-bootstrap | |
| 398 '("-eval" "(setq load-ignore-elc-files nil)"))) | |
| 399 '("-l" "bytecomp") | |
| 400 ;; likewise, recompile autoload.el etc. if out-of-date. | |
| 401 recompile-bootstrap-other | |
| 402 ;; then generate autoloads for lisp and maybe lisp/mule. | |
| 403 do-autoload-commands | |
| 404 ;; now load the autoloads and compile alles anderes. | |
| 405 '("-eval" "(setq inhibit-autoloads nil)" | |
| 406 "-f" "startup-load-autoloads" | |
| 407 "-f" "batch-byte-compile") | |
| 408 update-elc-files-to-compile | |
| 409 )))) | |
| 410 | |
| 411 ;;(print command-line-args) | |
| 412 (load "loadup-el.el")))) | |
| 428 | 413 |
| 1303 | 414 (kill-emacs) |
| 428 | 415 |
| 416 ;;; update-elc.el ends here |