Mercurial > hg > xemacs-beta
view lisp/package-admin.el @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | 3c92890f3750 |
| children | 308d34e9f07d |
line wrap: on
line source
;;; package-admin.el --- Installation and Maintenance of XEmacs packages ;; Copyright (C) 1997 by Free Software Foundation, Inc. ;; Copyright (C) 2003, Steve Youngs. ;; Author: SL Baur <steve@xemacs.org> ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not in FSF ;;; Commentary: ;; First pass at lisp front end to package maintenance. ;;; Code: (require 'config) (defvar package-admin-xemacs (concat invocation-directory invocation-name) "Location of XEmacs binary to use.") (defvar package-admin-temp-buffer "*Package Output*" "Temporary buffer where output of backend commands is saved.") (defvar package-admin-install-function (if (eq system-type 'windows-nt) 'package-admin-install-function-mswindows 'package-admin-default-install-function) "The function to call to install a package. Three args are passed: FILENAME PKG-DIR BUFFER Install package FILENAME into directory PKG-DIR, with any messages output to buffer BUFFER.") (defvar package-admin-error-messages '( "No space left on device" "No such file or directory" "Filename too long" "Read-only file system" "File too large" "Too many open files" "Not enough space" "Permission denied" "Input/output error" "Out of memory" "Unable to create directory" "Directory checksum error" "Cannot exclusively open file" "corrupted file" "incomplete .* tree" "Bad table" "corrupt input" "invalid compressed data" "too many leaves in Huffman tree" "not a valid zip file" "first entry not deflated or stored" "encrypted file --" "unexpected end of file" ) "Regular expressions of possible error messages. After each package extraction, the `package-admin-temp-buffer' buffer is scanned for these messages. An error code is returned if one of these are found. This is awful, but it exists because error return codes aren't reliable under MS Windows.") (defvar package-admin-tar-filename-regexps '( ;; GNU tar: ;; drwxrwxr-x john/doe 123 1997-02-18 15:48 pathname "\\S-+\\s-+[-a-z0-9_/]+\\s-+[0-9]+\\s-+[-0-9]+\\s-+[0-9:]+\\s-+\\(\\S-.*\\)" ;; HP-UX & SunOS tar: ;; rwxrwxr-x 501/501 123 Feb 18 15:46 1997 pathname ;; Solaris tar (phooey!): ;; rwxrwxr-x501/501 123 Feb 18 15:46 1997 pathname ;; AIX tar: ;; -rw-r--r-- 147 1019 32919 Mar 26 12:00:09 1992 pathname "\\S-+\\s-*[-a-z0-9_]+[/ ][-a-z0-9_]+\\s-+[0-9]+\\s-+[a-z][a-z][a-z]\\s-+[0-9]+\\s-+[0-9:]+\\s-+[0-9]+\\s-+\\(\\S-.*\\)" ;; djtar: ;; drwx Aug 31 02:01:41 1998 123 pathname "\\S-+\\s-+[a-z][a-z][a-z]\\s-+[0-9]+\\s-+[0-9:]+\\s-+[0-9]+\\s-+[0-9]+\\s-+\\(\\S-.*\\)" ) "List of regexps to use to search for tar filenames. Note that \"\\(\" and \"\\)\" must be used to delimit the pathname (as match #1). Don't put \"^\" to match the beginning of the line; this is already implicit, as `looking-at' is used. Filenames can, unfortunately, contain spaces, so be careful in constructing any regexps.") (defvar package-install-hook nil "*List of hook functions to be called when a new package is successfully installed. The hook function is passed two arguments: the package name, and the install directory.") (defvar package-delete-hook nil "*List of hook functions to be called when a package is deleted. The hook is called *before* the package is deleted. The hook function is passed two arguments: the package name, and the install directory.") (defun package-admin-install-function-mswindows (file pkg-dir buffer) "Install function for mswindows." (let ((default-directory (file-name-as-directory pkg-dir))) (unless (file-directory-p default-directory) (make-directory default-directory t)) (call-process "minitar" nil buffer t file))) (defun package-admin-default-install-function (filename pkg-dir buffer) "Default function to install a package. Install package FILENAME into directory PKG-DIR, with any messages output to BUFFER." (let* ((pkg-dir (file-name-as-directory pkg-dir)) (default-directory pkg-dir) (filename (expand-file-name filename))) (unless (file-directory-p pkg-dir) (make-directory pkg-dir t)) ;; Don't assume GNU tar. (if (shell-command (concat "gunzip -c " filename " | tar xvf -") buffer) 0 1))) ;; A few things needed by the following 2 functions. (eval-when-compile (require 'packages) (autoload 'package-get-info "package-get") (autoload 'paths-decode-directory-path "find-paths") (defvar package-get-install-to-user-init-directory)) (defun package-admin-find-top-directory (type &optional user-dir) "Return the top level directory for a package. Argument TYPE is a symbol that determines the type of package we're trying to find a directory for. Optional Argument USER-DIR if non-nil use directories off `early-package-directories'. If we still can't find a suitable directory, return nil. Possible values for TYPE are: std == For \"standard\" packages that go in '/xemacs-packages/' mule == For \"mule\" packages that go in '/mule-packages/' site == For \"unsupported\" packages that go in '/site-packages/' " (let* ((hierarchies late-package-hierarchies) (hierarchy-suffix (file-name-as-directory (cond ((eq type 'std) "xemacs-packages") ((eq type 'mule) "mule-packages") ((eq type 'site) "site-packages")))) (suffix-length (length hierarchy-suffix)) top-dir) (if user-dir (expand-file-name hierarchy-suffix (if configure-early-package-directories (car configure-early-package-directories) user-init-directory)) (while hierarchies (if (string-equal (substring (car hierarchies) (- suffix-length)) hierarchy-suffix) (setq top-dir (car hierarchies))) (setq hierarchies (cdr hierarchies))) top-dir))) (defun package-admin-get-install-dir (package &optional pkg-dir) "Find a suitable installation directory for a package. Argument PACKAGE is the package to find a installation directory for. Optional Argument PKG-DIR, if non-nil is a directory to use for installation. If PKG-DIR is non-nil and writable, return that. Otherwise check to see if the PACKAGE is already installed and return that location, if it is writable. Finally, fall back to the `user-init-directory' if all else fails. As a side effect of installing packages under `user-init-directory' these packages become part of `early-package-hierarchies'." ;; If pkg-dir specified, return that if writable. (if (and pkg-dir (file-writable-p (directory-file-name pkg-dir))) pkg-dir ;; If the user want her packages under ~/.xemacs/, do so. (let ((type (package-get-info package 'category))) (if package-get-install-to-user-init-directory (progn (cond ((equal type "standard") (setq pkg-dir (package-admin-find-top-directory 'std 'user-dir))) ((equal type "mule") (setq pkg-dir (package-admin-find-top-directory 'mule 'user-dir)))) pkg-dir) ;; Maybe the package has been installed before, if so, return ;; that directory. (let ((package-feature (intern-soft (concat (symbol-name package) "-autoloads"))) autoload-dir) (when (and (not (eq package 'unknown)) (featurep package-feature) (setq autoload-dir (feature-file package-feature)) (setq autoload-dir (file-name-directory autoload-dir)) (member autoload-dir (append early-package-load-path late-package-load-path))) ;; Find the corresponding entry in late-package (setq pkg-dir (car-safe (member-if (lambda (h) (string-match (concat "^" (regexp-quote h)) autoload-dir)) (append (cdr early-package-hierarchies) late-package-hierarchies))))) (if (and pkg-dir (file-writable-p (directory-file-name pkg-dir))) pkg-dir ;; OK, the package hasn't been previously installed so we need ;; to guess where it should go. (cond ((equal type "standard") (setq pkg-dir (package-admin-find-top-directory 'std))) ((equal type "mule") (setq pkg-dir (package-admin-find-top-directory 'mule))) (t (error 'invalid-operation "Invalid package type"))) (if (and pkg-dir (file-writable-p (directory-file-name pkg-dir))) pkg-dir ;; Oh no! Either we still haven't found a suitable ;; directory, or we can't write to the one we did find. ;; Drop back to the `user-init-directory'. (if (y-or-n-p (format "Directory isn't writable, use %s instead? " user-init-directory)) (progn (cond ((equal type "standard") (setq pkg-dir (package-admin-find-top-directory 'std 'user-dir))) ((equal type "mule") (setq pkg-dir (package-admin-find-top-directory 'mule 'user-dir))) (t (error 'invalid-operation "Invalid package type"))) ;; Turn on `package-get-install-to-user-init-directory' ;; so we don't get asked for each package we try to ;; install in this session. (setq package-get-install-to-user-init-directory t) pkg-dir) ;; If we get to here XEmacs can't make up its mind and ;; neither can the user, nothing left to do except barf. :-( (error 'search-failed (format "Can't find suitable installation directory for package: %s" package)))))))))) (defun package-admin-get-manifest-file (pkg-topdir package) "Return the name of the MANIFEST file for package PACKAGE. Note that PACKAGE is a symbol, and not a string." (let ((dir (file-name-as-directory (expand-file-name "pkginfo" pkg-topdir)))) (expand-file-name (concat "MANIFEST." (symbol-name package)) dir))) (defun package-admin-check-manifest (pkg-outbuf pkg-topdir) "Check for a MANIFEST.<package> file in the package distribution. If it doesn't exist, create and write one. PKG-OUTBUF is the buffer that holds the output from `tar', and PKG-TOPDIR is the top-level directory under which the package was installed." (let ((manifest-buf " *pkg-manifest*") (case-fold-search (file-system-ignore-case-p pkg-topdir)) regexp package-name pathname regexps) (save-excursion ;; Probably redundant. (set-buffer (get-buffer pkg-outbuf)) ;; Probably already the current buffer. (goto-char (point-min)) (setq regexp (concat "\\bpkginfo" (char-to-string directory-sep-char) "MANIFEST\\...*")) ;; Look for the manifest. (if (not (re-search-forward regexp nil t)) (progn ;; We didn't find a manifest. Make one. ;; Yuk. We weren't passed the package name, and so we have ;; to dig for it. Look for it as the subdirectory name below ;; "lisp", or "man". ;; Here, we don't use a single regexp because we want to search ;; the directories for a package name in a particular order. (if (catch 'done (let ((dirs '("lisp" "man")) rexp) (while dirs (setq rexp (concat "\\b" (car dirs) "[\\/]\\([^\\/]+\\)[\//]")) (if (re-search-forward rexp nil t) (throw 'done t)) (setq dirs (cdr dirs))))) (progn (setq package-name (buffer-substring (match-beginning 1) (match-end 1))) ;; Get and erase the manifest buffer (setq manifest-buf (get-buffer-create manifest-buf)) (buffer-disable-undo manifest-buf) (erase-buffer manifest-buf) ;; Now, scan through the output buffer, looking for ;; file and directory names. (goto-char (point-min)) ;; for each line ... (while (< (point) (point-max)) (beginning-of-line) (setq pathname nil) ;; scan through the regexps, looking for a pathname (if (catch 'found-path (setq regexps package-admin-tar-filename-regexps) (while regexps (if (looking-at (car regexps)) (progn (setq pathname (buffer-substring (match-beginning 1) (match-end 1))) (throw 'found-path t))) (setq regexps (cdr regexps)))) (progn ;; found a pathname -- add it to the manifest ;; buffer (save-excursion (set-buffer manifest-buf) (goto-char (point-max)) (insert pathname "\n")))) (forward-line 1)) ;; Processed all lines. ;; Now, create the file, pkginfo/MANIFEST.<pkgname> ;; We use `expand-file-name' instead of `concat', ;; for portability. (setq pathname (expand-file-name "pkginfo" pkg-topdir)) ;; Create pkginfo, if necessary (if (not (file-directory-p pathname)) (make-directory pathname)) (setq pathname (expand-file-name (concat "MANIFEST." package-name) pathname)) (save-excursion (set-buffer manifest-buf) ;; Put the files in sorted order (if-fboundp 'sort-lines (sort-lines nil (point-min) (point-max)) (warn "`xemacs-base' not installed, MANIFEST.%s not sorted" package-name)) ;; Write the file. ;; Note that using `write-region' *BYPASSES* any check ;; to see if XEmacs is currently editing/visiting the ;; file. (write-region (point-min) (point-max) pathname)) (kill-buffer manifest-buf)))))))) ;;;###autoload (defun package-admin-add-binary-package (file &optional pkg-dir) "Install a pre-bytecompiled XEmacs package into package hierarchy." (interactive "fPackage tarball: ") (let ((buf (get-buffer-create package-admin-temp-buffer)) (status 1) start err-list) (setq pkg-dir (package-admin-get-install-dir 'unknown pkg-dir)) ;; Ensure that the current directory doesn't change (save-excursion (set-buffer buf) ;; This is not really needed (setq default-directory (file-name-as-directory pkg-dir)) (setq case-fold-search t) (buffer-disable-undo) (goto-char (setq start (point-max))) (if (= 0 (setq status (funcall package-admin-install-function file pkg-dir buf))) (progn ;; First, check for errors. ;; We can't necessarily rely upon process error codes. (catch 'done (goto-char start) (setq err-list package-admin-error-messages) (while err-list (if (re-search-forward (car err-list) nil t) (progn (setq status 1) (throw 'done nil))) (setq err-list (cdr err-list)))) ;; Make sure that the MANIFEST file exists (package-admin-check-manifest buf pkg-dir)))) status)) (defun package-admin-rmtree (directory) "Delete a directory and all of its contents, recursively. This is a feeble attempt at making a portable rmdir." (setq directory (file-name-as-directory directory)) (let ((files (directory-files directory nil nil nil t)) (dirs (directory-files directory nil nil nil 'dirs))) (while dirs (if (not (member (car dirs) '("." ".."))) (let ((dir (expand-file-name (car dirs) directory))) (condition-case err (if (file-symlink-p dir) ;; just in case, handle symlinks (delete-file dir) (package-admin-rmtree dir)) (file-error (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err))))) (setq dirs (cdr dirs)))) (while files (condition-case err (delete-file (expand-file-name (car files) directory)) (file-error (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err)))) (setq files (cdr files))) (condition-case err (delete-directory directory) (file-error (message "%s: %s: \"%s\"" (nth 1 err) (nth 2 err) (nth 3 err)))))) (defun package-admin-get-lispdir (pkg-topdir package) (let (package-lispdir) (if (and (setq package-lispdir (expand-file-name "lisp" pkg-topdir)) (setq package-lispdir (expand-file-name (symbol-name package) package-lispdir)) (file-accessible-directory-p package-lispdir)) package-lispdir))) (defun package-admin-delete-binary-package (package pkg-topdir) "Delete a binary installation of PACKAGE below directory PKG-TOPDIR. PACKAGE is a symbol, not a string." (let (manifest-file package-lispdir dirs file) (setq pkg-topdir (package-admin-get-install-dir package pkg-topdir)) (setq manifest-file (package-admin-get-manifest-file pkg-topdir package)) (run-hook-with-args 'package-delete-hook package pkg-topdir) (if (file-exists-p manifest-file) (progn ;; The manifest file exists! Use it to delete the old distribution. (message "Removing old files for package \"%s\" ..." package) (sit-for 0) (with-temp-buffer (buffer-disable-undo) (erase-buffer) (insert-file-contents manifest-file) (goto-char (point-min)) ;; For each entry in the MANIFEST ... (while (< (point) (point-max)) (beginning-of-line) (setq file (expand-file-name (buffer-substring (point) (point-at-eol)) pkg-topdir)) (if (file-directory-p file) ;; Keep a record of each directory (setq dirs (cons file dirs)) ;; Delete each file. ;; Make sure that the file is writable. ;; (This is important under MS Windows.) ;; I do not know why it important under MS Windows but ;; 1. It bombs out when the file does not exist. This can be condition-cased ;; 2. If I removed the write permissions, I do not want XEmacs to just ignore them. ;; If it wants to, XEmacs may ask, but that is about all ;; (set-file-modes file 438) ;; 438 -> #o666 ;; Note, user might have removed the file! (condition-case () (delete-file file) (error nil))) ;; We may want to turn the error into a Warning? (forward-line 1)) ;; Delete empty directories. (if dirs (progn (mapc (lambda (dir) (condition-case () (delete-directory dir))) dirs))) ;; Delete the MANIFEST file ;; (set-file-modes manifest-file 438) ;; 438 -> #o666 ;; Note. Packages can have MANIFEST in MANIFEST. (condition-case () (delete-file manifest-file) (error nil)) ;; Do warning? (message "Removing old files for package \"%s\" ... done" package))) ;; The manifest file doesn't exist. Fallback to just deleting the ;; package-specific lisp directory, if it exists. ;; ;; Delete old lisp directory, if any ;; Gads, this is ugly. However, we're not supposed to use `concat' ;; in the name of portability. (setq package-lispdir (package-admin-get-lispdir pkg-topdir package)) (when package-lispdir (message "Removing old lisp directory \"%s\" ..." package-lispdir) (sit-for 0) (package-admin-rmtree package-lispdir) (message "Removing old lisp directory \"%s\" ... done" package-lispdir))) ;; Delete the package from the database of installed packages. (package-delete-name package))) (provide 'package-admin) ;;; package-admin.el ends here