X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.system;h=ef655b8411afdd386f4c9b80b679bf7d000b956e;hp=867d69b9af5e15736c3d296ce45f05e392002f58;hb=cbec78ec2d390fcf641108c1ca8d1589a0f22ed8;hpb=0384597fcf4fdc8b05c48596798606ea5dc58146

diff --git a/clsql.system b/clsql.system
index 867d69b..ef655b8 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.4 2002/03/29 08:12:15 kevin Exp $
+;;;; $Id: clsql.system,v 1.20 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,33 +17,29 @@
 ;;;; *************************************************************************
 
 (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 "sql" :depends-on ("db-interface"))
-		 (:file "utils" :depends-on ("package"))
-		 (:file "functional" :depends-on ("sql")))
-    :depends-on (:cmucl-compat)
-    :finally-do
-    (pushnew :clsql cl:*features*)
-    )
+(defsystem :clsql
+  :source-pathname #.(format nil "~A:clsql;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
+  :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*)
+  )