X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=umlisp.asd;h=db42aed0eeb920764dc07d123d35cdd237e4fd5f;hb=ea26d2291ff800e37c28388d9bb24cacbfbbbe57;hp=0e1eafbb32bc84d47f393d259bd0d5b08e70109f;hpb=08fb3b39f6ee551d9d5ef67bd822afded0d403a0;p=umlisp.git

diff --git a/umlisp.asd b/umlisp.asd
index 0e1eafb..db42aed 100644
--- a/umlisp.asd
+++ b/umlisp.asd
@@ -4,39 +4,39 @@
 ;;;;
 ;;;; 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.13 2003/03/25 14:56:37 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2004 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; 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 scl)
-(defsystem :umlisp
-  :perform (load-op :after (op umlisp)
-		    (pushnew :umlisp cl:*features*))
-  
+(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 "sql-create" :depends-on ("parse-common"))
-      (:file "classes" :depends-on ("utils"))
-      (:file "sql-classes" :depends-on ("classes" "sql"))
-      (:file "composite" :depends-on ("sql-classes")))
-     :depends-on (:clsql
-		  :clsql-mysql
-		  :kmrcl
-		  :hyperobject))
+  ((:file "package")
+   (:file "data-structures" :depends-on ("package"))
+   (:file "utils" :depends-on ("data-structures"))
+   (:file "sql" :depends-on ("utils"))
+   (:file "parse-macros"  :depends-on ("sql"))
+   (:file "parse-rrf"  :depends-on ("parse-macros"))
+   (:file "parse-common"  :depends-on ("parse-rrf"))
+   (:file "create-sql" :depends-on ("parse-common"))
+   (:file "sql-classes" :depends-on ("sql"))
+   (:file "classes" :depends-on ("sql-classes"))
+   (:file "class-support" :depends-on ("classes"))
+   (:file "composite" :depends-on ("sql-classes")))
+  :depends-on (clsql clsql-postgresql-socket kmrcl hyperobject))
 
+#+(or allegro lispworks cmu sbcl openmcl scl)
+(defmethod perform ((o test-op) (c (eql (find-system 'umlisp))))
+  (operate 'load-op 'umlisp-tests)
+  (operate 'test-op 'umlisp-tests :force t))