X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=kmrcl.asd;h=0150ed65ab60af75361fe77bc3a0d2b361723bee;hp=96f862b67756081fbba0e229fa86c0b5e5622330;hb=HEAD;hpb=2cfe7dc5fb016ef08bb70e3eabed39c44dad468a

diff --git a/kmrcl.asd b/kmrcl.asd
index 96f862b..0150ed6 100644
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;; KMRCL users are granted the rights to distribute and use this software
@@ -20,17 +18,16 @@
 (defpackage #:kmrcl-system (:use #:asdf #:cl))
 (in-package #:kmrcl-system)
 
-#+(or allegro cmu lispworks sbcl scl openmcl)
+#+(or allegro cmu clisp lispworks sbcl scl openmcl)
 (pushnew :kmr-mop cl:*features*)
 
 (defsystem kmrcl
     :name "kmrcl"
     :author "Kevin M. Rosenberg <kevin@rosenberg.net>"
-    :version "1.31+"
     :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
     :licence "LLGPL"
-
-    :components 
+    :depends-on (#+sbcl sb-posix)
+    :components
     ((:file "package")
      (:file "ifstar" :depends-on ("package"))
      (:file "byte-stream" :depends-on ("package"))
@@ -38,7 +35,7 @@
      (:file "functions" :depends-on ("macros"))
      (:file "lists" :depends-on ("macros"))
      (:file "seqs" :depends-on ("macros"))
-     (:file "impl" :depends-on ("macros")) 
+     (:file "impl" :depends-on ("macros"))
      (:file "io" :depends-on ("macros" "impl"))
      (:file "console" :depends-on ("macros"))
      (:file "strings" :depends-on ("macros" "seqs"))
@@ -48,8 +45,9 @@
      (:file "symbols" :depends-on ("macros"))
      (:file "datetime" :depends-on ("macros"))
      (:file "math" :depends-on ("macros"))
+     (:file "color" :depends-on ("macros"))
      #+kmr-mop (:file "mop" :depends-on ("macros"))
-     #+kmr-mop (:file "attrib-class" :depends-on ("seqs" "mop"))
+     ;; #+kmr-mop (:file "attrib-class" :depends-on ("seqs" "mop"))
      (:file "equal" :depends-on ("macros" #+kmr-mop "mop"))
      (:file "web-utils" :depends-on ("macros" "strings"))
      (:file "xml-utils" :depends-on ("macros"))
@@ -57,11 +55,18 @@
      (:file "processes" :depends-on ("macros"))
      (:file "listener" :depends-on ("sockets" "processes" "console"))
      (:file "repl" :depends-on ("listener" "strings"))
-     (:file "os" :depends-on ("macros"))
-     (:file "getopt" :depends-on ("macros"))
-     ))
+     (:file "os" :depends-on ("macros" "impl"))
+     (:file "signals" :depends-on ("package"))
+     (:file "btree" :depends-on ("macros"))
+     (:file "hash" :depends-on ("macros")))
+    :in-order-to ((test-op (test-op "kmrcl/test"))))
 
-(defmethod perform ((o test-op) (c (eql (find-system 'kmrcl))))
-  (operate 'load-op 'kmrcl-tests)
-  (operate 'test-op 'kmrcl-tests :force t))
 
+(defsystem kmrcl/test
+    :depends-on (:rt :kmrcl)
+    :components
+    ((:file "tests"))
+    :perform (test-op (o s)
+                      (or (funcall (intern (symbol-name '#:do-tests)
+		                           (find-package '#:regression-test)))
+                          (error "test-op failed"))))