X-Git-Url: http://git.kpe.io/?p=uffi.git;a=blobdiff_plain;f=src%2Flibraries.lisp;h=f2ce922c30569af3fbe835f4bb3e47d87658539f;hp=faa5f12c2ef44efab56d6f4f4a7bcd5bb3507352;hb=b86fdf882156aa45dc6e8e93a158dedf506f4233;hpb=88b6725ddf5bb4e3fdaaf1a5fc0e331d7371b41b diff --git a/src/libraries.lisp b/src/libraries.lisp index faa5f12..f2ce922 100644 --- a/src/libraries.lisp +++ b/src/libraries.lisp @@ -7,9 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id$ -;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg ;;;; ;;;; ************************************************************************* @@ -20,16 +18,16 @@ (defun default-foreign-library-type () "Returns string naming default library type for platform" - #+(or win32 mswindows) "dll" + #+(or win32 win64 cygwin mswindows windows) "dll" #+(or macosx darwin ccl-5.0) "dylib" - #-(or win32 mswindows macosx darwin ccl-5.0) "so" + #-(or win32 win64 cygwin mswindows windows macosx darwin ccl-5.0) "so" ) (defun foreign-library-types () "Returns list of string naming possible library types for platform, sorted by preference" - #+(or win32 mswindows) '("dll" "lib") + #+(or win32 win64 windows mswindows) '("dll" "lib") #+(or macosx darwin ccl-5.0) '("dylib" "bundle") - #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o") + #-(or win32 win64 windows mswindows macosx darwin ccl-5.0) '("so" "a" "o") ) (defun find-foreign-library (names directories &key types drive-letters) @@ -44,87 +42,88 @@ library type if type is not specified." (setq names (list names))) (unless (listp directories) (setq directories (list directories))) - #+(or win32 mswindows) - (unless drive-letters - (setq drive-letters (list (pathname-device directories)))) - #+(or win32 mswindows) + #+(or win32 win64 windows mswindows) (unless (listp drive-letters) (setq drive-letters (list drive-letters))) - #-(or win32 mswindows) + #-(or win32 win64 windows mswindows) (setq drive-letters '(nil)) (dolist (drive-letter drive-letters) (dolist (name names) (dolist (dir directories) - (dolist (type types) - (let ((path (make-pathname - #+lispworks :host - #+lispworks (when drive-letter drive-letter) - #-lispworks :device - #-lispworks (when drive-letter drive-letter) - :name name - :type type - :directory - (etypecase dir - (pathname - (pathname-directory dir)) - (list - dir) - (string - (pathname-directory - (parse-namestring dir))))))) - (when (probe-file path) - (return-from find-foreign-library path))))))) + (dolist (type types) + (let ((path (make-pathname + #+lispworks :host + #+lispworks (when drive-letter drive-letter) + #-lispworks :device + #-lispworks (when drive-letter drive-letter) + :name name + :type type + :directory + (etypecase dir + (pathname + (pathname-directory dir)) + (list + dir) + (string + (pathname-directory + (parse-namestring dir))))))) + (when (probe-file path) + (return-from find-foreign-library path))))))) nil) (defun load-foreign-library (filename &key module supporting-libraries - force-load) + force-load) #+(or allegro openmcl digitool sbcl) (declare (ignore module supporting-libraries)) #+(or cmu scl) (declare (ignore module)) #+lispworks (declare (ignore supporting-libraries)) - (when (and filename (or (null (pathname-directory filename)) - (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 - ;; lispworks treats as UNC, so use truename - #+(and lispworks win32) (truename filename) - #-(and lispworks win32) filename)))) + (flet ((load-failure () + (error "Unable to load foreign library \"~A\"." filename))) + (when (and filename (or (null (pathname-directory filename)) + (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 + ;; lispworks treats as UNC, so use truename + #+(and lispworks mswindows) (truename filename) + #-(and lispworks mswindows) filename)))) - (if (and (not force-load) - (find filename *loaded-libraries* :test #'string-equal)) - t ;; return T, but don't reload library + (if (and (not force-load) + (find filename *loaded-libraries* :test #'string-equal)) + t ;; return T, but don't reload library (progn - #+cmu - (let ((type (pathname-type (parse-namestring filename)))) - (if (string-equal type "so") - (sys::load-object-file 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 - :libraries - (convert-supporting-libraries-to-string - supporting-libraries))) - #+sbcl - (handler-case (sb-alien::load-1-foreign filename) - (sb-int:unsupported-operator (c) - (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien)) - (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename) - (error c)))) + #+cmu + (let ((type (pathname-type (parse-namestring filename)))) + (if (string-equal type "so") + (unless + (sys::load-object-file filename) + (load-failure)) + (alien:load-foreign filename + :libraries + (convert-supporting-libraries-to-string + supporting-libraries)))) + #+scl + (let ((type (pathname-type (parse-namestring filename)))) + (alien:load-foreign filename + :libraries + (convert-supporting-libraries-to-string + supporting-libraries))) + #+sbcl + (handler-case (sb-alien::load-1-foreign filename) + (sb-int:unsupported-operator (c) + (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien)) + (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename) + (error c)))) - #+lispworks (fli:register-module module :real-name filename - :connection-style :immediate) - #+allegro (load filename) - #+openmcl (ccl:open-shared-library filename) - #+digitool (ccl:add-to-shared-library-search-path filename t) + #+lispworks (fli:register-module module :real-name filename + :connection-style :immediate) + #+allegro (load filename) + #+openmcl (ccl:open-shared-library filename) + #+digitool (ccl:add-to-shared-library-search-path filename t) - (push filename *loaded-libraries*) - t)))) + (push filename *loaded-libraries*) + t))))) (defun convert-supporting-libraries-to-string (libs) (let (lib-load-list)