X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=cef8387f6fa0d35be9c1b29807e51be3be7e43db;hp=ac2fb352d32265010d3eed499711d404a7649317;hb=ce0e343835a040406678dff74a62d1b0cb56f317;hpb=ef790603600edc88958389d269922b1f379781e1

diff --git a/clsql.asd b/clsql.asd
index ac2fb35..cef8387 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.5 2002/09/06 10:26:17 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,34 +16,31 @@
 ;;;; (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
-
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
 
+#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql
-  :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")))
+  :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."
+  
+  :components
+  ((:module :sql
+	    :components
+	    ((:file "package")
+	     (:file "sql" :depends-on ("package"))
+	     (:file "functional" :depends-on ("sql"))
+	     (:file "usql" :depends-on ("sql"))
+	     )))
   :depends-on (:clsql-base)
   )
 
-(defmethod source-file-type  ((c cl-source-file)
-			      (s (eql (find-system 'clsql)))) 
-   "cl")
-
+#+(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))