X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.system;h=055927d1fb9fc97add0315d8fa4d3e39223af0dd;hb=1be7d8c85a999bfa474c90bef8d978085c12460e;hp=82e6d53eac446625ecf936f8555a36c38c01c940;hpb=f8478421f5a0440246f70aa4234ff25f416be7e3;p=clsql.git

diff --git a/clsql.system b/clsql.system
index 82e6d53..055927d 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.6 2002/04/27 20:58:11 kevin Exp $
+;;;; $Id: clsql.system,v 1.19 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,35 +17,27 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(in-package :make)
 
-(load (make-pathname :name "set-logical" :type "cl"
-		     :defaults *load-truename*))
-(set-logical-host-for-pathname "CLSQL" *load-truename*)
+#-clsql-base
+(let ((path (make-pathname :name "clsql-base" :type "system"
+				      :defaults *load-truename*)))
+  (when (probe-file path)
+    (load path)))
 
 ;;; System definitions
 
-(mk:defsystem :cmucl-compat
-    :source-pathname "CLSQL:cmucl-compat;"
-    :source-extension "cl"
-    :binary-pathname "CLSQL:cmucl-compat;bin;"
-    :components ((:file "cmucl-compat")
-		 (:file "loop-extension")))
-
-(mk:defsystem :clsql
-    :source-pathname "CLSQL:sql;"
-    :source-extension "cl"
-    :binary-pathname "CLSQL:sql;bin;"
-    :components ((:file "package")
-		 (:file "classes")
-		 (:file "conditions" :depends-on ("classes"))
-		 (:file "db-interface" :depends-on ("conditions"))
-		 (:file "pool" :depends-on ("db-interface"))
-		 (:file "sql" :depends-on ("pool"))
-		 (:file "utils" :depends-on ("package"))
-		 (:file "functional" :depends-on ("sql"))
-		 (:file "usql" :depends-on ("sql")))
-    :depends-on (:cmucl-compat)
-    :finally-do
-    (pushnew :clsql cl:*features*)
-    )
+(defsystem :clsql
+  :source-pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
+  :source-extension "cl"
+  :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)
+  :finally-do
+  (pushnew :clsql cl:*features*)
+  )