X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-aclrepl%2Fsb-aclrepl.asd;h=4fbae1d5477c0748750a3b8cb1f5dff61d5f7a92;hb=bf25f936158ea89a142d86a0f0216a8bed029dc5;hp=410ff07cfac9eb2d8eb6da044528896d75d425ea;hpb=01af9d7ee59a7427f9cc5c6f9fea41fe87851367;p=sbcl.git

diff --git a/contrib/sb-aclrepl/sb-aclrepl.asd b/contrib/sb-aclrepl/sb-aclrepl.asd
index 410ff07..4fbae1d 100644
--- a/contrib/sb-aclrepl/sb-aclrepl.asd
+++ b/contrib/sb-aclrepl/sb-aclrepl.asd
@@ -4,14 +4,26 @@
 (in-package #:sb-aclrepl-system)
 
 (defsystem sb-aclrepl
-    :version "0.6"
     :author "Kevin Rosenberg <kevin@rosenberg.net>"
     :description "An AllegroCL compatible REPL"
-    :components ((:file "repl")
-		 (:file "inspect" :depends-on ("repl"))
-		 (:file "debug" :depends-on ("repl"))))
+    #+sb-building-contrib :pathname
+    #+sb-building-contrib "SYS:CONTRIB;SB-ACLREPL;"
+    :components ((:file "toplevel")
+                 (:file "repl" :depends-on ("toplevel"))
+                 (:file "inspect" :depends-on ("repl"))
+                 (:file "debug" :depends-on ("repl"))))
+
+(defmethod perform :after ((o load-op) (c (eql (find-system :sb-aclrepl))))
+  (provide 'sb-aclrepl))
 
 (defmethod perform ((o test-op) (c (eql (find-system :sb-aclrepl))))
-  (or (load "aclrepl-tests.lisp")
-      (error "test-op failed")))
+  (oos 'load-op 'sb-aclrepl-tests)
+  (oos 'test-op 'sb-aclrepl-tests))
 
+(defsystem sb-aclrepl-tests
+    :depends-on (sb-rt)
+    :components ((:file "tests")))
+
+(defmethod perform ((o test-op) (c (eql (find-system :sb-aclrepl-tests))))
+  (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
+      (error "test-op failed")))