From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Fri, 26 Jul 2002 05:19:00 +0000 (+0000)
Subject: r2251: Auto commit for Debian build
X-Git-Tag: v3.8.6~993
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=7d5dfa054eb972fbf4d86cc9c8cbc124d605fcf1

r2251: Auto commit for Debian build
---

diff --git a/ChangeLog b/ChangeLog
index 061ced8..b98922e 100644
--- 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 afce921..4f60685 100644
--- 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 07675b7..f282312 100644
--- 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 a3e7d8a..66f441a 100644
--- a/clsql-mysql.system
+++ b/clsql-mysql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-mysql.system,v 1.14 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql-mysql.system,v 1.15 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-mysql
+(defsystem :clsql-mysql
     :source-pathname "cl-library:clsql;interfaces;mysql;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;interfaces;mysql;bin;"
     :components ((:file "mysql-package")
 		 (:file "mysql-loader" :depends-on ("mysql-package"))
 		 (:file "mysql-api" :depends-on ("mysql-loader"))
diff --git a/clsql-oracle.system b/clsql-oracle.system
index a7c2514..96a5939 100644
--- 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 c95b31c..ef44b01 100644
--- a/clsql-postgresql-socket.system
+++ b/clsql-postgresql-socket.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.system,v 1.8 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.system,v 1.9 2002/07/26 05:19:00 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -24,7 +24,6 @@
 (defsystem :clsql-postgresql-socket
     :source-pathname "cl-library:clsql;interfaces;postgresql-socket;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;interfaces;postgresql-socket;bin;"
     :components ((:file "postgresql-socket-package")
 		 (:file "postgresql-socket-api"
 			:depends-on ("postgresql-socket-package"))
diff --git a/clsql-postgresql.system b/clsql-postgresql.system
index 59465e7..2551633 100644
--- a/clsql-postgresql.system
+++ b/clsql-postgresql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql.system,v 1.8 2002/07/05 17:05:45 kevin Exp $
+;;;; $Id: clsql-postgresql.system,v 1.9 2002/07/26 05:19:00 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,8 +22,6 @@
 (defsystem :clsql-postgresql
     :source-pathname "cl-library:clsql;interfaces;postgresql;"
     :source-extension "cl"
-    :binary-pathname "cl-library:clsql;interfaces;postgresql;bin;"
-    :source-extension "cl"
     :components ((:file "postgresql-package")
 		 (:file "postgresql-loader" :depends-on ("postgresql-package"))
 		 (:file "postgresql-api" :depends-on ("postgresql-loader"))
diff --git a/clsql-uffi.system b/clsql-uffi.system
index 0f2c472..a315aa1 100644
--- 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 f482515..fcbffea 100644
--- 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 cb4224d..e14fa1c 100644
--- 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)))))
+