r10077: * multiple: Apply patch from Joerg Hoehle with multiple

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index f74e884b009bea3b7a8fb927f83794bee750a226..2e7efe9659f29145707c95e228405ff79fedfe89 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -14,39 +14,72 @@
 ;;;; (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 ""
-    :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)
+    :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))