r8936: merged classic-tests into tests

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index c60ec628b0d2967c9d459134c76d5bac64c44994..366859a88bf108d44d3df9a78dbeb1accf520734 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,48 +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.3 2002/08/23 19:39:56 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.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-
-(in-package :asdf)
-
-#-clsql-base
-(let ((path (make-pathname :name "clsql-base" :type "system"
-                                     :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)))
-
-;;; System definitions
+(in-package #:cl-user)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
 
-(unless (ignore-errors (find-class 'clsql-cl-source-file))
-  (defclass clsql-cl-source-file (cl-source-file) ())
-  (defmethod source-file-type ((c clsql-cl-source-file) (s module)) 
-    "cl"))
+(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))))))
+     
 
-(defsystem clsql
-  :default-component-class clsql-cl-source-file
-  :pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
-  :perform (load-op :after (op clsql)
-                   (pushnew :clsql cl:*features*))
-  :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)
-  )
+(defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
+  (operate 'load-op 'clsql-tests)
+  (operate 'test-op 'clsql-tests :force t))