From 8c67076cc94d7f121055288647042003d3ccd4e7 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 6 Apr 2002 19:13:00 +0000 Subject: [PATCH] r1741: Added find-foreign-library --- src/mcl/libraries.cl | 48 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/mcl/libraries.cl b/src/mcl/libraries.cl index c05f7e6..14b9199 100644 --- a/src/mcl/libraries.cl +++ b/src/mcl/libraries.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.cl,v 1.3 2002/04/06 19:11:15 kevin Exp $ +;;;; $Id: libraries.cl,v 1.4 2002/04/06 19:13:00 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi @@ -30,8 +30,44 @@ (when (ccl:add-to-shared-library-search-path ,filename t) (pushnew ,filename *loaded-libraries*)))) -(defun convert-supporting-libraries-to-string (libs) - (let (lib-load-list) - (dolist (lib libs) - (push (format nil "-l~A" lib) lib-load-list)) - (nreverse lib-load-list))) +;; Copied directly from main source without MCL specializations +(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) -- 2.34.1