X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=275aee1bb799e6984d050c77e0f4a42b16636d32;hb=e481082fa36a5660e2d4191dcd5a8da2aecc41ca;hp=72dbc09c8e8a94e0c0b05d072df5f72eb505a62d;hpb=a95b9a217335917d96b8c0cced4f49c3e4846115;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 72dbc09..275aee1 100644
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -2,22 +2,18 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          libraries.cl
+;;;; Name:          libraries.lisp
 ;;;; Purpose:       UFFI source to load foreign libraries
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.1 2002/09/30 10:02:36 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
 ;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
@@ -25,8 +21,15 @@
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"
   #+(or win32 mswindows) "dll"
-  #+macosx "dylib"
-  #-(or win32 mswindows macosx) "so"
+  #+(or macosx darwin ccl-5.0) "dylib"
+  #-(or win32 mswindows 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 macosx darwin ccl-5.0) '("dylib" "bundle")
+  #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o")
 )
 
 (defun find-foreign-library (names directories &key types drive-letters)  
@@ -34,7 +37,7 @@
 string or a list of strings of candidate directories. Use default
 library type if type is not specified."
   (unless types
-    (setq types (default-foreign-library-type)))
+    (setq types (foreign-library-types)))
   (unless (listp types)
     (setq types (list types)))
   (unless (listp names)
@@ -73,35 +76,52 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
 					   force-load)
-  #+allegro (declare (ignore module supporting-libraries))
-  #+lispworks  (declare (ignore supporting-libraries))
-  #+cmu (declare (ignore module))
-  #+openmcl (declare (ignore module supporting-libraries))
-  
-  (when (and filename (probe-file filename))
-    (if (pathnamep filename)    ;; ensure filename is a string to check if
-	(setq filename (namestring filename)))  ; already loaded
+  #+(or allegro mcl 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
       (progn
-	(when
-	    #+cmu
-	  (let ((type (pathname-type (parse-namestring filename))))
-	    (if (equal type "so")
-		(sys::load-object-file filename)
+	#+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))))
-	  #+lispworks (fli:register-module module :real-name filename)
-	  #+allegro (load filename)
-	  #+openmcl (ccl:open-shared-library filename)
-	  #+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)
-	       
-	  (push filename *loaded-libraries*)
-	  t)))))
+	#+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)
+	#+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)
+	
+	(push filename *loaded-libraries*)
+	t))))
 
 (defun convert-supporting-libraries-to-string (libs)
   (let (lib-load-list)