r2388: *** empty log message ***

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 7d00f5cdc922a85f5754e470a94c412aa762275d..7e0952d643108d9e888666ed164140f71b9e06a2 100644 (file)
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-aodbc.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-aodbc.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,10 +20,10 @@
 (in-package :asdf)
 
 (defsystem clsql-aodbc
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-aodbc;"
-    :components ((:file "aodbc-package")
-                (:file "aodbc-sql" :depends-on ("aodbc-package")))
-    :depends-on (:clsql-base))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
+  :components ((:file "aodbc-package")
+              (:file "aodbc-sql" :depends-on ("aodbc-package")))
+  :depends-on (:clsql-base))
 
     

diff --git a/clsql-aodbc.system b/clsql-aodbc.system
index 82eb76539c4d5348cf1c5aa0904e3336901cee7c..00d8f981ad8e1c28e3df71356a06006077db5b18 100644 (file)
--- a/clsql-aodbc.system
+++ b/clsql-aodbc.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-aodbc.system,v 1.9 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-aodbc.system,v 1.10 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,10 +20,10 @@
 (in-package :make)
 
 (defsystem :clsql-aodbc
-    :source-pathname "cl-library:clsql-aodbc;"
-    :source-extension "cl"
-    :components ((:file "aodbc-package")
-                (:file "aodbc-sql" :depends-on ("aodbc-package")))
-    :depends-on (:clsql-base))
+  :source-pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "aodbc-package")
+              (:file "aodbc-sql" :depends-on ("aodbc-package")))
+  :depends-on (:clsql-base))
+
 
-    

diff --git a/clsql-base.asd b/clsql-base.asd
index f17a1690a533636dde75b617861206b3823dd013..cae66ee4bd21b16035c59f508d305ceaf966411c 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.3 2002/08/18 04:39:59 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.4 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,11 +19,22 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :asdf)
 
-;; For use with non-Debian installations
-(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
+;; 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 helper-pathname)
-      (load helper-pathname)))
+  (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")
 
 (unless (ignore-errors (find-class 'clsql-cl-source-file))
   (defclass clsql-cl-source-file (cl-source-file) ())
@@ -34,9 +45,9 @@
 
 (defsystem clsql-base
   :default-component-class clsql-cl-source-file
-  :pathname "cl-library:clsql-base;"
+  :pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
   :perform (load-op :after (op clsql-base)
-                   (pushnew :clsql cl:*features*))
+                   (pushnew :clsql-base cl:*features*))
   :components ((:file "cmucl-compat")
               (:file "package")
               (:file "utils" :depends-on ("package"))

diff --git a/clsql-base.system b/clsql-base.system
index 3278dd6cdb0518deac6a2668a8973f646c03427d..2b7443762d7fd16ebff9fadfc1c66844ef7d3e1b 100644 (file)
--- a/clsql-base.system
+++ b/clsql-base.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.system,v 1.9 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.10 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,24 +19,35 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :make)
 
-;; For use with non-Debian installations
-(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
+;; 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 helper-pathname)
-      (load helper-pathname)))
+  (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")
 
 ;;; System definitions
 
 (defsystem :clsql-base
-    :source-pathname "cl-library:clsql-base;"
-    :source-extension "cl"
-     :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")))
-    :finally-do
-    (pushnew :clsql cl:*features*)
-    )
+  :source-pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
+  :source-extension "cl"
+  :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")))
+  :finally-do
+  (pushnew :clsql-base cl:*features*)
+  )

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 99a527c700f6aed4a0429aaccbd162891c1c6609..b8796dccde1e4b59c36716147e456a430fc365d2 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
-;;;; $Id: clsql-mysql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $\r
+;;;; $Id: clsql-mysql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -23,14 +23,14 @@
 ;;; System definition\r
 \r
 (defsystem clsql-mysql\r
-    :default-component-class clsql-cl-source-file\r
-    :pathname "cl-library:clsql-mysql;"\r
-    :components ((:file "mysql-package")\r
-                (:file "mysql-loader" :depends-on ("mysql-package"))\r
-                (:file "mysql-api" :depends-on ("mysql-loader"))\r
-                (:file "mysql-sql" :depends-on ("mysql-api"))\r
+  :default-component-class clsql-cl-source-file\r
+  :pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)\r
+  :components ((:file "mysql-package")\r
+              (:file "mysql-loader" :depends-on ("mysql-package"))\r
+              (:file "mysql-api" :depends-on ("mysql-loader"))\r
+              (:file "mysql-sql" :depends-on ("mysql-api"))\r
                 (:file "mysql-usql" :depends-on ("mysql-sql")))\r
-    :depends-on (:uffi :clsql-base :clsql-uffi))\r
+  :depends-on (:uffi :clsql-base :clsql-uffi))\r
 \r
 \r
 \r

diff --git a/clsql-mysql.system b/clsql-mysql.system
index c52525b9bc5aca297b76e13d60d42302fdc542f4..fd2910eb33f83aaae55fdecf1f77130342d5a740 100644 (file)
--- a/clsql-mysql.system
+++ b/clsql-mysql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: clsql-mysql.system,v 1.16 2002/08/01 03:06:26 kevin Exp $\r
+;;;; $Id: clsql-mysql.system,v 1.17 2002/08/23 19:39:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -23,14 +23,14 @@
 ;;; System definition\r
 \r
 (defsystem :clsql-mysql\r
-    :source-pathname "cl-library:clsql-mysql;"\r
-    :source-extension "cl"\r
-    :components ((:file "mysql-package")\r
-                (:file "mysql-loader" :depends-on ("mysql-package"))\r
-                (:file "mysql-api" :depends-on ("mysql-loader"))\r
-                (:file "mysql-sql" :depends-on ("mysql-api"))\r
-                (:file "mysql-usql" :depends-on ("mysql-sql")))\r
-    :depends-on (:uffi :clsql-base :clsql-uffi))\r
+  :source-pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)\r
+  :source-extension "cl"\r
+  :components ((:file "mysql-package")\r
+              (:file "mysql-loader" :depends-on ("mysql-package"))\r
+              (:file "mysql-api" :depends-on ("mysql-loader"))\r
+              (:file "mysql-sql" :depends-on ("mysql-api"))\r
+              (:file "mysql-usql" :depends-on ("mysql-sql")))\r
+  :depends-on (:uffi :clsql-base :clsql-uffi))\r
 \r
 \r
 \r

diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 63f48c8e8aae2d3cf3b6c065a60db81468cbceec..2154b25f30c60420dc1e9a3ae08459fca42b5f4b 100644 (file)
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -1,24 +1,25 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-oracle.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 
 (in-package :asdf)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-oracle"
-    :components
-    ((:file "oracle-package")
-     (:file "oracle-loader" :depends-on ("oracle-package"))
-     (:file "alien-resources" :depends-on ("oracle-package"))
-     (:file "oracle-constants" :depends-on ("oracle-package"))
-     (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
-     (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
-     (:file "oracle-objects" :depends-on ("oracle-sql")))
-    :depends-on (:clsql-base))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
+  :pathname "cl-library:clsql-oracle"
+  :components
+  ((:file "oracle-package")
+   (:file "oracle-loader" :depends-on ("oracle-package"))
+   (:file "alien-resources" :depends-on ("oracle-package"))
+   (:file "oracle-constants" :depends-on ("oracle-package"))
+   (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
+   (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
+   (:file "oracle-objects" :depends-on ("oracle-sql")))
+  :depends-on (:clsql-base))
 
 
 

diff --git a/clsql-oracle.system b/clsql-oracle.system
index 38529652f33a5e8729511483d9ee623433b264d4..78a9ce4016b1a618167f5f684efe8db0e05a42fa 100644 (file)
--- a/clsql-oracle.system
+++ b/clsql-oracle.system
@@ -1,24 +1,24 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.system,v 1.3 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-oracle.system,v 1.4 2002/08/23 19:39:56 kevin Exp $
 
 (in-package :make)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-    :source-pathname "cl-library:clsql-oracle"
-    :source-extension "cl"
-    :components
-    ((:file "oracle-package")
-     (:file "oracle-loader" :depends-on ("oracle-package"))
-     (:file "alien-resources" :depends-on ("oracle-package"))
-     (:file "oracle-constants" :depends-on ("oracle-package"))
+  :source-pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components
+  ((:file "oracle-package")
+   (:file "oracle-loader" :depends-on ("oracle-package"))
+   (:file "alien-resources" :depends-on ("oracle-package"))
+   (:file "oracle-constants" :depends-on ("oracle-package"))
      (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
      (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
      (:file "oracle-objects" :depends-on ("oracle-sql")))
-    :depends-on (:clsql-base))
+  :depends-on (:clsql-base))
 
 
 

diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index 060dd309cdb3c3b3505b33ccf5816ea66f6f1ac0..5e07926ffeac45997a0f945806d0a2101774e219 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
-;;;; $Id: clsql-postgresql-socket.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $\r
+;;;; $Id: clsql-postgresql-socket.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -22,11 +22,11 @@
 ;;; System definition\r
 \r
 (defsystem clsql-postgresql-socket\r
-    :default-component-class clsql-cl-source-file\r
-    :pathname "cl-library:clsql-postgresql-socket;"\r
-    :components ((:file "postgresql-socket-package")\r
-                (:file "postgresql-socket-api"\r
-                       :depends-on ("postgresql-socket-package"))\r
-                (:file "postgresql-socket-sql"\r
-                       :depends-on ("postgresql-socket-api")))\r
-    :depends-on (:clsql-base :uffi))\r
+  :default-component-class clsql-cl-source-file\r
+  :pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)\r
+  :components ((:file "postgresql-socket-package")\r
+              (:file "postgresql-socket-api"\r
+                     :depends-on ("postgresql-socket-package"))\r
+              (:file "postgresql-socket-sql"\r
+                     :depends-on ("postgresql-socket-api")))\r
+  :depends-on (:clsql-base :uffi))\r

diff --git a/clsql-postgresql-socket.system b/clsql-postgresql-socket.system
index cd9e0385dc5675cb0eab0747b472532614d93efa..8c145f6685e6679dc40750bf08e2bd0c73bf4359 100644 (file)
--- a/clsql-postgresql-socket.system
+++ b/clsql-postgresql-socket.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: clsql-postgresql-socket.system,v 1.10 2002/08/01 03:06:26 kevin Exp $\r
+;;;; $Id: clsql-postgresql-socket.system,v 1.11 2002/08/23 19:39:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -22,11 +22,11 @@
 ;;; System definition\r
 \r
 (defsystem :clsql-postgresql-socket\r
-    :source-pathname "cl-library:clsql-postgresql-socket;"\r
-    :source-extension "cl"\r
-    :components ((:file "postgresql-socket-package")\r
-                (:file "postgresql-socket-api"\r
-                       :depends-on ("postgresql-socket-package"))\r
-                (:file "postgresql-socket-sql"\r
-                       :depends-on ("postgresql-socket-api")))\r
-    :depends-on (:clsql-base :uffi))\r
+  :source-pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)\r
+  :source-extension "cl"\r
+  :components ((:file "postgresql-socket-package")\r
+              (:file "postgresql-socket-api"\r
+                     :depends-on ("postgresql-socket-package"))\r
+              (:file "postgresql-socket-sql"\r
+                     :depends-on ("postgresql-socket-api")))\r
+  :depends-on (:clsql-base :uffi))\r

diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index ae45873a09f4aaee494e13c523cb40d9c5d19787..2245d9cb9c2371be5044babf4a1e25218d5cdb50 100644 (file)
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
-;;;; $Id: clsql-postgresql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $\r
+;;;; $Id: clsql-postgresql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -20,12 +20,12 @@
 (in-package :asdf)\r
 \r
 (defsystem clsql-postgresql\r
-    :default-component-class clsql-cl-source-file\r
-    :pathname "cl-library:clsql-postgresql;"\r
-    :components ((:file "postgresql-package")\r
-                (:file "postgresql-loader" :depends-on ("postgresql-package"))\r
-                (:file "postgresql-api" :depends-on ("postgresql-loader"))\r
-                (:file "postgresql-sql" :depends-on ("postgresql-api"))\r
-                (:file "postgresql-usql" :depends-on ("postgresql-sql")))\r
-    :depends-on (:uffi :clsql-base :clsql-uffi))\r
+  :default-component-class clsql-cl-source-file\r
+  :pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)\r
+  :components ((:file "postgresql-package")\r
+              (:file "postgresql-loader" :depends-on ("postgresql-package"))\r
+              (:file "postgresql-api" :depends-on ("postgresql-loader"))\r
+              (:file "postgresql-sql" :depends-on ("postgresql-api"))\r
+              (:file "postgresql-usql" :depends-on ("postgresql-sql")))\r
+  :depends-on (:uffi :clsql-base :clsql-uffi))\r
 \r

diff --git a/clsql-postgresql.system b/clsql-postgresql.system
index 940f8f05c0a17d355d92b7c755e6074110750b9a..cbf562923998664d88259495cf55fcedec839b07 100644 (file)
--- a/clsql-postgresql.system
+++ b/clsql-postgresql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: clsql-postgresql.system,v 1.10 2002/08/01 03:06:26 kevin Exp $\r
+;;;; $Id: clsql-postgresql.system,v 1.11 2002/08/23 19:39:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -20,12 +20,12 @@
 (in-package :make)\r
 \r
 (defsystem :clsql-postgresql\r
-    :source-pathname "cl-library:clsql-postgresql;"\r
-    :source-extension "cl"\r
-    :components ((:file "postgresql-package")\r
-                (:file "postgresql-loader" :depends-on ("postgresql-package"))\r
-                (:file "postgresql-api" :depends-on ("postgresql-loader"))\r
-                (:file "postgresql-sql" :depends-on ("postgresql-api"))\r
-                (:file "postgresql-usql" :depends-on ("postgresql-sql")))\r
-    :depends-on (:uffi :clsql-base :clsql-uffi))\r
+  :source-pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)\r
+  :source-extension "cl"\r
+  :components ((:file "postgresql-package")\r
+              (:file "postgresql-loader" :depends-on ("postgresql-package"))\r
+              (:file "postgresql-api" :depends-on ("postgresql-loader"))\r
+              (:file "postgresql-sql" :depends-on ("postgresql-api"))\r
+              (:file "postgresql-usql" :depends-on ("postgresql-sql")))\r
+  :depends-on (:uffi :clsql-base :clsql-uffi))\r
 \r

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 2c010e844f919f9451115c61a7cf495e56591a7e..a836524aaff7d787b4302e74426236f385582cea 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-uffi.asd,v 1.2 2002/08/18 04:39:59 kevin Exp $
+;;;; $Id: clsql-uffi.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,10 +23,10 @@
 ;;; System definition
 
 (defsystem clsql-uffi
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-uffi;"
-    :components ((:file "clsql-uffi-package")
-                (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-                (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
-    :depends-on (:uffi))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
+  :components ((:file "clsql-uffi-package")
+              (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+              (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
+  :depends-on (:uffi))
 

diff --git a/clsql-uffi.system b/clsql-uffi.system
index 84015d74dfdfed58e60b77637d7e3bd6fff35d61..874d044cc2d48dc7f1675ebaa67a00bf0b63fbb6 100644 (file)
--- a/clsql-uffi.system
+++ b/clsql-uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-uffi.system,v 1.6 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-uffi.system,v 1.7 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,10 +23,10 @@
 ;;; System definition
 
 (defsystem :clsql-uffi
-    :source-pathname "cl-library:clsql-uffi;"
-    :source-extension "cl"
-    :components ((:file "clsql-uffi-package")
-                (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-                (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
-    :depends-on (:uffi))
+  :source-pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "clsql-uffi-package")
+              (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+              (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
+  :depends-on (:uffi))
 

diff --git a/clsql.asd b/clsql.asd
index d0a643fb8e03c1e3f2ee4cec52f49d5284fabc2c..c60ec628b0d2967c9d459134c76d5bac64c44994 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.2 2002/08/18 04:04:34 kevin Exp $
+;;;; $Id: clsql.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,16 +17,15 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-;; For use with non-Debian installations
-(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
-                                     :defaults *load-truename*)))
-  (when (probe-file helper-pathname)
-      (load helper-pathname)))
 
 (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
 
 (unless (ignore-errors (find-class 'clsql-cl-source-file))
@@ -35,16 +34,16 @@
     "cl"))
 
 (defsystem clsql
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql;"
-    :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"))
+  :default-component-class clsql-cl-source-file
+  :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")))
-    :depends-on (:clsql-base)
-    )
+  :depends-on (:clsql-base)
+  )

diff --git a/clsql.system b/clsql.system
index 2101f3cde6cc842a372c552f31e7844187d92d3f..055927d1fb9fc97add0315d8fa4d3e39223af0dd 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.18 2002/08/01 03:06:26 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
 ;;;;
@@ -19,25 +19,25 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :make)
 
-;; For use with non-Debian installations
-(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
+#-clsql-base
+(let ((path (make-pathname :name "clsql-base" :type "system"
                                      :defaults *load-truename*)))
-  (when (probe-file helper-pathname)
-      (load helper-pathname)))
+  (when (probe-file path)
+    (load path)))
 
 ;;; System definitions
 
 (defsystem :clsql
-    :source-pathname "cl-library: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*)
-    )
+  :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*)
+  )

diff --git a/set-cl-library.cl b/set-cl-library.cl
deleted file mode 100644 (file)
index 228080c..0000000
--- a/set-cl-library.cl
+++ /dev/null
@@ -1,43 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          set-cl-library.cl
-;;;; Purpose:       Sets CL-LIBRARY logical host name if it does not exist
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  May 2002
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-;; Set logical pathname CL-LIBRARY to be directory above *load-truename*
-;; This mirrors the expectation of Common Lisp Controller's pathnames
-
-(handler-case
-    (logical-pathname-translations "cl-library")
-  (error ()
-        (let* ((dir (pathname-directory *load-truename*))
-               (parent-dir (subseq dir 0 (1- (length dir)))))
-          (load (make-pathname :name "set-logical" :type "cl"
-                               :defaults *load-truename*))
-          (set-logical-host-for-pathname 
-           "cl-library" 
-           (make-pathname :host (pathname-host *load-truename*)
-                          :device (pathname-device *load-truename*)
-                          :directory parent-dir))))
-  (:no-error (translation)
-            ;; Make sure that cl-library points to this installation
-            (let* ((dir (pathname-directory *load-truename*))
-                   (base-dir (car (last dir)))
-                   (logical-dir (translate-logical-pathname 
-                                 (concatenate 'string
-                                              "cl-library:" base-dir ";"))))
-              (unless (equalp dir (pathname-directory logical-dir))
-                (let ((*print-circle* nil))
-                  (error "cl-library:~A; directory ~S does not equal *load-truename*'s directory ~S"
-                         base-dir (cdr dir)
-                         (cdr (pathname-directory logical-dir))))))))