Commit 846095ca authored by Dave Cooper's avatar Dave Cooper

made load-quicklisp work more smoothly

parent 70babdce
...@@ -377,6 +377,7 @@ If you are interested in this effort we would love to hear from you at open-sour ...@@ -377,6 +377,7 @@ If you are interested in this effort we would love to hear from you at open-sour
#:run-command #:run-command
#:temporary-folder #:temporary-folder
#:*temporary-folder-function* #:*temporary-folder-function*
#:*utf-16-ef*
#:temporary-file #:temporary-file
#:find-gs-path #:find-gs-path
......
...@@ -437,11 +437,12 @@ keyword argument to this function. ...@@ -437,11 +437,12 @@ keyword argument to this function.
:&key ((path *quicklisp-home*) \"Pathname or string. Quicklisp location.\") :&key ((path *quicklisp-home*) \"Pathname or string. Quicklisp location.\")
" "
(let ((ql-loader (or (probe-file (merge-pathnames "program/load-ql.lisp" glisp:*gendl-home*)) (let ((ql-loader (or (probe-file (merge-pathnames "program/load-ql.lisp" glisp:*gendl-home*)) ;; linux, windows prebuilt image
(probe-file (merge-pathnames "../load-ql.lisp" *quicklisp-home*))))) (probe-file (merge-pathnames "load-ql.lisp" glisp:*gendl-home*)) ;; Mac prebuilt image
(if (probe-file ql-loader) (probe-file (merge-pathnames "../load-ql.lisp" *quicklisp-home*))))) ;; loading from source
(if (and ql-loader (probe-file ql-loader))
(let ((*quicklisp-home* path)) (load ql-loader)) (let ((*quicklisp-home* path)) (load ql-loader))
(warn "~s does not exist.~%" ql-loader)))) (warn "load-ql.lisp was not found in ~a.~%" ql-loader))))
(defun load-glime () (defun load-glime ()
......
...@@ -33,6 +33,12 @@ ...@@ -33,6 +33,12 @@
(defparameter *temporary-folder-function* #'(lambda() (merge-pathnames "tmp/" (user-homedir-pathname)))) (defparameter *temporary-folder-function* #'(lambda() (merge-pathnames "tmp/" (user-homedir-pathname))))
(defparameter *utf-16-ef*
#+allegro :unicode
#+sbcl :utf-16le
#+ccl :utf-16)
#-(or allegro lispworks sbcl ccl) #-(or allegro lispworks sbcl ccl)
(warn "~&Please implement concatenate-fasls for the currently running lisp.~%") (warn "~&Please implement concatenate-fasls for the currently running lisp.~%")
......
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