X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=2842c944c411cdc94384ccd8563d280a95b8f6d6;hp=36c688cab3f037b22adfbffac8448760fe799d94;hb=edd7d48fad2820d89dd98db141a2fb8310f84b20;hpb=33dcd7b49025344bd4c9827d1cd2b6e6857a0c03

diff --git a/clsql.asd b/clsql.asd
index 36c688c..2842c94 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,49 +2,61 @@
 ;;;; *************************************************************************
 ;;;; 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.15 2002/10/16 11:51:04 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)
-
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
-(defsystem :clsql
-  :name "cl-sql"
-  :author "Kevin M. Rosenberg <kmr@debian.org>"
-  :version "0.9.2"
-  :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
-  :licence "Lessor Lisp General Public License"
-  :description "Common Lisp SQL Interface Library"
-  :long-description "cl-sql package provides the high-level interface for the CLSQL system."
-  
-  :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)
-  )
+(in-package #:cl-user)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
 
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
-(when (ignore-errors (find-class 'load-compiled-op))
-  (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql))))
-    (pushnew :clsql cl:*features*)))
+(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 "generics")
+				     (:file "classes" :depends-on ("generics"))
+				     (:file "operations" :depends-on ("classes"))
+				     (:file "syntax" :depends-on ("operations")))
+			:depends-on (:package))
+	       (:module :functional
+			:pathname ""
+			:components ((:file "sql")
+				     (:file "table" :depends-on ("sql")))
+			:depends-on (:core))
+	       (:module :object
+			:pathname ""
+		       :components ((:file "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))