Mercurial > hg > xemacs-beta
annotate lisp/update-elc-2.el @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -0600 |
| parents | 9fec7fedbf1b |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 442 | 1 ;;; update-elc-2.el --- Recompile remaining .el files, post-dumping |
| 2 | |
| 3 ;; Copyright (C) 1997 by Free Software Foundation, Inc. | |
| 1261 | 4 ;; Copyright (C) 2000, 2003 Ben Wing. |
| 442 | 5 |
| 6 ;; Author: Ben Wing <ben@xemacs.org>, based on cleantree.el by | |
| 7 ;; Steven L Baur <steve@xemacs.org> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: internal | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 25 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 26 ;; 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not in FSF | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; This file should be used after XEmacs has been dumped, to recompile | |
| 33 ;; all remaining out-of-date .els and clean up orphaned .elcs. It should | |
| 34 ;; be called as | |
| 35 ;; | |
| 36 ;; xemacs -batch -vanilla -l update-elc-2.el -f batch-update-elc-2 ${dirname} | |
| 37 ;; | |
| 38 ;; where ${dirname} is the directory tree to recompile, usually `lisp'. | |
| 39 ;; | |
| 40 ;; Note that this is very different from update-elc.el, which is called | |
| 41 ;; BEFORE dumping, handles only the files needed to dump, and is called | |
| 42 ;; from temacs instead of xemacs. | |
| 43 ;; | |
| 44 ;; The original cleantree.el had the comment: This code is derived | |
| 45 ;; from Gnus based on a suggestion by David Moore <dmoore@ucsd.edu> | |
| 46 | |
| 47 ;;; Code: | |
| 48 | |
| 1261 | 49 ;; Help debug problems. |
| 50 (setq stack-trace-on-error t | |
| 51 load-always-display-messages t) | |
| 52 | |
| 442 | 53 (defvar update-elc-ignored-dirs |
| 54 `("." ".." "CVS" "SCCS" "RCS" ,@(unless (featurep 'mule) '("mule")))) | |
| 55 | |
| 56 (defvar update-elc-ignored-files | |
| 57 ;; note: entries here are regexps | |
| 58 '("^," ;; #### huh? | |
| 444 | 59 "^paths\\.el$" |
| 60 "^loadup\\.el$" | |
| 61 "^loadup-el\\.el$" | |
| 62 "^update-elc\\.el$" | |
| 63 "^update-elc-2\\.el$" | |
| 64 "^dumped-lisp\\.el$" | |
| 65 "^make-docfile\\.el$" | |
| 66 "^site-start\\.el$" | |
| 67 "^site-load\\.el$" | |
| 4246 | 68 "^site-init\\.el$")) |
| 442 | 69 |
| 1298 | 70 (defvar dirfiles-table (make-hash-table :test 'equal)) |
| 71 | |
| 442 | 72 ;; SEEN accumulates the list of already-handled dirs. |
| 73 (defun do-update-elc-2 (dir compile-stage-p seen) | |
| 74 (setq dir (file-name-as-directory dir)) | |
| 75 ;; Only scan this sub-tree if we haven't been here yet. | |
| 76 (unless (member (file-truename dir) seen) | |
| 77 (push (file-truename dir) seen) | |
| 78 | |
| 1298 | 79 (let ((files (or (gethash dir dirfiles-table) |
| 80 (directory-files dir t nil t)))) | |
| 81 | |
| 82 ;; Do this directory. | |
| 83 (if compile-stage-p | |
| 84 ;; Stage 2: Recompile necessary .els | |
| 85 (dolist (file files) | |
| 86 (when (string-match "\\.el$" file) | |
| 87 (let ((file-c (concat file "c"))) | |
| 88 (when (and (not (member file-c files)) | |
| 89 ;; no need to check for out-of-date-ness because | |
| 90 ;; that was already done, and .elc removed. | |
| 91 (let (ignore) | |
| 92 (mapcar | |
| 93 #'(lambda (regexp) | |
| 94 (if (string-match | |
| 95 regexp | |
| 96 (file-name-nondirectory file)) | |
| 97 (setq ignore t))) | |
| 98 update-elc-ignored-files) | |
| 99 (not ignore))) | |
| 100 (byte-compile-file file))))) | |
| 442 | 101 |
| 1298 | 102 ;; Stage 1. |
| 103 ;; Remove out-of-date elcs | |
| 104 (let (deleted) | |
| 105 (dolist (file files) | |
| 106 (when (string-match "\\.el$" file) | |
| 107 (let ((file-c (concat file "c"))) | |
| 108 (when (and (member file-c files) | |
| 109 (file-newer-than-file-p file file-c)) | |
| 110 (message "Removing out-of-date %s" file-c) | |
| 111 (delete-file file-c) | |
| 112 (push file-c deleted))))) | |
| 442 | 113 |
| 1298 | 114 ;; Remove elcs without corresponding el |
| 115 (dolist (file-c files) | |
| 116 (when (string-match "\\.elc$" file-c) | |
| 117 (let ((file (replace-in-string file-c "c$" ""))) | |
| 118 (when (not (member file files)) | |
| 119 (message "Removing %s; no corresponding .el" file-c) | |
| 120 (delete-file file-c) | |
| 121 (push file-c deleted))))) | |
| 442 | 122 |
| 1303 | 123 (setq files (set-difference files deleted :test 'equal)))) |
| 1298 | 124 |
| 125 (puthash dir files dirfiles-table) | |
| 126 | |
| 127 ;; We descend recursively. On my Windows machine, it is much faster | |
| 128 ;; to call directory-files again to recompute than to call | |
| 129 ;; file-directory-p on each member of the files list. | |
| 130 (dolist (dir (directory-files dir t nil t 'dir)) | |
| 131 (when (not (member (file-name-nondirectory dir) | |
| 132 update-elc-ignored-dirs)) | |
| 133 (do-update-elc-2 dir compile-stage-p seen)))))) | |
| 442 | 134 |
| 135 (defun batch-update-elc-2 () | |
| 136 (defvar command-line-args-left) | |
| 137 (unless noninteractive | |
| 138 (error "`batch-update-elc-2' is to be used only with -batch")) | |
| 139 (let ((dir (car command-line-args-left))) | |
| 1298 | 140 ;; don't depend on being able to autoload `update-autoload-files'! |
| 141 (load "autoload") | |
| 142 (load "bytecomp") | |
| 143 (load "byte-optimize") | |
| 144 ;; #### the API used here is deprecated, convert to one with explicit | |
| 145 ;; arguments when it is available | |
| 146 ;; update-elc.el signals us to rebuild the autoloads when necessary. | |
| 147 ;; in some cases it will rebuild the autoloads itself, but doing it this | |
| 148 ;; way is slow, so we avoid it when possible. | |
| 1330 | 149 (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS" |
| 150 invocation-directory)) | |
| 2548 | 151 ;; if we were instructed to rebuild the autoloads, force the file |
| 152 ;; to be touched even w/o changes; otherwise, we won't ever stop | |
| 153 ;; being told to rebuild them. | |
| 154 (update-autoload-files dir "auto" nil t) | |
| 155 (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0) | |
| 1298 | 156 (when (featurep 'mule) |
| 2548 | 157 (let ((muledir (expand-file-name "../lisp/mule" (file-truename dir)))) |
| 1330 | 158 ;; force here just like above. |
| 2548 | 159 (update-autoload-files muledir "mule" nil t) |
| 160 (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)))) | |
| 1298 | 161 (when (featurep 'modules) |
| 162 (let* ((moddir (expand-file-name "../modules" (file-truename dir))) | |
| 2548 | 163 (autofile (expand-file-name "auto-autoloads.el" moddir))) |
| 164 (update-autoload-files | |
| 1298 | 165 (delete (concat (file-name-as-directory moddir) ".") |
| 166 (delete (concat (file-name-as-directory moddir) "..") | |
| 167 (directory-files moddir t nil nil 0))) | |
| 2548 | 168 "modules" autofile) |
| 169 (byte-recompile-file autofile 0))) | |
| 1298 | 170 ;; now load the (perhaps newly rebuilt) autoloads; we were called with |
| 171 ;; -no-autoloads so they're not already loaded. | |
| 1330 | 172 (load (expand-file-name "auto-autoloads" lisp-directory)) |
| 1298 | 173 (when (featurep 'mule) |
| 1330 | 174 (load (expand-file-name "mule/auto-autoloads" lisp-directory))) |
| 442 | 175 ;; We remove all the bad .elcs before any byte-compilation, because |
| 176 ;; there may be dependencies between one .el and another (even across | |
| 177 ;; directories), and we don't want to load an out-of-date .elc while | |
| 178 ;; byte-compiling a file. | |
| 179 (message "Removing old or spurious .elcs in directory tree `%s'..." dir) | |
| 180 (do-update-elc-2 dir nil nil) | |
| 181 (message "Removing old or spurious .elcs in directory tree `%s'...done" | |
| 182 dir) | |
| 183 (message "Recompiling updated .els in directory tree `%s'..." dir) | |
| 184 (do-update-elc-2 dir t nil) | |
| 528 | 185 (message "Recompiling updated .els in directory tree `%s'...done" dir) |
| 186 ;; likewise here. | |
| 187 (load "cus-dep") | |
| 188 (Custom-make-dependencies dir) | |
| 189 (byte-recompile-file (expand-file-name "custom-load.el" dir) 0) | |
| 190 (when (featurep 'mule) | |
| 191 (Custom-make-dependencies (expand-file-name "mule" dir)) | |
| 4246 | 192 (byte-recompile-file (expand-file-name "mule/custom-load.el" dir) 0) |
| 193 ;; See the eval-when-compile in the definition of | |
| 194 ;; Installation-file-coding-system; if the file name sniffing or the | |
| 195 ;; available coding systems have changed, version.elc should be | |
| 196 ;; rebuilt. | |
| 197 (byte-recompile-file (expand-file-name "version.el" dir) 0))) | |
| 442 | 198 (setq command-line-args-left nil)) |
| 199 | |
| 444 | 200 ;;; update-elc-2.el ends here |