r11764: 2007-07-22 Kevin Rosenberg (kevin@rosenberg.net)

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index cb6b168e53b0a0b9d9c10790213708b3696a79be..59b5907c622b96c3a31974ce793cbc621810a5bf 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -20,9 +20,9 @@
 
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"
-  #+(or win32 mswindows) "dll"
+  #+(or win32 cygwin mswindows) "dll"
   #+(or macosx darwin ccl-5.0) "dylib"
-  #-(or win32 mswindows macosx darwin ccl-5.0) "so"
+  #-(or win32 cygwin mswindows macosx darwin ccl-5.0) "so"
 )
 
 (defun foreign-library-types ()
@@ -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."
@@ -53,21 +53,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)))))))
@@ -76,34 +76,38 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
                                           force-load)
-  #+(or allegro mcl) (declare (ignore module supporting-libraries))
-  #+(or cmu scl sbcl) (declare (ignore module))
+  #+(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))))
-    
-    (if (and (not force-load)
-            (find filename *loaded-libraries* :test #'string-equal))
-       t ;; return T, but don't reload library
+  (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 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
       (progn
        #+cmu
        (let ((type (pathname-type (parse-namestring filename))))
          (if (string-equal type "so")
-             (sys::load-object-file filename)
-             (alien:load-foreign filename 
+             (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 
+         (alien:load-foreign filename
                              :libraries
                              (convert-supporting-libraries-to-string
                               supporting-libraries)))
@@ -115,13 +119,13 @@ library type if type is not specified."
                (error c))))
 
        #+lispworks (fli:register-module module :real-name filename
-                                                :connection-style :immediate)
+                                         :connection-style :immediate)
        #+allegro (load filename)
        #+openmcl (ccl:open-shared-library filename)
-       #+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)
-       
+       #+digitool (ccl:add-to-shared-library-search-path filename t)
+
        (push filename *loaded-libraries*)
-       t))))
+       t)))))
 
 (defun convert-supporting-libraries-to-string (libs)
   (let (lib-load-list)