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

diff --git a/clsql.asd b/clsql.asd
index 1625200..366859a 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,38 +2,59 @@
 ;;;; *************************************************************************
 ;;;; 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 ""
+    :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)
+    :components
+    ((:module sql
+	      :components
+	      ((:module :package
+			:pathname ""
+			:components ((:file "package")
+				     (:file "kmr-mop" :depends-on ("package"))))
+	       (:module :core
+			:pathname ""
+			:components ((:file "classes")
+				     (:file "operations" :depends-on ("classes"))
+				     (:file "syntax"))
+			:depends-on (:package))
+	       (:module :functional
+			:pathname ""
+			:components ((:file "sql")
+				     (:file "table"))
+			:depends-on (:core))
+	       (:module :object
+			:pathname ""
+		       :components ((:file "metaclasses")
+				    (:file "objects" :depends-on ("metaclasses")))
+		       :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))