X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=2842c944c411cdc94384ccd8563d280a95b8f6d6;hp=f74e884b009bea3b7a8fb927f83794bee750a226;hb=edd7d48fad2820d89dd98db141a2fb8310f84b20;hpb=73cf858d596ad1d51c745b478292433617cf9d72

diff --git a/clsql.asd b/clsql.asd
index f74e884..2842c94 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -14,7 +14,11 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(asdf:defsystem #:clsql
+(in-package #:cl-user)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
+
+(defsystem #:clsql
     :name "CLSQL"
     :author ""
     :maintainer ""
@@ -35,18 +39,24 @@ 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 "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))