Bug fix

[clg] / tools / asdf-extensions.lisp

diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp
index 768006ab29b7d48a595d9030eb74ddf1895c1c3a..c315dc43dff8e9c7ae851adf4780fbaa01a8acbb 100644 (file)
--- a/tools/asdf-extensions.lisp
+++ b/tools/asdf-extensions.lisp
@@ -1,22 +1,22 @@
 (in-package :asdf)
 
-(export '*dso-extension*)
+(export '(*absolute-paths-as-default* *dso-extension*
+         *operation* *system* *component*))
 
 (defparameter *dso-extension* 
  #-(or darwin win32)"so" #+darwin"dylib" #+win32"dll")
 
+(defparameter *absolute-paths-as-default* nil)
 
 ;;; The following code is more or less copied from sb-bsd-sockets.asd,
 ;;; but extended to allow flags to be set in a general way. The class
-;;; has been renamed from unix-dso to shared-object as this code no
-;;; longer is unix specific
+;;; has been renamed from unix-dso to shared-object as this code is no
+;;; longer specific to unix
 
 (defclass shared-object (module)
-  ((ldflags :initform nil :initarg :ldflags)))
-
-;; For backwards compatibility
-(defclass unix-dso (shared-object)
-  ())
+  ((ldflags :initform nil :initarg :ldflags)
+   (absolute :initform *absolute-paths-as-default* 
+            :initarg :absolute :reader absolute-p)))
 
 (defun ensure-namestring (pathname)
   (namestring 
@@ -31,7 +31,7 @@ (defmethod output-files ((operation compile-op) (dso shared-object))
   (let ((dir (component-pathname dso)))
     (list
      (make-pathname :type *dso-extension*
-                   :name (car (last (pathname-directory dir)))
+                   :name (component-name dso)
                    :directory (butlast (pathname-directory dir))
                    :defaults dir))))
 
@@ -60,20 +60,37 @@ (defmethod perform :after ((operation compile-op) (dso shared-object))
 #+clisp
 (defvar *loaded-libraries* ())
 
-(defun load-shared-object (pathname)
-  (let ((namestring (ensure-namestring pathname)))
-    #+sbcl(sb-alien:load-shared-object namestring)
-    #+cmu(ext:load-foreign namestring)
-    #+clisp
-    (unless (find namestring *loaded-libraries* :test #'equal)
+(defun load-shared-object (pathname &optional (absolute-p t))
+  (let* ((namestring (ensure-namestring pathname))
+        (directory (namestring (pathname-sans-name+type namestring)))
+        (name+type (subseq namestring (length directory))))
+    #+sbcl
+    (progn
+      (sb-alien:load-shared-object namestring)
+      (unless absolute-p
+       (let ((shared-object (find namestring sb-alien::*shared-objects* 
+                             :key #'sb-alien::shared-object-file 
+                             :test #'equal)))
+         (setf (sb-alien::shared-object-file shared-object) name+type))))
+    #+cmu
+    (progn
+      (ext:load-foreign namestring)
+      (unless absolute-p
+       (let ((shared-object (rassoc namestring system::*global-table* 
+                             :test #'equal)))
+         (setf (cdr shared-object) name+type))))
+    #+clisp 
+    (progn
       (ffi::foreign-library namestring)
-      (push namestring *loaded-libraries*))))
+      (pushnew 
+       (if absolute-p namestring name+type)
+       *loaded-libraries* :test #'string=))))
 
 
-(defmethod perform ((o load-op) (c shared-object))
+(defmethod perform ((o load-op) (dso shared-object))
   (let ((co (make-instance 'compile-op)))
-    (let ((pathname (car (output-files co c))))
-      (load-shared-object pathname))))
+    (let ((pathname (car (output-files co dso))))
+      (load-shared-object pathname (absolute-p dso)))))
 
 
 
@@ -116,7 +133,9 @@ (defmethod perform ((operation load-op) (c c-source-file))
 
 (defclass library (component) 
   ((libdir :initarg :libdir :initform nil)
-   (libname :initarg :libname :initform nil)))
+   (libname :initarg :libname :initform nil)
+   (absolute :initform *absolute-paths-as-default*
+            :initarg :absolute :reader absolute-p)))
 
 
 (defun split-path (path)
@@ -136,17 +155,34 @@ (defmethod component-pathname ((lib library))
                 :name (or (slot-value lib 'libname) (component-name lib))
                 :directory (split-path (slot-value lib 'libdir))))
 
-(defmethod perform ((o load-op) (c library))
-  (load-shared-object (component-pathname c)))
+(defmethod perform ((o load-op) (lib library))
+  (load-shared-object (component-pathname lib) (absolute-p lib)))
 
-(defmethod perform ((operation operation) (c library))
+(defmethod perform ((operation operation) (lib library))
   nil)
 
-(defmethod operation-done-p ((o load-op) (c library))
-  (let ((namestring (ensure-namestring (component-pathname c))))
-    #+sbcl(find namestring sb-alien::*shared-objects* :key #'sb-alien::shared-object-file :test #'equal)
-    #+cmu(rassoc namestring system::*global-table* :test #'equal)
-    #+clisp(find namestring *loaded-libraries* :test #'equal)))
+(defmethod operation-done-p ((o load-op) (lib library))
+  (let* ((namestring (ensure-namestring (component-pathname lib)))
+        (directory (namestring (pathname-sans-name+type namestring)))
+        (name+type (subseq namestring (length directory)))
+        (stored-name (if (absolute-p lib) namestring name+type)))
+
+    #+sbcl(find stored-name sb-alien::*shared-objects* :key #'sb-alien::shared-object-file :test #'equal)
+    #+cmu(rassoc stored-name system::*global-table* :test #'equal)
+    #+clisp(find stored-name *loaded-libraries* :test #'equal)))
 
-(defmethod operation-done-p ((o operation) (c library))
+(defmethod operation-done-p ((o operation) (lib library))
   t)
+
+
+;;; Binding of dynamic variables during perform
+
+(defvar *operation* nil)
+(defvar *system* nil)
+(defvar *component* nil)
+
+(defmethod perform :around ((operation operation) (c component))
+  (let ((*operation* operation)
+       (*component* c)
+       (*system* (component-system c)))
+    (call-next-method)))