X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=umlisp.asd;h=1c8cb6a96e993807a796560eb9641ad96281cd81;hb=965b7cc5c174f0e0b82d1589978f734ea257ed78;hp=bb07a5242fddb5598a3abf644998cadcf1d513dc;hpb=bb01b732745d1478aaef9828cb19e4c89d4f3ea6;p=umlisp.git

diff --git a/umlisp.asd b/umlisp.asd
index bb07a52..1c8cb6a 100644
--- a/umlisp.asd
+++ b/umlisp.asd
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; Name:          umlisp.asd
 ;;;; Purpose:       ASDF system definition file for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: umlisp.asd,v 1.7 2002/10/14 18:51:38 kevin Exp $
+;;;; $Id: umlisp.asd,v 1.16 2003/05/03 17:10:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -16,30 +16,37 @@
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
 
-(in-package :asdf)
+(defpackage #:umlisp-system (:use #:asdf #:cl))
+(in-package #:umlisp-system)
 
-#+(or allegro lispworks cmu sbcl openmcl)
-(defsystem :umlisp
-  :perform (load-op :after (op umlisp)
-		    (pushnew :umlisp cl:*features*))
-  
+#+(or allegro lispworks cmu sbcl openmcl scl)
+(defsystem umlisp
     :components 
-     ((:file "package")
-      (:file "data-structures" :depends-on ("package"))
-      (:file "sql" :depends-on ("data-structures"))
-      (:file "utils" :depends-on ("data-structures"))
-      (:file "parse-macros"  :depends-on ("sql"))
-      (:file "parse-2002"  :depends-on ("parse-macros"))
-      (:file "parse-common"  :depends-on ("parse-2002"))
-      (:file "classes" :depends-on ("utils"))
-      (:file "sql-classes" :depends-on ("classes" "sql"))
-      (:file "composite" :depends-on ("sql-classes")))
-     :depends-on (:clsql-mysql
-		  :clsql-postgresql
-		  :clsql
-		  :kmrcl))
+  ((:file "package")
+   (:file "data-structures" :depends-on ("package"))
+   (:file "sql" :depends-on ("data-structures"))
+   (:file "utils" :depends-on ("data-structures"))
+   (:file "parse-macros"  :depends-on ("sql"))
+   (:file "parse-2002"  :depends-on ("parse-macros"))
+   (:file "parse-common"  :depends-on ("parse-2002"))
+   (:file "sql-create" :depends-on ("parse-common"))
+   (:file "classes" :depends-on ("utils"))
+   (:file "class-support" :depends-on ("classes"))
+   (:file "sql-classes" :depends-on ("class-support" "sql"))
+   (:file "composite" :depends-on ("sql-classes")))
+  :depends-on (:clsql :clsql-mysql :kmrcl :hyperobject))
 
-#+(or allegro lispworks cmu sbcl openmcl)
-(when (ignore-errors (find-class 'load-compiled-op))
-  (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :umlisp))))
-    (pushnew :umlisp cl:*features*)))
+#+(or allegro lispworks cmu sbcl openmcl scl)
+(defmethod perform ((o test-op) (c (eql (find-system :umlisp))))
+  (oos 'load-op 'umlisp-tests)
+  (oos 'test-op 'umlisp-tests))
+
+#+(or allegro lispworks cmu sbcl openmcl scl)
+(defsystem umlisp-tests
+    :depends-on (rt umlisp)
+    :components ((:file "tests")))
+
+#+(or allegro lispworks cmu sbcl openmcl scl)
+(defmethod perform ((o test-op) (c (eql (find-system :umlisp-tests))))
+  (or (funcall (intern (symbol-name '#:do-tests) (find-package '#:rtest)))
+      (error "test-op failed")))