r2251: Auto commit for Debian build

diff --git a/ChangeLog b/ChangeLog
index 061ced8ce0aa94320502bf044bc9b23ec42e6a9e..b98922e48092229ec6fe0ef108eedb498f744aae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
 25 Jul 2002 Kevin Rosenberg (kevin@rosenberg.net)
        * Also change case of logical host in loader files
-       * Remove ;bin; component for .system files if using
-       Common Lisp Controller.
+       * Rework handling of logical pathnames
        
 05 Jul 2002 Kevin Rosenberg (kevin@rosenberg.net)
        * Change case of logical host

diff --git a/clsql-aodbc.system b/clsql-aodbc.system
index afce921c86fc78b68f7a2538895e46ec61db5b24..4f6068560ed6d378de8466f7182f753d9b486ac5 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.7 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql-aodbc.system,v 1.8 2002/07/26 05:19:00 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,7 +22,6 @@
 (defsystem :clsql-aodbc
     :source-pathname "cl-library:clsql;interfaces;aodbc;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;interfaces;aodbc;bin;"
     :components ((:file "aodbc-package")
                 (:file "aodbc-sql" :depends-on ("aodbc-package")))
     :depends-on (:clsql-base))

diff --git a/clsql-base.system b/clsql-base.system
index 07675b7cfb8eb73dbc0d7e087089563299b3852f..f282312bbb7aa964b646da24c22e8063d6a3ca90 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.7 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.8 2002/07/26 05:19:00 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,21 +17,20 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(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)))
+      (load helper-pathname)))
 
 ;;; System definitions
 
-(mk:defsystem :clsql-base
+(defsystem :clsql-base
     :source-pathname "cl-library:clsql;base;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;base;bin;"
-    :components ((:file "cmucl-compat")
+     :components ((:file "cmucl-compat")
                 (:file "package")
                 (:file "utils" :depends-on ("package"))
                 (:file "classes" :depends-on ("package"))

diff --git a/clsql-mysql.system b/clsql-mysql.system
index a3e7d8a7e460fb2a2af151ba69999d59ef63eef1..66f441ac8a08e86ad12d6341e0ed73ae343dee95 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.14 2002/07/05 17:05:45 kevin Exp $\r
+;;;; $Id: clsql-mysql.system,v 1.15 2002/07/26 05:19:00 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -18,14 +18,13 @@
 \r
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 \r
-(in-package :cl-user)\r
+(in-package :make)\r
 \r
 ;;; System definition\r
 \r
-(mk:defsystem :clsql-mysql\r
+(defsystem :clsql-mysql\r
     :source-pathname "cl-library:clsql;interfaces;mysql;"\r
     :source-extension "cl"\r
-    :binary-pathname "cl-library:clsql;interfaces;mysql;bin;"\r
     :components ((:file "mysql-package")\r
                 (:file "mysql-loader" :depends-on ("mysql-package"))\r
                 (:file "mysql-api" :depends-on ("mysql-loader"))\r

diff --git a/clsql-oracle.system b/clsql-oracle.system
index a7c251470bd4983e3ce74273e924b568a774c47d..96a593906d6721e92da3e03f6f9782e52021c039 100644 (file)
--- a/clsql-oracle.system
+++ b/clsql-oracle.system
@@ -1,13 +1,13 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.system,v 1.1 2002/05/15 17:28:43 kevin Exp $
+;;;; $Id: clsql-oracle.system,v 1.2 2002/07/26 05:19:00 kevin Exp $
 
-(in-package :cl-user)
+(in-package :make)
 
 ;;; System definition
 
-(mk:defsystem :clsql-oracle
+(defsystem :clsql-oracle
     :source-pathname "cl-library:clsql;interfaces;oracle"
     :source-extension "cl"
     :components

diff --git a/clsql-postgresql-socket.system b/clsql-postgresql-socket.system
index c95b31cff1fa454ea124a04bc40b965ccd601806..ef44b01c2019adc1068ce4d2ed376e87ce884bbe 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.8 2002/07/05 17:05:45 kevin Exp $\r
+;;;; $Id: clsql-postgresql-socket.system,v 1.9 2002/07/26 05:19:00 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -24,7 +24,6 @@
 (defsystem :clsql-postgresql-socket\r
     :source-pathname "cl-library:clsql;interfaces;postgresql-socket;"\r
     :source-extension "cl"\r
-    :binary-pathname "cl-library:clsql;interfaces;postgresql-socket;bin;"\r
     :components ((:file "postgresql-socket-package")\r
                 (:file "postgresql-socket-api"\r
                        :depends-on ("postgresql-socket-package"))\r

diff --git a/clsql-postgresql.system b/clsql-postgresql.system
index 59465e7b49a15eb658cb3ae63c21aa79ec518376..255163362220d5d0bd2affeae7ab77c3ce487079 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.8 2002/07/05 17:05:45 kevin Exp $\r
+;;;; $Id: clsql-postgresql.system,v 1.9 2002/07/26 05:19:00 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -22,8 +22,6 @@
 (defsystem :clsql-postgresql\r
     :source-pathname "cl-library:clsql;interfaces;postgresql;"\r
     :source-extension "cl"\r
-    :binary-pathname "cl-library:clsql;interfaces;postgresql;bin;"\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

diff --git a/clsql-uffi.system b/clsql-uffi.system
index 0f2c472e3d1b7aebd50d449a1475b9bac5f46f39..a315aa1784a47108955cec9af5967d185447060c 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.4 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql-uffi.system,v 1.5 2002/07/26 05:19:00 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,14 +18,13 @@
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 
-(in-package :cl-user)
+(in-package :make)
 
 ;;; System definition
 
-(mk:defsystem :clsql-uffi
+(defsystem :clsql-uffi
     :source-pathname "cl-library:clsql;interfaces;clsql-uffi;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;interfaces;clsql-uffi;bin;"
     :components ((:file "clsql-uffi-package")
                 (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
                 (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))

diff --git a/clsql.system b/clsql.system
index f4825151510e6614e069de9d8c3151afbc1c53a9..fcbffea331fcd84bd3cb90e32f839b0d76a02b9d 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.16 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql.system,v 1.17 2002/07/26 05:19:00 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,20 +17,19 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(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)))
+      (load helper-pathname)))
 
 ;;; System definitions
 
-(mk:defsystem :clsql
+(defsystem :clsql
     :source-pathname "cl-library:clsql;sql;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;sql;bin;"
     :components ((:file "package")
                 (:file "pool" :depends-on ("package"))
                 (:file "loop-extension")

diff --git a/set-logical.cl b/set-logical.cl
index cb4224d7b98c07196d94c400c8fc5e8e7d07e183..e14fa1cf04c38e3cbe437ee1c8557204702cf7be 100644 (file)
--- a/set-logical.cl
+++ b/set-logical.cl
@@ -46,18 +46,45 @@
                :host (pathname-host base-pathname)
                :device (pathname-device base-pathname)
                :directory (pathname-directory base-pathname)))
+      ("**;*.cl.*" ,(merge-pathnames
+                   (make-pathname
+                    :name :wild
+                    :type :wild
+                    :directory '(:relative :wild-inferiors))
+                   base-pathname))
+      ("**;*.lisp.*" ,(merge-pathnames
+                   (make-pathname
+                    :name :wild
+                    :type :wild
+                    :directory '(:relative :wild-inferiors))
+                   base-pathname))
+      ("**;*.c.*" ,(merge-pathnames
+                   (make-pathname
+                    :name :wild
+                    :type :wild
+                    :directory '(:relative :wild-inferiors))
+                   base-pathname))
+      ("**;*.h.*" ,(merge-pathnames
+                   (make-pathname
+                    :name :wild
+                    :type :wild
+                    :directory '(:relative :wild-inferiors))
+                   base-pathname))
       ("**;bin;*.*.*" ,(merge-pathnames
                        (make-pathname 
                         :name :wild
                         :type :wild
                         :directory 
                         (append '(:relative :wild-inferiors
-                                  ".bin" #.+set-logical-compiler-name+)))
+                                            ".bin" #.+set-logical-compiler-name+)))
                        base-pathname))
+      ;; default is to place in .bin/<compiler> directory
       ("**;*.*.*" ,(merge-pathnames
-                   (make-pathname
+                   (make-pathname 
                     :name :wild
                     :type :wild
-                    :directory '(:relative :wild-inferiors))
-                   base-pathname))))
-  )
+                    :directory 
+                    (append '(:relative :wild-inferiors
+                                        ".bin" #.+set-logical-compiler-name+)))
+                   base-pathname)))))
+