X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.asd;h=3ee350c7595e385a5493315c21379bd3242eb94e;hb=279b34c9e8e28545c8f2a0959acb01d90138eeda;hp=cebcee1a1177e220870768d8372ad0433d13d752;hpb=7f0e4a65d1b425f2fa58fc7cce8296c1a6c52c2f;p=clsql.git

diff --git a/clsql.asd b/clsql.asd
index cebcee1..3ee350c 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,20 +2,24 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:     clsql-classic.asd
+;;;; Name:     clsql.asd
 ;;;; Purpose:  System definition for CLSQL-CLASSIC
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004
 ;;;;
-;;;; $Id: clsql-classic.asd 8847 2004-04-07 14:38:14Z kevin $
+;;;; $Id$
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(asdf:defsystem #:clsql-usql
-    :name "CLSQL-USQL"
+(in-package #:cl-user)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
+
+(defsystem #:clsql
+    :name "CLSQL"
     :author ""
     :maintainer ""
     :version ""
@@ -35,18 +39,25 @@ a functional and an object oriented interface."
 				     (:file "kmr-mop" :depends-on ("package"))))
 	       (:module :core
 			:pathname ""
-			:components ((:file "classes")
+			:components ((:file "generics")
+				     (:file "classes" :depends-on ("generics"))
+				     (:file "loop-extension" :depends-on ("classes"))
 				     (:file "operations" :depends-on ("classes"))
-				     (:file "syntax"))
+				     (:file "syntax" :depends-on ("operations")))
 			:depends-on (:package))
 	       (:module :functional
 			:pathname ""
 			:components ((:file "sql")
-				     (:file "table"))
+				     (:file "table" :depends-on ("sql")))
 			:depends-on (:core))
 	       (:module :object
 			:pathname ""
 		       :components ((:file "metaclasses")
-				    (:file "objects" :depends-on ("metaclasses")))
+				    (:file "objects" :depends-on ("metaclasses"))
+				    (:file "relations" :depends-on ("objects")))
 		       :depends-on (:functional))))))
      
+
+(defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
+  (operate 'load-op 'clsql-tests)
+  (operate 'test-op 'clsql-tests :force t))