r9569: `head -6 ChangeLog`

diff --git a/ChangeLog b/ChangeLog
index 8b963d0c0f0bf72fc1d56d61d26fd5c0538bc94b..04cf2d0c3be01f7bf43f580e59174b0f3b9da6c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+10 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 2.11.7 released
+       * uffi/clsql-uffi-loader.lisp: Apply patch from Edi Weitz
+       for loading with clc-register-user-package. Remove personal
+       directory from path lisp.
+       * db-mysql/mysql-loader.lisp: Similar changes
+       
 8 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 2.11.6 released
        * sql/oodml.lisp: Commit patch from Edi Weitz

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 93437e6a41ec899993f54baac95350aa5fa40967..f61223a503e7a94c0e8879f8895eac553f53cb4d 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -2,14 +2,14 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          mysql-loader.sql
-;;;; Purpose:       MySQL library loader using UFFI
-;;;; Programmers:   Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
+;;;; Name:     mysql-loader.sql
+;;;; Purpose:  MySQL library loader using UFFI
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Feb 2002
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 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
@@ -21,10 +21,9 @@
 (defparameter *clsql-mysql-library-path* 
   (uffi:find-foreign-library
    "mysql"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
+   `(,clsql-mysql-system::*library-file-dir*
      "/usr/lib/clsql/"
-     "/sw/lib/clsql/"
-     "/home/kevin/debian/src/clsql/db-mysql/")
+     "/sw/lib/clsql/")
    :drive-letters '("C")))
 
 (defparameter *libz-library-path* 
@@ -32,13 +31,12 @@
    '("libz" "zlibwapi" "zlib")
    `(,(make-pathname :directory (pathname-directory *load-truename*))
      #+64bit "/usr/lib64/"
-      "/usr/lib/"
-      "/sw/lib/"
-      "/usr/local/lib/"
-       "/home/kevin/debian/src/clsql/db-mysql/"
+     "/usr/lib/"
+     "/sw/lib/"
+     "/usr/local/lib/"
      "/bin/"
-       "/mysql/lib/dll32/"
-       "/mysql/lib/opt/")
+     "/mysql/lib/dll32/"
+     "/mysql/lib/opt/")
    :drive-letters '("C")))
   
 (defvar *mysql-library-candidate-names*

diff --git a/db-oracle/README b/db-oracle/README
index 3bef886f8a8cacc7927e0b0475087d811ee9ff83..76b80956db2c4b0e1c2dd170f3da3d087a62f875 100644 (file)
--- a/db-oracle/README
+++ b/db-oracle/README
@@ -1,13 +1,10 @@
 This is the header of the cadabra source file.
 
-;;;; a CMUCL/OCI implementation of a subset of the DBI interface
-;;;;
 ;;;; The original version of this code was copyright (c) 1999-2000 Cadabra Inc.
 ;;;; It was placed in the public domain by Cadabra in January 2000.
 ;;;; 
 ;;;; The implementors of the original version were Winton Davies
 ;;;; <wdavies@cadabra.com> and William Newman <william.newman@airmail.net>.
-;;;; The code will be maintained by Winton Davies.
 
 ;;;; known issues:
 ;;;;   * The code will leak C resources if errors occur in the the wrong

diff --git a/doc/ref-clsql-sys.xml b/doc/ref-clsql-sys.xml
index 56d16159545818583c908125ec8513622edde84b..dab21338faae01238014b7f68e9fa9b966919773 100644 (file)
--- a/doc/ref-clsql-sys.xml
+++ b/doc/ref-clsql-sys.xml
@@ -18,7 +18,7 @@
       <refnamediv>
        <refname>DATABASE-INITIALIZE-DATABASE-TYPE</refname>
        <refpurpose>Back-end part of <link
-       linkend="initialize-database-type"><function>initialize-database-type</function></link>.</refpurpose>
+       linkend="initializye-database-type"><function>initialize-database-type</function></link>.</refpurpose>
        <refclass>Generic Function</refclass>
       </refnamediv>
       <refsect1>

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index a8f7173a84ea4657004f40a9f4fec9f75426e7b8..10ac4451dde91a28d11cd9ba8d16c4c15595708d 100644 (file)
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -2,14 +2,14 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          clsql-uffi-loader.sql
-;;;; Purpose:       library loader using CLSQL UFFI helper library
-;;;; Programmers:   Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
+;;;; Name:     clsql-uffi-loader.sql
+;;;; Purpose:  Library loader using CLSQL UFFI helper library
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Mar 2002
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 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
@@ -21,10 +21,8 @@
 (defvar *clsql-uffi-library-filename* 
   (uffi:find-foreign-library
    "uffi"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/usr/lib/clsql/"
-     "/opt/lisp/clsql/uffi/"
-     "/home/kevin/debian/src/clsql/uffi/")
+   `(,clsql-uffi-system::*library-file-dir*
+     "/usr/lib/clsql/")
    :drive-letters '("C")))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")