[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv11384

Modified Files:
	ChangeLog swank.asd swank-loader.lisp 
Log Message:
Make ASDF:LOAD-OP (and SBCL REQUIRE) happy with swank.asd

* swank.asd: Define and use a CL-SCRIPT-FILE class for loading as
source, even with ASDF:LOAD-OP.



--- /project/slime/cvsroot/slime/ChangeLog	2007/09/11 19:31:45	1.1214
+++ /project/slime/cvsroot/slime/ChangeLog	2007/09/14 12:41:28	1.1215
@@ -1,3 +1,10 @@
+2007-09-12  Christophe Rhodes  <csr21 at cantab.net>
+
+	Make ASDF:LOAD-OP (and SBCL REQUIRE) happy with swank.asd
+
+	* swank.asd: Define and use a CL-SCRIPT-FILE class for loading as
+	source, even with ASDF:LOAD-OP.
+
 2007-09-11  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* swank-loader.lisp: Aways compile-file `contrib/swank-asdf.lisp'
--- /project/slime/cvsroot/slime/swank.asd	2006/07/12 20:25:23	1.4
+++ /project/slime/cvsroot/slime/swank.asd	2007/09/14 12:41:28	1.5
@@ -19,10 +19,30 @@
 ;; This code has been placed in the Public Domain.  All warranties
 ;; are disclaimed.
 
+(defpackage :swank-loader
+  (:use :cl))
+
+(in-package :swank-loader)
+
+(defclass cl-script-file (asdf:source-file) ())
+
+(defmethod asdf:perform ((o asdf:compile-op) (f cl-script-file))
+  t)
+(defmethod asdf:perform ((o asdf:load-op) (f cl-script-file))
+  (mapcar #'load (asdf:input-files o f)))
+(defmethod asdf:output-files ((o asdf:compile-op) (f cl-script-file))
+  nil)
+(defmethod asdf:input-files ((o asdf:load-op) (c cl-script-file))
+  (list (asdf:component-pathname c)))
+(defmethod asdf:operation-done-p ((o asdf:compile-op) (c cl-script-file))
+  t)
+(defmethod asdf:source-file-type ((c cl-script-file) (s asdf:module))
+  "lisp")
+
 (asdf:defsystem :swank
+    :default-component-class cl-script-file
     :components ((:file "swank-loader")))
 
-(defpackage :swank-loader)
-(defparameter swank-loader::*source-directory*
+(defparameter *source-directory*
   (asdf:component-pathname (asdf:find-system :swank)))
 
--- /project/slime/cvsroot/slime/swank-loader.lisp	2007/09/11 19:30:53	1.72
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2007/09/14 12:41:28	1.73
@@ -18,7 +18,6 @@
 ;;   (defparameter swank-loader::*fasl-directory* "/tmp/fasl/")
 ;;   (load ".../swank-loader.lisp")
 
-
 (cl:defpackage :swank-loader
   (:use :cl)
   (:export :load-swank