Do not abort when the hardcoded library directory is not found -- neded by standalone executables.

This commit is contained in:
Juan Jose Garcia Ripoll 2010-01-15 21:16:49 +01:00
parent 09e7b83ad2
commit 56860bdffc
3 changed files with 13 additions and 7 deletions

View file

@ -1,4 +1,4 @@
ECL 9.12.4:
ECL 10.1.1:
===========
* Bugs fixed:
@ -9,6 +9,10 @@ ECL 9.12.4:
PATHNAME-MATCH-P. Formerly there were small differences, the forming
understanding characters #\? and #\\
- Standalone executables do not require the existence of the ECLDIR directory
to start up -- it may be required, though, for working Unicode because the
encodings are stored there.
ECL 9.12.3:
===========

View file

@ -942,10 +942,11 @@ si_get_library_pathname(void)
{
cl_object true_pathname = cl_probe_file(s);
if (Null(true_pathname)) {
ecl_internal_error("Cannot find ECL's directory");
s = current_dir();
} else {
/* Produce a string */
s = ecl_namestring(s, ECL_NAMESTRING_FORCE_BASE_STRING);
}
/* Produce a string */
s = ecl_namestring(s, ECL_NAMESTRING_FORCE_BASE_STRING);
}
cl_core.library_pathname = s;
OUTPUT_UNCHANGED:

View file

@ -105,9 +105,10 @@ Returns, as a string, the version of the software under which ECL runs."
;; Otherwise it would not be a directory.
;;
#-ecl-min
(progn
(si::pathname-translations "SYS"
`(("**;*.*" ,(merge-pathnames "**/*.*" (si::get-library-pathname)))))
(let ((path (si::get-library-pathname)))
(when path
(si::pathname-translations "SYS"
`(("**;*.*" ,(merge-pathnames "**/*.*" path )))))
);#-eclmin
#-msvc
(si::pathname-translations "HOME" '(("**;*.*" "~/**/*.*")))