Windows Drive Patch

Commit patch from Andreas Franke to honor windows drive letter
when loading clsql_mysql C library.

diff --git a/ChangeLog b/ChangeLog
index e1f8b63ac84a9c2effc3fa453948355ba5dd33bd..1e9678c7e1bf4920a7cedcebae16cf17c7f6a0d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 31 Aug 2009  Kevin Rosenberg <kevin@rosenberg.net>
        * sql/db-interface.lisp: Fix spelling error (thanks to 
        David Thompson)
+       * clsql-mysql.asd/db-mysql/mysql-loader.lisp: Commit
+       patch from Andreas Franke to honor windows drive letter
+       when loading clsql_mysql C library.
        
 31 Aug 2009  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 4.1.0

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 2247697282d36de124efd5710d2a0141850973a4..e8d89a871a6c9ddabd85fd490cd45976b05c7983 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -23,8 +23,10 @@
   (unless (find-package 'uffi)
     (asdf:operate 'asdf:load-op 'uffi)))
 
-(defvar *library-file-dir* (append (pathname-directory *load-truename*)
-                                  (list "db-mysql")))
+(defvar *library-file-dir* 
+  (merge-pathnames "db-mysql/" 
+                   (make-pathname :name nil :type nil 
+                                  :defaults *load-truename*)))
 
 (defclass clsql-mysql-source-file (c-source-file)
   ())
@@ -42,7 +44,7 @@
              found
              (make-pathname :name (component-name c)
                             :type library-file-type
-                            :directory *library-file-dir*)))))
+                            :defaults *library-file-dir*)))))
 
 (defmethod perform ((o load-op) (c clsql-mysql-source-file))
   t)
@@ -58,9 +60,7 @@
     (unless (zerop (run-shell-command
                    #-freebsd "cd ~A; make"
                    #+freebsd "cd ~A; gmake"
-                   (namestring (make-pathname :name nil
-                                              :type nil
-                                              :directory *library-file-dir*))))
+                   (namestring *library-file-dir*)))
       (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 43189cfed66138189cd4356feb1e48218ccf37b9..3395e71956e85f1951945b851125d4e86dd6ef23 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -38,8 +38,7 @@ set to the right path before compiling or loading the system.")
   *mysql-library-loaded*)
 
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
-  (clsql:push-library-path
-   (make-pathname :directory clsql-mysql-system::*library-file-dir*))
+  (clsql:push-library-path clsql-mysql-system::*library-file-dir*)
 
   (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
                                             :module "mysql"