r9551: windows updates

diff --git a/ChangeLog b/ChangeLog
index b788b276634a2ea74376de98f8cf96634490de08..54955e42078708f66523dfdc816462baf987292f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 03 Jun 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
+       * Version 2.11.5 released
        * examples/clsql-tutorial.lisp: Remove obsolete :nulls-ok attribute,
        Select connection-spec based on connection type. Bugs reported by
        Bill Clementson.
-               
+       * uffi/uffi.dll, uffi/uffi.lib: Recompile with Visual Studio 2003
+       * db-mysql/mysql-loader.lisp: Update check for zlibwapi library
+       name on Windows, add \bin\ directory to search path
+       
 31 May 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
        * db-odbc/odbc-sql.lisp: DB-TYPE replaced with DATABASE-TYPE in 
        DATABASE-CONNECT. 

diff --git a/db-mysql/Makefile.msvc b/db-mysql/Makefile.msvc
index e7991f1d3dd84ceb052f2746e0f0481ab44db39a..096bb554f489874745fe1278a37f034ff302b165 100644 (file)
--- a/db-mysql/Makefile.msvc
+++ b/db-mysql/Makefile.msvc
@@ -2,14 +2,14 @@
 ###########################################################################
 # FILE IDENTIFICATION
 # 
-#  Name:         Makefile.msvc
-#  Purpose:      Makefile for the CLSQL UFFI helper package (MSVC)
-#  Programer:    Kevin M. Rosenberg
-#  Date Started: Mar 2002
+#  Name:    Makefile.msvc
+#  Purpose: Makefile for the CLSQL UFFI helper package (MSVC)
+#  Author:  Kevin M. Rosenberg
+#  Created: Mar 2002
 #
 #  CVS Id:   $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $
 #
-# 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
@@ -17,7 +17,7 @@
 ###########################################################################
 
 
-BASE=clsql-mysql
+BASE=mysql
 
 # Set to the directory where you have installed mysql's library
 MYSQL_DIR=c:/mysql

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index d93b783b88049bd7d26bbf278bea586f2f4166a6..93437e6a41ec899993f54baac95350aa5fa40967 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -29,13 +29,14 @@
 
 (defparameter *libz-library-path* 
   (uffi:find-foreign-library
-   '("libz" "zlib")
+   '("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/"
+     "/bin/"
        "/mysql/lib/dll32/"
        "/mysql/lib/opt/")
    :drive-letters '("C")))

diff --git a/db-mysql/mysql.dll b/db-mysql/mysql.dll
index 97259327d48506acdc5f6941b936b957a8079d33..095c0910020f4960799c6a01cc5181b1ba09be9f 100644 (file)
Binary files a/db-mysql/mysql.dll and b/db-mysql/mysql.dll differ

diff --git a/db-mysql/mysql.lib b/db-mysql/mysql.lib
index 49f942bf49d9c2b8c9423559c9634d6806427bcf..0a2a75b74851219e51820933bc0e170e45b72f8e 100644 (file)
Binary files a/db-mysql/mysql.lib and b/db-mysql/mysql.lib differ

diff --git a/uffi/Makefile.msvc b/uffi/Makefile.msvc
index 562c3dd205956d0209d4efbe42cb3832ab0c4878..2edbfcad22131d7689bf5a7d8e2a99d498e5ed00 100644 (file)
--- a/uffi/Makefile.msvc
+++ b/uffi/Makefile.msvc
@@ -2,14 +2,14 @@
 ###########################################################################
 # FILE IDENTIFICATION
 # 
-#  Name:         Makefile.msvc
-#  Purpose:      Makefile for the CLSQL UFFI helper package (MSVC)
-#  Programer:    Kevin M. Rosenberg
-#  Date Started: Mar 2002
+#  Name:    Makefile.msvc
+#  Purpose: Makefile for the CLSQL UFFI helper package (MSVC)
+#  Author:  Kevin M. Rosenberg
+#  Created: Mar 2002
 #
 #  CVS Id:   $Id: Makefile.msvc,v 1.1 2002/09/18 07:50:01 kevin Exp $
 #
-# 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
@@ -17,7 +17,7 @@
 ###########################################################################
 
 
-BASE=clsql-uffi
+BASE=uffi
 
 # Nothing to configure beyond here
 
@@ -30,6 +30,6 @@ $(DLL): $(SRC)
         del $(OBJ) $(BASE).exp
 
 clean:
-        del /q $(DLL)
+        del /q $(DLL) $(BASE).LIB
 
 

diff --git a/uffi/uffi.dll b/uffi/uffi.dll
index b9d7cfacb6258d6fd455ae67f5fdd020c9b4c217..1c412707ae4499d74be1b530210cb70ff7f16a5e 100644 (file)
Binary files a/uffi/uffi.dll and b/uffi/uffi.dll differ

diff --git a/uffi/uffi.lib b/uffi/uffi.lib
index 8dde929619312b05522ecd90d30f6577542aa08e..a9ee8fe0139e84b1bd2bbdcb8fd22c0331fa3672 100644 (file)
Binary files a/uffi/uffi.lib and b/uffi/uffi.lib differ