X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=f9e8bff1ac2534971996732e1d2cc37d5aff191b;hp=162520037dcc8fa2dff25e74a842302304dc96eb;hb=e622ee6f4bf2b9fe81af59d566e651c983a4833b;hpb=31d1a78ee915ae4db7c042b7e5cb1ab7b5a73448

diff --git a/clsql.asd b/clsql.asd
index 1625200..f9e8bff 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,38 +2,84 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          clsql.system
-;;;; Purpose:       Defsystem-3/4 for CLSQL
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
+;;;; Name:     clsql.asd
+;;;; Purpose:  System definition for CLSQL-CLASSIC
+;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
+;;;; Created:  March 2004
 ;;;;
-;;;; $Id: clsql.asd,v 1.7 2002/09/17 17:16:43 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; $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.
 ;;;; *************************************************************************
 
-(in-package :asdf)
+(in-package #:cl-user)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
 
-(defsystem clsql
-  :perform (load-op :after (op clsql)
-		    (pushnew :clsql cl:*features*))
-  :components
-  ((:module :sql
-	    :components
-	    ((:file "package")
-	     (:file "pool" :depends-on ("package"))
-	     (:file "loop-extension")
-	     (:file "sql" :depends-on ("pool"))
-	     (:file "transactions" :depends-on ("sql"))
-	     (:file "functional" :depends-on ("sql"))
-	     (:file "usql" :depends-on ("sql")))))
-  :depends-on (:clsql-base)
-  )
+(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 :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 "expressions")
+				     (:file "operations" 
+                                            :depends-on ("expressions"))
+				     (:file "syntax" :depends-on ("operations")))
+			:depends-on (:database))
+	       (:module :functional
+			:pathname ""
+			: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 "metaclasses")
+                                    (:file "ooddl" :depends-on ("metaclasses"))
+				    (:file "oodml" :depends-on ("ooddl")))
+		       :depends-on (:functional))
+	       (:module :generic
+			:pathname ""
+		       :components ((:file "generic-postgresql")
+				    (:file "generic-odbc")
+				    (:file "sequences"))
+		       :depends-on (:functional))))))
+     
 
-(defmethod source-file-type  ((c cl-source-file)
-			      (s (eql (find-system 'clsql)))) 
-   "cl")
+(defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
+  (operate 'load-op 'clsql-tests)
+  (operate 'test-op 'clsql-tests :force t))