From 02e4933f6db6ce5b91a90b6b236acb9eb960de70 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 9 Jun 2004 23:52:52 +0000 Subject: [PATCH] r9569: `head -6 ChangeLog` --- ChangeLog | 7 +++++++ db-mysql/mysql-loader.lisp | 26 ++++++++++++-------------- db-oracle/README | 3 --- doc/ref-clsql-sys.xml | 2 +- uffi/clsql-uffi-loader.lisp | 16 +++++++--------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b963d0..04cf2d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +10 Jun 2004 Kevin Rosenberg + * 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 * 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 93437e6..f61223a 100644 --- 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 3bef886..76b8095 100644 --- 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 ;;;; and William Newman . -;;;; 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 56d1615..dab2133 100644 --- a/doc/ref-clsql-sys.xml +++ b/doc/ref-clsql-sys.xml @@ -18,7 +18,7 @@ DATABASE-INITIALIZE-DATABASE-TYPE Back-end part of initialize-database-type. + linkend="initializye-database-type">initialize-database-type. Generic Function diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp index a8f7173..10ac445 100644 --- 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") -- 2.34.1