X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=2e7efe9659f29145707c95e228405ff79fedfe89;hp=cebcee1a1177e220870768d8372ad0433d13d752;hb=2961f4f122593e9d4875e88e6af159de28c8dd47;hpb=7f0e4a65d1b425f2fa58fc7cce8296c1a6c52c2f

diff --git a/clsql.asd b/clsql.asd
index cebcee1..2e7efe9 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,51 +2,84 @@
 ;;;; *************************************************************************
 ;;;; 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"
-    :author ""
-    :maintainer ""
-    :version ""
-    :licence ""
-    :description "A high level Common Lisp interface to SQL RDBMS."
-    :long-description "A high level Common Lisp interface to SQL RDBMS
-based on the Xanalys CommonSQL interface for Lispworks. It depends on
-the low-level database interfaces provided by CLSQL and includes both
-a functional and an object oriented interface."
-    :depends-on (clsql-base)
+(in-package #:cl-user)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
+
+(defsystem clsql
+    :name "CLSQL"
+    :author "Kevin Rosenberg <kevin@rosenberg.net>"
+    :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
+    :licence "Lessor Lisp General Public License"
+    :description "Common Lisp SQL Interface library"
+    :long-description "A Common Lisp interface to SQL RDBMS based on
+the Xanalys CommonSQL interface for Lispworks. It depends on the
+low-level database interfaces as well as a functional and an object
+oriented interface."
     :components
     ((:module sql
 	      :components
-	      ((:module :package
+	      ((:module base
+			:pathname ""
+			:components
+			((:file "cmucl-compat")
+			 (:file "package")
+			 (:file "kmr-mop" :depends-on ("package"))
+			 (:file "base-classes" :depends-on ("package"))
+                         (:file "conditions" :depends-on ("base-classes"))
+                         (:file "db-interface" :depends-on ("conditions"))
+			 (:file "time" :depends-on ("package" "conditions"))
+			 (:file "utils" :depends-on ("package" "db-interface"))
+                         (:file "generics" :depends-on ("package"))))
+               (:module database 
+                        :pathname "" 
+                        :components 
+                        ((:file "initialize")
+			 (:file "database" :depends-on ("initialize"))
+			 (:file "recording" :depends-on ("database"))
+			 (:file "pool"))
+                        :depends-on (base))
+	       (:module syntax
 			:pathname ""
-			:components ((:file "package")
-				     (:file "kmr-mop" :depends-on ("package"))))
-	       (:module :core
+			:components ((:file "expressions")
+				     (:file "operations" 
+                                            :depends-on ("expressions"))
+				     (:file "syntax" :depends-on ("operations")))
+			:depends-on (database))
+	       (:module functional
 			:pathname ""
-			:components ((:file "classes")
-				     (:file "operations" :depends-on ("classes"))
-				     (:file "syntax"))
-			:depends-on (:package))
-	       (:module :functional
+			:components ((:file "fdml")
+                                     (:file "transaction" :depends-on ("fdml"))
+                                     (:file "loop-extension" 
+                                            :depends-on ("fdml"))
+				     (:file "fddl" :depends-on ("fdml")))
+			:depends-on (syntax))
+	       (:module object
 			:pathname ""
-			:components ((:file "sql")
-				     (:file "table"))
-			:depends-on (:core))
-	       (:module :object
+			:components ((:file "metaclasses")
+				     (:file "ooddl" :depends-on ("metaclasses"))
+				     (:file "oodml" :depends-on ("ooddl")))
+			:depends-on (functional))
+	       (:module generic
 			:pathname ""
-		       :components ((:file "metaclasses")
-				    (:file "objects" :depends-on ("metaclasses")))
-		       :depends-on (:functional))))))
-     
+			:components ((:file "generic-postgresql")
+				     (:file "generic-odbc")
+				     (:file "sequences"))
+			: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))