From 88b6725ddf5bb4e3fdaaf1a5fc0e331d7371b41b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 17 May 2006 14:10:57 +0000 Subject: [PATCH] r10949: 2006-05-17 Kevin Rosenberg (kevin@rosenberg.net) * Version 1.5.12 * src/libraries.lisp: Patch from Yaroslav Kavenchuk to set default drive letters on MS Windows. --- ChangeLog | 5 +++++ debian/changelog | 6 ++++++ src/libraries.lisp | 23 +++++++++++++---------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a13943..629507f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-17 Kevin Rosenberg (kevin@rosenberg.net) + * Version 1.5.12 + * src/libraries.lisp: Patch from Yaroslav Kavenchuk to set + default drive letters on MS Windows. + 2006-05-11 Kevin Rosenberg (kevin@rosenberg.net) * Version 1.5.11: Export new macro DEF-POINTER-VAR based on patch from James Bielman to support defining variables on platforms which diff --git a/debian/changelog b/debian/changelog index f1048b8..e0fc528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-uffi (1.5.12-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Wed, 17 May 2006 08:09:13 -0600 + cl-uffi (1.5.11-1) unstable; urgency=low * New upstream diff --git a/src/libraries.lisp b/src/libraries.lisp index a8d09c3..faa5f12 100644 --- a/src/libraries.lisp +++ b/src/libraries.lisp @@ -32,7 +32,7 @@ #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o") ) -(defun find-foreign-library (names directories &key types drive-letters) +(defun find-foreign-library (names directories &key types drive-letters) "Looks for a foreign library. directories can be a single string or a list of strings of candidate directories. Use default library type if type is not specified." @@ -45,6 +45,9 @@ library type if type is not specified." (unless (listp directories) (setq directories (list directories))) #+(or win32 mswindows) + (unless drive-letters + (setq drive-letters (list (pathname-device directories)))) + #+(or win32 mswindows) (unless (listp drive-letters) (setq drive-letters (list drive-letters))) #-(or win32 mswindows) @@ -53,21 +56,21 @@ library type if type is not specified." (dolist (name names) (dolist (dir directories) (dolist (type types) - (let ((path (make-pathname + (let ((path (make-pathname #+lispworks :host #+lispworks (when drive-letter drive-letter) #-lispworks :device #-lispworks (when drive-letter drive-letter) - :name name + :name name :type type - :directory + :directory (etypecase dir (pathname (pathname-directory dir)) (list dir) (string - (pathname-directory + (pathname-directory (parse-namestring dir))))))) (when (probe-file path) (return-from find-foreign-library path))))))) @@ -84,11 +87,11 @@ library type if type is not specified." (probe-file filename))) (if (pathnamep filename) ;; ensure filename is a string to check if already loaded (setq filename (namestring (if (null (pathname-directory filename)) - filename + filename ;; lispworks treats as UNC, so use truename #+(and lispworks win32) (truename filename) #-(and lispworks win32) filename)))) - + (if (and (not force-load) (find filename *loaded-libraries* :test #'string-equal)) t ;; return T, but don't reload library @@ -97,13 +100,13 @@ library type if type is not specified." (let ((type (pathname-type (parse-namestring filename)))) (if (string-equal type "so") (sys::load-object-file filename) - (alien:load-foreign filename + (alien:load-foreign filename :libraries (convert-supporting-libraries-to-string supporting-libraries)))) #+scl (let ((type (pathname-type (parse-namestring filename)))) - (alien:load-foreign filename + (alien:load-foreign filename :libraries (convert-supporting-libraries-to-string supporting-libraries))) @@ -119,7 +122,7 @@ library type if type is not specified." #+allegro (load filename) #+openmcl (ccl:open-shared-library filename) #+digitool (ccl:add-to-shared-library-search-path filename t) - + (push filename *loaded-libraries*) t)))) -- 2.34.1