r8821: integrate usql support

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index 0c7c27d4c776bb4afdb1a06b43709c66c11ab40f..cef8387f6fa0d35be9c1b29807e51be3be7e43db 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          clsql.system
-;;;; Purpose:       Defsystem-3/4 for CLSQL
+;;;; Name:          clsql.asd
+;;;; Purpose:       System definition for CLSQL
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.12 2002/09/25 12:44:59 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,41 +16,31 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package :asdf)
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
 
-#+(or allegro lispworks cmu openmcl mcl)
-(defsystem :clsql
-  :name "cl-sql"
-  :author "Kevin M. Rosenberg <kmr@debian.org>"
-  :version "0.9.2"
+#+(or allegro lispworks cmu sbcl openmcl mcl scl)
+(defsystem clsql
+  :name "clsql"
+  :author "Kevin Rosenberg <kevin@rosenberg.net>"
   :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
+  :version "1.5.x"
   :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 "sql" :depends-on ("package"))
             (:file "functional" :depends-on ("sql"))
-            (:file "usql" :depends-on ("sql")))))
+            (:file "usql" :depends-on ("sql"))
+            )))
   :depends-on (:clsql-base)
   )
 
-#+(or allegro lispworks cmu openmcl mcl)
-(defmethod source-file-type  ((c cl-source-file)
-                             (s (eql (find-system :clsql)))) 
-   "cl")
-
-
-#+(or allegro lispworks cmu openmcl mcl)
-(when (ignore-errors (find-class 'load-compiled-op))
-  (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql))))
-    (pushnew :clsql cl:*features*)))
-
+#+(or allegro lispworks cmu sbcl openmcl mcl scl)
+(defmethod perform ((o test-op) (c (eql (find-system :clsql))))
+  (oos 'load-op 'clsql-tests)
+  (oos 'test-op 'clsql-tests))