r2908: *** empty log message ***

[uffi.git] / src / libraries.cl

diff --git a/src/libraries.cl b/src/libraries.cl
index fa7f88b47c4457691bc7087ef462dca2a2862a47..96807ee7165af7d6de99bbfc296cc17608f1c6fa 100644 (file)
--- 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,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.3 2002/03/14 21:03:12 kevin Exp $
+;;;; $Id: libraries.cl,v 1.18 2002/09/30 07:51:01 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,26 +22,86 @@
 (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"
+  #+macosx "dylib"
+  #-(or win32 mswindows macosx) "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))
+  #+openmcl (declare (ignore module supporting-libraries))
   
   (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 
+       (when
+           #+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))
-       #+lispworks (fli:register-module module 
-                                        :connection-style :automatic 
-                                        :real-name filename)
-       #+allegro (load filename)
-       
-       (push filename *loaded-libraries*))))
-  )
+                                  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)))))
 
 (defun convert-supporting-libraries-to-string (libs)
   (let (lib-load-list)