[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv10784

Modified Files:
	ChangeLog swank-loader.lisp 
Log Message:
* swank-loader.lisp: ASDF free again.  And proud of it!
(default-fasl-dir, load-swank): Remove asdf stuff.

--- /project/slime/cvsroot/slime/ChangeLog	2010/11/03 11:00:40	1.2161
+++ /project/slime/cvsroot/slime/ChangeLog	2010/11/07 19:48:14	1.2162
@@ -1,3 +1,8 @@
+2010-11-07  Helmut Eller  <heller at common-lisp.net>
+
+	* swank-loader.lisp: ASDF free again.  And proud of it!
+	(default-fasl-dir, load-swank): Remove asdf stuff.
+
 2010-11-03  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-loader.lisp (*architecture-features*): Add :arm for CCL
--- /project/slime/cvsroot/slime/swank-loader.lisp	2010/11/03 11:00:40	1.109
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2010/11/07 19:48:14	1.110
@@ -124,22 +124,12 @@
     (and s (symbol-name (read s)))))
 
 (defun default-fasl-dir ()
-  (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))))
+  (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.")
@@ -244,16 +234,6 @@
 
 (defun load-swank (&key (src-dir *source-directory*)
                         (fasl-dir *fasl-directory*))
-  (when (find-package :asdf)
-    ;; Make sure our swank.asd is visible to ASDF.
-    (eval
-     (let ((*package* (find-package :swank-loader)))
-       (read-from-string
-        "(let ((swank-system (asdf:find-system :swank nil)))
-          (unless (and swank-system
-                       (equal (asdf:component-pathname swank-system)
-                              (merge-pathnames \"swank.asd\" *source-directory*)))
-            (push *source-directory* asdf:*central-registry*)))"))))
   (compile-files (src-files *swank-files* src-dir) fasl-dir t)
   (funcall (q "swank::before-init")
            (slime-version-string)