Re: Find architecture-specific directories correctly
I'm moving this to xemacs-beta since I can't read xemacs-review and
there are a couple of issues here I'd like to discuss.
On 12 Dec 2000 at 13:38:22 +0900, Yoshiki Hayashi <yoshiki(a)xemacs.org>
wrote:
james(a)eecs.ukans.edu (Jerry James) writes:
> There are only 3 calls to paths-find-architecture-directory, including
> the one that sets a module-related path. This change does not affect
> the other 2 calls, and makes all of the module path variables get good
> values.
>
> 2000-11-29 Jerry James <james(a)eecs.ukans.edu>
>
> * find-paths.el (paths-find-architecture-directory): Check for
> directory base in directory system-configuration instead of
> checking for a directory with the concatenated name.
Sorry, I have to veto this patch.
module-load-path values are (Note these are build in
different directory):
Installed XEmacs before patched:
("/opt/local/lib/xemacs/site-modules/"
"/src/xemacs/modules/" "/src/xemacs/modules/alloc-test/"
"/src/xemacs/modules/base64/" "/src/xemacs/modules/ldap/"
"/src/xemacs/modules/sample/" "/src/xemacs/modules/wnn/"
"/src/xemacs/modules/zlib/")
I don't understand this. I also am building in a different directory,
but my module-load-path is nil at startup. I submitted the patch based
on 21.2.37, but I just tried again with 21.2.38 and got the same
result. Why do you have directories in your module-load-path but I
don't?
Note that all but the first one are wrong, anyway, since the installed
XEmacs shouldn't be pointing into the source tree.
Installed XEmacs after patched:
("/opt/local/lib/xemacs/site-modules/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/include/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/modules/")
Yes, the second and third directories are bogus, but the first and
fourth are right. I have a slightly revised patch that fixes this.
Run-in-place XEmacs before patched (build inside source directory):
("/opt/local/lib/xemacs/site-modules/"
"/work/yoshiki/orig/xemacs/modules/"
"/work/yoshiki/orig/xemacs/modules/base64/"
"/work/yoshiki/orig/xemacs/modules/ldap/"
"/work/yoshiki/orig/xemacs/modules/sample/"
"/work/yoshiki/orig/xemacs/modules/zlib/")
Again, my XEmacs has module-load-path as nil in this case. I don't
understand why you are picking up values there but I'm not.
Run-in-place XEmacs after patched (build outside source directory):
("/opt/local/lib/xemacs/site-modules/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/include/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/modules/")
Run-in-place XEmacs after patched (build inside source directory):
("/opt/local/lib/xemacs/site-modules/"
"/src/xemacs/modules/" "/src/xemacs/modules/alloc-test/"
"/src/xemacs/modules/base64/" "/src/xemacs/modules/ldap/"
"/src/xemacs/modules/sample/" "/src/xemacs/modules/wnn/"
"/src/xemacs/modules/zlib/")
When I apply your patch and install XEmacs, XEmacs has these
two wrong directories in module-load-path.
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/"
"/opt/local/lib/xemacs-21.2-b37/i686-pc-linux/include/"
Other examples show that there might be something you have
missed. It would be really great if you can provide a patch
that solves all these problems.
First I need to understand why you are getting different results than I
am. FWIW, the following patch (against vanilla XEmacs 21.2.38 sources,
ignoring my previous patch) cleared up the two bogus directories for me:
--- lisp/find-paths.el.ORIG Wed Sep 13 10:57:43 2000
+++ lisp/find-paths.el Tue Dec 19 23:11:02 2000
＠＠ -235,14 +235,15 ＠＠
(or
;; from more to less specific
(paths-find-version-directory roots
- (concat base system-configuration)
+ (paths-construct-path
+ (list system-configuration base))
envvar default)
(paths-find-version-directory roots
base
- envvar)
+ envvar default)
(paths-find-version-directory roots
system-configuration
- envvar)))
+ envvar default)))
(defun construct-emacs-version-name ()
"Construct the raw XEmacs version number."
--
Jerry James