r2605: *** empty log message ***

[clsql.git] / clsql.system

diff --git a/clsql.system b/clsql.system
index f8143c175eb2f150ea55e60b7d28cf654a92b2e1..ef655b8411afdd386f4c9b80b679bf7d000b956e 100644 (file)
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.9 2002/05/13 00:45:10 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,34 +17,29 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(in-package :make)
 
-(handler-case
-    (logical-pathname-translations "CL-LIBRARY")
-  (error ()
-      (load (make-pathname :name "set-cl-library" :type "cl"
-                          :defaults *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 "CL-LIBRARY:clsql;cmucl-compat;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;cmucl-compat;bin;"
-    :components ((:file "cmucl-compat")
-                (:file "loop-extension")))
-
-(mk:defsystem :clsql
-    :source-pathname "CL-LIBRARY:clsql;sql;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;sql;bin;"
-    :components ((:file "pool")
-                (:file "sql" :depends-on ("pool"))
-                (:file "transactions" :depends-on ("sql"))
-                (:file "utils")
-                (:file "functional" :depends-on ("sql"))
-                (:file "usql" :depends-on ("sql")))
-    :depends-on (:clsql-base)
-    :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*)
+  )