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

diff --git a/clsql.asd b/clsql.asd
index 3d29edc..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.1 2002/08/18 02:57:50 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.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-;; For use with non-Debian installations
-(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
-				      :defaults *load-truename*)))
-  (when (probe-file helper-pathname)
-      (load helper-pathname)))
-
-(in-package :asdf)
-
-;;; System definitions
-
-(unless (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"))
+(defpackage #:clsql-system (:use #:asdf #:cl))
+(in-package #:clsql-system)
 
+#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql;"
-    :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)
-    )
+  :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)
+  )
+
+#+(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))