Commit 7b69e7ea authored by Robert P. Goldman's avatar Robert P. Goldman

Extensions to UIOP-DIRECTORY.

Let the user point to the directory with an environment variable.
Add error message if we are not able to find it.
parent 5ee3edb5
...@@ -420,6 +420,7 @@ objects. Side-effects for cached file location computation." ...@@ -420,6 +420,7 @@ objects. Side-effects for cached file location computation."
(ssd (x) (ignore-errors (symbol-call :asdf :system-source-directory x)))) (ssd (x) (ignore-errors (symbol-call :asdf :system-source-directory x))))
;; NB: conspicuously *not* including searches based on #.(current-lisp-pathname) ;; NB: conspicuously *not* including searches based on #.(current-lisp-pathname)
(or (or
(getenv-absolute-directory "UIOP_SOURCE_DIR")
;; Look under uiop if available as source override, under asdf if avaiable as source ;; Look under uiop if available as source override, under asdf if avaiable as source
(ssd "uiop") (ssd "uiop")
(sub (ssd "asdf") "uiop/") (sub (ssd "asdf") "uiop/")
...@@ -429,4 +430,6 @@ objects. Side-effects for cached file location computation." ...@@ -429,4 +430,6 @@ objects. Side-effects for cached file location computation."
(xdg-data-pathname "common-lisp/source/asdf/uiop/") (xdg-data-pathname "common-lisp/source/asdf/uiop/")
(xdg-data-pathname "common-lisp/source/cl-asdf/uiop/") ; traditional Debian location (xdg-data-pathname "common-lisp/source/cl-asdf/uiop/") ; traditional Debian location
;; The last one below is useful for Fare, primary (sole?) known user ;; The last one below is useful for Fare, primary (sole?) known user
(sub (user-homedir-pathname) "cl/asdf/uiop/"))))) (sub (user-homedir-pathname) "cl/asdf/uiop/")
(cerror "Set environment variable UIOP_SOURCE_DIR and retry" "Unable to find UIOP directory")
(uiop-directory)))))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment