r2741: Start migration to pathname-less asd files, remove .system files

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index 9a1460b476059217fe0e77109fef4c0fa743c910..162520037dcc8fa2dff25e74a842302304dc96eb 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.4 2002/09/01 09:00:15 kevin Exp $
+;;;; $Id: clsql.asd,v 1.7 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,33 +16,24 @@
 ;;;; (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
-
-
-(defmethod source-file-type  ((c cl-source-file)
-                             (s (eql (find-system 'clsql)))) 
-   "cl")
-
 (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")))
+  :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 "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")