Mercurial > hg > xemacs-beta
annotate lisp/setup-paths.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | 9c6ea1581159 |
| children | 6b6b0f8ab749 |
| rev | line source |
|---|---|
| 428 | 1 ;;; setup-paths.el --- setup various XEmacs paths |
| 2 | |
| 3 ;; Copyright (C) 1985-1986, 1990, 1992-1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (c) 1993, 1994 Sun Microsystems, Inc. | |
| 5 ;; Copyright (C) 1995 Board of Trustees, University of Illinois | |
| 1330 | 6 ;; Copyright (C) 2003 Ben Wing. |
| 428 | 7 |
| 2456 | 8 ;; Author: Mike Sperber <mike@xemacs.orgx> |
| 428 | 9 ;; Maintainer: XEmacs Development Team |
| 10 ;; Keywords: internal, dumped | |
| 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 ;; This file is dumped with XEmacs. | |
| 34 | |
| 776 | 35 ;; This file contains functions and variables that describe and construct |
| 36 ;; the various paths into the XEmacs hierarchy from a global viewpoint. | |
| 2456 | 37 |
| 38 ;; This file doesn't actually set any global variable, and doesn't | |
| 39 ;; contain any state---it just contains the functionality for | |
| 40 ;; searching directories and constructing paths. | |
| 428 | 41 |
| 42 ;; It requires find-paths.el and packages.el. | |
| 1330 | 43 |
| 44 ;;; Code: | |
| 45 | |
| 46 ;(setq debug-paths t) | |
| 47 | |
| 428 | 48 |
| 460 | 49 (defvar paths-core-load-path-depth 0 |
| 428 | 50 "Depth of load-path searches in core Lisp paths.") |
| 51 | |
| 452 | 52 (defvar paths-site-load-path-depth 1 |
| 53 "Depth of load-path searches in site Lisp paths.") | |
| 54 | |
| 460 | 55 (defvar paths-mule-load-path-depth 0 |
| 56 "Depth of load-path searches in Mule Lisp paths.") | |
| 57 | |
| 3813 | 58 (defvar paths-module-load-path-depth 1 |
| 59 "Depth of load-path searches in module paths.") | |
| 60 | |
| 428 | 61 (defvar paths-default-info-directories |
| 62 (mapcar (function | |
| 63 (lambda (dirlist) | |
| 64 (paths-construct-path | |
| 65 dirlist (char-to-string directory-sep-char)))) | |
| 66 '(("usr" "local" "info") | |
| 67 ("usr" "info") | |
| 68 ("usr" "local" "share" "info") | |
| 69 ("usr" "share" "info"))) | |
| 70 "Directories appended to the end of the info path by default.") | |
| 71 | |
| 1330 | 72 |
| 73 ;;; Basic utility functions. | |
| 74 | |
| 75 (defun paths-emacs-root-p (directory) | |
| 76 "Check if DIRECTORY is a plausible installation root." | |
| 77 (or | |
| 78 ;; installed | |
| 79 (paths-file-readable-directory-p (paths-construct-path (list directory | |
| 80 "lib" | |
| 81 (construct-emacs-version-name)))) | |
| 82 ;; in-place or windows-nt. windows-nt equivalent of --srcdir is | |
| 83 ;; BUILD_DIR in config.inc, and has no lisp/ or etc/ since symlinks | |
| 84 ;; don't exist. instead, xemacs.mak points configure-lisp-directory and | |
| 85 ;; configure-data-directory at the right places. | |
| 86 (and | |
| 1526 | 87 (or configure-exec-directory (paths-file-readable-directory-p (paths-construct-path (list directory "lib-src"))) (eq system-type 'windows-nt)) |
| 1330 | 88 (or configure-lisp-directory (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))) |
| 89 (or configure-data-directory (paths-file-readable-directory-p (paths-construct-path (list directory "etc"))))))) | |
| 90 | |
| 91 (defun paths-emacs-data-root-p (directory) | |
| 92 "Check if DIRECTORY is a plausible data installation root. | |
| 93 A data installation root is one containing data files that may be shared | |
| 2456 | 94 among multiple different versions of XEmacs, the packages in particular. |
| 95 This serves as an additional filter to narrow down the list of plausible | |
| 96 installation roots." | |
| 1330 | 97 (or |
| 98 ;; installed | |
| 99 (paths-file-readable-directory-p (paths-construct-path (list directory | |
| 4154 | 100 "share" |
| 1330 | 101 emacs-program-name))) |
| 102 (paths-file-readable-directory-p (paths-construct-path (list directory | |
| 4154 | 103 "share" |
| 1330 | 104 (construct-emacs-version-name)))) |
| 105 ;; in-place or windows-nt | |
| 106 (and | |
| 107 (paths-file-readable-directory-p (paths-construct-path (list directory "lisp"))) | |
| 3281 | 108 (paths-file-readable-directory-p (paths-construct-path (list directory "etc")))) |
| 1330 | 109 |
| 3281 | 110 ;; searching for a package directory |
| 111 (and | |
| 112 (string-match "win32" system-configuration) | |
| 113 (paths-file-readable-directory-p (paths-construct-path (list directory | |
| 114 "xemacs-packages")))))) | |
| 115 | |
| 116 (defun paths-find-invocation-roots (invocation-directory invocation-name root-p) | |
| 117 "Find the list of run-time roots of XEmacs. | |
| 2456 | 118 INVOCATION-DIRECTORY is a directory containing the XEmacs executable. |
| 3281 | 119 INVOCATION-NAME is the name of the executable itself |
| 120 ROOT-P is a function that tests whether a root is plausible." | |
| 1330 | 121 (let* ((executable-file-name (paths-chase-symlink |
| 122 (concat invocation-directory | |
| 123 invocation-name))) | |
| 124 (executable-directory (file-name-directory executable-file-name)) | |
| 125 (maybe-root-1 (file-name-as-directory | |
| 126 (paths-construct-path '("..") executable-directory))) | |
| 127 (maybe-root-2 (file-name-as-directory | |
| 128 (paths-construct-path '(".." "..") executable-directory)))) | |
| 3281 | 129 |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
130 (delete-if-not root-p (list maybe-root-1 maybe-root-2)))) |
| 1330 | 131 |
| 2456 | 132 (defun paths-find-emacs-roots (invocation-directory |
| 133 invocation-name | |
| 134 root-p) | |
| 1330 | 135 "Find all plausible installation roots for XEmacs. |
| 136 This is a list of plausible directories in which to search for the important | |
| 137 directories used by XEmacs at run-time, for example `exec-directory', | |
| 138 `data-directory' and `lisp-directory'. | |
| 139 ROOT-P is a function that tests whether a root is plausible." | |
| 3281 | 140 (let* ((invocation-roots |
| 141 (paths-find-invocation-roots invocation-directory | |
| 142 invocation-name | |
| 143 root-p)) | |
| 1330 | 144 (potential-installation-roots |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
145 (union |
| 1330 | 146 (and configure-exec-prefix-directory |
| 147 (list (file-name-as-directory | |
| 148 configure-exec-prefix-directory))) | |
| 149 (and configure-prefix-directory | |
| 150 (list (file-name-as-directory | |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
151 configure-prefix-directory))) |
|
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
152 :test #'equal)) |
| 1330 | 153 (installation-roots |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
154 (remove-if-not root-p potential-installation-roots))) |
|
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
155 (union invocation-roots installation-roots :test #'equal))) |
| 1330 | 156 |
| 428 | 157 (defun paths-find-site-lisp-directory (roots) |
| 2456 | 158 "Find the site Lisp directory of the XEmacs hierarchy. |
| 159 ROOTS is a list of installation roots." | |
| 4108 | 160 (paths-find-site-directory roots (list "site-lisp") |
| 4092 | 161 nil nil |
| 428 | 162 configure-site-directory)) |
| 163 | |
| 164 (defun paths-find-site-module-directory (roots) | |
| 2456 | 165 "Find the site modules directory of the XEmacs hierarchy. |
| 166 ROOTS is a list of installation roots." | |
| 4108 | 167 (paths-find-site-directory roots (list "site-modules") |
| 4092 | 168 t nil |
| 428 | 169 configure-site-module-directory)) |
| 170 | |
| 171 (defun paths-find-lisp-directory (roots) | |
| 2456 | 172 "Find the main Lisp directory of the XEmacs hierarchy. |
| 173 ROOTS is a list of installation roots." | |
| 4108 | 174 (paths-find-version-directory roots (list "lisp") |
| 4092 | 175 nil nil |
| 428 | 176 configure-lisp-directory)) |
| 177 | |
| 460 | 178 (defun paths-find-mule-lisp-directory (roots &optional lisp-directory) |
| 2456 | 179 "Find the Mule Lisp directory of the XEmacs hierarchy. |
| 180 ROOTS is a list of installation roots." | |
| 460 | 181 ;; #### kludge |
| 182 (if lisp-directory | |
| 183 (let ((guess | |
| 184 (file-name-as-directory | |
| 185 (paths-construct-path (list lisp-directory "mule"))))) | |
| 186 (if (paths-file-readable-directory-p guess) | |
| 187 guess | |
| 4108 | 188 (paths-find-version-directory roots (list "mule-lisp") |
| 4092 | 189 nil nil |
| 460 | 190 configure-mule-lisp-directory))))) |
| 191 | |
| 428 | 192 (defun paths-find-module-directory (roots) |
| 2456 | 193 "Find the main modules directory of the XEmacs hierarchy. |
| 194 ROOTS is a list of installation roots." | |
| 4108 | 195 (paths-find-architecture-directory roots (list "modules") |
| 428 | 196 nil configure-module-directory)) |
| 197 | |
| 198 (defun paths-construct-load-path | |
| 199 (roots early-package-load-path late-package-load-path last-package-load-path | |
| 200 lisp-directory | |
| 460 | 201 &optional site-lisp-directory mule-lisp-directory) |
| 2456 | 202 "Construct the complete load path. |
| 203 ROOTS is the list of installation roots. | |
| 204 EARLY-PACKAGE-LOAD-PATH, LATE-PACKAGE-LOAD-PATH, and LAST-PACKAGE-LOAD-PATH | |
| 205 are the load paths for the package hierarchies. | |
| 206 SITE-LISP-DIRECTORY and MULE-LISP-DIRECTORY are optional directories to be | |
| 207 included in the load path---SITE-LISP-DIRECTORY for the obsolete site-specific | |
| 208 Lisp files, and MULE-LISP-DIRECTORY for the Mule Lisp files, which exist | |
| 209 only in Mule installations." | |
| 428 | 210 (let* ((envvar-value (getenv "EMACSLOADPATH")) |
| 211 (env-load-path | |
| 212 (and envvar-value | |
| 213 (paths-decode-directory-path envvar-value 'drop-empties))) | |
| 214 (site-lisp-load-path | |
| 215 (and site-lisp-directory | |
| 216 (paths-find-recursive-load-path (list site-lisp-directory) | |
| 452 | 217 paths-site-load-path-depth))) |
| 460 | 218 (mule-lisp-load-path |
| 219 (and mule-lisp-directory | |
| 220 (paths-find-recursive-load-path (list mule-lisp-directory) | |
| 221 paths-mule-load-path-depth))) | |
| 428 | 222 (lisp-load-path |
| 223 (and lisp-directory | |
| 224 (paths-find-recursive-load-path (list lisp-directory) | |
| 452 | 225 paths-core-load-path-depth)))) |
| 428 | 226 (append env-load-path |
| 227 early-package-load-path | |
| 228 site-lisp-load-path | |
| 229 late-package-load-path | |
| 460 | 230 mule-lisp-load-path |
| 428 | 231 lisp-load-path |
| 232 last-package-load-path))) | |
| 233 | |
| 234 (defun paths-construct-module-load-path | |
| 235 (root module-directory &optional site-module-directory) | |
| 236 "Construct the modules load path." | |
| 237 (let* ((envvar-value (getenv "EMACSMODULEPATH")) | |
| 238 (env-module-path | |
| 239 (and envvar-value | |
| 240 (paths-decode-directory-path envvar-value 'drop-empties))) | |
| 241 (site-module-load-path | |
| 242 (and site-module-directory | |
| 243 (paths-find-recursive-load-path (list site-module-directory) | |
| 452 | 244 paths-site-load-path-depth))) |
| 428 | 245 (module-load-path |
| 246 (and module-directory | |
| 247 (paths-find-recursive-load-path (list module-directory) | |
| 3813 | 248 paths-module-load-path-depth)))) |
| 2456 | 249 (append env-module-path |
| 428 | 250 site-module-load-path |
| 251 module-load-path))) | |
| 252 | |
| 2456 | 253 (defun paths-construct-info-path (roots |
| 254 early-package-hierarchies | |
| 255 late-package-hierarchies | |
| 256 last-package-hierarchies) | |
| 257 "Construct the info path. | |
| 258 ROOTS is the list of installation roots. | |
| 259 EARLY-PACKAGE-HIERARCHIES, LATE-PACKAGE-HIERARCHIES, and | |
| 260 LAST-PACKAGE-HIERARCHIES are lists of package hierarchy roots, | |
| 261 respectively." | |
| 428 | 262 (let ((info-path-envval (getenv "INFOPATH"))) |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
263 (union |
| 428 | 264 (append |
| 265 (let ((info-directory | |
| 4108 | 266 (paths-find-version-directory roots (list "info") |
| 4092 | 267 nil nil |
| 428 | 268 configure-info-directory))) |
| 269 (and info-directory | |
| 270 (list info-directory))) | |
| 2456 | 271 (packages-find-package-info-path early-package-hierarchies) |
| 272 (packages-find-package-info-path late-package-hierarchies) | |
| 273 (packages-find-package-info-path last-package-hierarchies) | |
| 428 | 274 (and info-path-envval |
| 275 (paths-decode-directory-path info-path-envval 'drop-empties))) | |
| 276 (and (null info-path-envval) | |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
277 (union |
| 428 | 278 (paths-directories-which-exist configure-info-path) |
|
4919
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
279 (paths-directories-which-exist paths-default-info-directories) |
|
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
280 :test #'equal)) |
|
9c6ea1581159
Remove a couple of XEmacs-specific duplicate functions, find-paths.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4154
diff
changeset
|
281 :test #'equal))) |
| 428 | 282 |
| 283 (defun paths-find-doc-directory (roots) | |
| 2456 | 284 "Find the documentation directory. |
| 285 ROOTS is the list of installation roots." | |
| 4108 | 286 (paths-find-architecture-directory roots (list "lib-src") nil configure-doc-directory)) |
| 428 | 287 |
| 288 (defun paths-find-exec-directory (roots) | |
| 2456 | 289 "Find the binary directory. |
| 290 ROOTS is the list of installation roots." | |
| 4108 | 291 (paths-find-architecture-directory roots (list "lib-src") |
| 428 | 292 nil configure-exec-directory)) |
| 293 | |
| 294 (defun paths-construct-exec-path (roots exec-directory | |
| 2456 | 295 early-package-hierarchies |
| 296 late-package-hierarchies | |
| 297 last-package-hierarchies) | |
| 298 "Find the binary path. | |
| 299 ROOTS is the list of installation roots. | |
| 300 EARLY-PACKAGE-HIERARCHIES, LATE-PACKAGE-HIERARCHIES, and | |
| 301 LAST-PACKAGE-HIERARCHIES are lists of package hierarchy roots, | |
| 302 respectively. | |
| 303 EXEC-DIRECTORY is the directory of architecture-dependent files that | |
| 304 come with XEmacs. | |
| 305 EARLY-PACKAGES, LATE-PACKAGES, and LAST-PACKAGES are lists of | |
| 306 package hierarchy roots, respectively." | |
| 428 | 307 (append |
| 308 (let ((path-envval (getenv "PATH"))) | |
| 309 (if path-envval | |
| 310 (paths-decode-directory-path path-envval 'drop-empties))) | |
| 2456 | 311 (packages-find-package-exec-path early-package-hierarchies) |
| 312 (packages-find-package-exec-path late-package-hierarchies) | |
| 428 | 313 (let ((emacspath-envval (getenv "EMACSPATH"))) |
| 314 (and emacspath-envval | |
| 315 (split-path emacspath-envval))) | |
| 316 (and exec-directory | |
| 317 (list exec-directory)) | |
| 2456 | 318 (packages-find-package-exec-path last-package-hierarchies))) |
| 428 | 319 |
| 320 (defun paths-find-data-directory (roots) | |
| 2456 | 321 "Find the data directory. |
| 322 ROOTS is the list of installation roots." | |
| 4108 | 323 (paths-find-version-directory roots (list "etc") nil "EMACSDATA" configure-data-directory)) |
| 428 | 324 |
| 325 (defun paths-construct-data-directory-list (data-directory | |
| 2456 | 326 early-package-hierarchies |
| 327 late-package-hierarchies | |
| 328 last-package-hierarchies) | |
| 329 "Construct the data path. | |
| 330 DATA-DIRECTORY is the data directory of the XEmacs installation. | |
| 331 EARLY-PACKAGE-HIERARCHIES, LATE-PACKAGE-HIERARCHIES, and | |
| 332 LAST-PACKAGE-HIERARCHIES are lists of package hierarchy roots, | |
| 333 respectively." | |
| 428 | 334 (append |
| 2456 | 335 (packages-find-package-data-path early-package-hierarchies) |
| 336 (packages-find-package-data-path late-package-hierarchies) | |
| 428 | 337 (list data-directory) |
| 2456 | 338 (packages-find-package-data-path last-package-hierarchies))) |
| 1330 | 339 |
| 428 | 340 ;;; setup-paths.el ends here |