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

[clsql.git] / clsql-base.asd

diff --git a/clsql-base.asd b/clsql-base.asd
index a7b9fae1d08c28c9dedbdd75a177a1d68ca6a914..c45a806636a77db87437663feee2e3f31df543e7 100644 (file)
--- a/clsql-base.asd
+++ b/clsql-base.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.asd,v 1.5 2002/09/01 09:00:14 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.10 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,41 +16,23 @@
 ;;;; (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)
 
-;; For use with non-Common Lisp Controller installations
-#-common-lisp-controller
-(let ((path (make-pathname :name "set-logical" :type "cl"
-                                     :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)
-    (set-logical-host-for-pathname 
-     "clsql" 
-     (make-pathname :host (pathname-host *load-truename*)
-                   :device (pathname-device *load-truename*)
-                   :directory (pathname-directory *load-truename*)))))
-
-(defconstant +clsql-logical-host+
-  #+common-lisp-controller "cl-library"
-  #-common-lisp-controller "clsql"
-  "Logical hostname for loading system")
-
-(defmethod source-file-type  ((c cl-source-file)
-                             (s (eql (find-system 'clsql-base)))) 
-   "cl")
-
- ;;; System definitions
-
 (defsystem clsql-base
-  :pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
-  :perform (load-op :after (op clsql-base)
-                   (pushnew :clsql-base cl:*features*))
-  :components ((:file "cmucl-compat")
+    :perform (load-op :after (op clsql-base)
+                     (pushnew :clsql-base cl:*features*))
+    :components
+    ((:module :base
+             :components
+             ((:file "cmucl-compat")
               (:file "package")
               (:file "utils" :depends-on ("package"))
               (:file "classes" :depends-on ("package"))
               (:file "conditions" :depends-on ("classes"))
               (:file "db-interface" :depends-on ("conditions"))
-              (:file "initialize" :depends-on ("db-interface")))
-  )
+              (:file "initialize" :depends-on ("db-interface"))))))
+
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql-base)))) 
+   "cl")
+