X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.cl;h=29320469a59c7a56352c2c58fcf04d9bdb2c46e9;hb=46fbc92bfdcb2504d863929bde42962275e80e74;hp=b9bc2a53759983d323c425b0e1ad756526e4c50f;hpb=e9427febae05e5563f723f72487fc11365033d8d;p=uffi.git

diff --git a/src/libraries.cl b/src/libraries.cl
index b9bc2a5..2932046 100644
--- a/src/libraries.cl
+++ b/src/libraries.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,24 +7,13 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: libraries.cl,v 1.14 2002/04/06 19:53:08 kevin Exp $
 ;;;;
-;;;; $Id: libraries.cl,v 1.2 2002/03/10 20:01:55 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of the UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software
-;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; 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)))
@@ -33,25 +22,82 @@
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
 
-(defun load-foreign-library (filename &key module supporting-libraries)
+(defun default-foreign-library-type ()
+  "Returns string naming default library type for platform"
+  #+(or win32 mswindows) "dll"
+  #-(or win32 mswindows) "so")
+
+(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."
+  (unless types
+    (setq types (default-foreign-library-type)))
+  (unless (listp types)
+    (setq types (list types)))
+  (unless (listp names)
+    (setq names (list names)))
+  (unless (listp directories)
+    (setq directories (list directories)))
+  #+(or win32 mswindows)
+  (unless (listp drive-letters)
+    (setq drive-letters (list drive-letters)))
+  #-(or win32 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)))))))
+   nil)
+
+
+(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))
   
   (when (and filename (probe-file filename))
-    (if (find filename *loaded-libraries* :test #'string-equal)
+    (if (pathnamep filename)    ;; ensure filename is a string to check if
+	(setq filename (namestring filename)))  ; already loaded
+
+    (if (and (not force-load)
+	     (find filename *loaded-libraries* :test #'string-equal))
 	t ;; return T, but don't reload library
       (progn
-	#+cmu (alien:load-foreign filename 
+	#+cmu
+	(let ((type (pathname-type (parse-namestring filename))))
+	  (if (equal type "so")
+	      (sys::load-object-file filename)
+	      (alien:load-foreign filename 
 				  :libraries
 				  (convert-supporting-libraries-to-string
-				   supporting-libraries))
+				   supporting-libraries))))
+	
 	#+lispworks (fli:register-module module 
-					 :connection-style :automatic 
 					 :real-name filename)
 	#+allegro (load filename)
 	
-	(push filename *loaded-libraries*))))
+	(push filename *loaded-libraries*)
+	t)))
   )
 
 (defun convert-supporting-libraries-to-string (libs)