Mercurial > hg > xemacs-beta
annotate lisp/update-elc-2.el @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -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 |