X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.asd;h=324ff5def309f888629e7635cea9757650e9d688;hb=86d84b96f3e70bbb52c5701ec8f0eee611a3b3c9;hp=67e9b7f8dcd24a92ab43d9de18bfc08506f5f289;hpb=0140f390dc26d640b2289c212da82e5b3f51106f;p=clsql.git

diff --git a/clsql.asd b/clsql.asd
index 67e9b7f..324ff5d 100644
--- 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.14 2002/10/14 04:09:02 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,35 +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 sbcl 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 "2.1.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 sbcl 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))