Skip to content

Commit

Permalink
Revert parts of "* swank-loader.lisp: ASDF free again. And proud of it!"
Browse files Browse the repository at this point in the history
  • Loading branch information
attila-lendvai committed Jan 6, 2014
1 parent 4e0efd3 commit f95a4b6
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions swank-loader.lisp
Expand Up @@ -128,12 +128,22 @@ Return nil if nothing appropriate is available."
(and s (symbol-name (read s)))))

(defun default-fasl-dir ()
(merge-pathnames
(make-pathname
:directory `(:relative ".slime" "fasl"
,@(if (slime-version-string) (list (slime-version-string)))
,(unique-dir-name)))
(user-homedir-pathname)))
(or
;; If ASDF is available then store Slime's fasl's where ASDF stores them.
(let ((translate-fn (and (find-package :asdf)
(find-symbol "COMPILE-FILE-PATHNAME*" :asdf))))
(when translate-fn
(make-pathname
:name nil :type nil
:defaults (funcall translate-fn
(make-pathname :name "foo"
:defaults *source-directory*)))))
(merge-pathnames
(make-pathname
:directory `(:relative ".slime" "fasl"
,@(if (slime-version-string) (list (slime-version-string)))
,(unique-dir-name)))
(user-homedir-pathname))))

(defvar *fasl-directory* (default-fasl-dir)
"The directory where fasl files should be placed.")
Expand Down

0 comments on commit f95a4b6

Please sign in to comment.