Minor changes for win32

[clg] / tools / asdf-extensions.lisp

diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp
index b7a589bffb7bb7a650eae5ae2c808992bab22680..cd69b8557f5fc7a6396315fc14562b87551c8c28 100644 (file)
--- a/tools/asdf-extensions.lisp
+++ b/tools/asdf-extensions.lisp
@@ -1,20 +1,16 @@
 (in-package :asdf)
 
 (in-package :asdf)
 

-(export 'load-dso)
+(export '*dso-extension*)
+
+(defvar *dso-extension* #-darwin"so" #+darwin"dylib")

 
 

-(defun concatenate-strings (strings &optional delimiter)
-  (if (not (rest strings))
-      (first strings)
-    (concatenate
-     'string
-     (first strings)
-     (if delimiter (string delimiter) "")
-     (concatenate-strings (rest strings) delimiter))))

 
 ;;; The following code is more or less copied frm sb-bsd-sockets.asd,
 ;;; but extended to allow flags to be set in a general way
 
 
 ;;; The following code is more or less copied frm sb-bsd-sockets.asd,
 ;;; but extended to allow flags to be set in a general way
 

-(defclass unix-dso (module) ())
+(defclass unix-dso (module)
+  ((ldflags :initform nil :initarg :ldflags)))
+

 (defun unix-name (pathname)
   (namestring 
    (typecase pathname
 (defun unix-name (pathname)
   (namestring 
    (typecase pathname


@@ -27,7 +23,7 @@ (defmethod input-files ((operation compile-op) (dso unix-dso))
 (defmethod output-files ((operation compile-op) (dso unix-dso))
   (let ((dir (component-pathname dso)))
     (list
 (defmethod output-files ((operation compile-op) (dso unix-dso))
   (let ((dir (component-pathname dso)))
     (list

-     (make-pathname :type "so"
+     (make-pathname :type *dso-extension*

                    :name (car (last (pathname-directory dir)))
                    :directory (butlast (pathname-directory dir))
                    :defaults dir))))
                    :name (car (last (pathname-directory dir)))
                    :directory (butlast (pathname-directory dir))
                    :defaults dir))))


@@ -38,12 +34,13 @@ (defmethod perform :after ((operation compile-op) (dso unix-dso))
     (unless (zerop
             (run-shell-command
              "gcc ~A -o ~S ~{~S ~}"
     (unless (zerop
             (run-shell-command
              "gcc ~A -o ~S ~{~S ~}"

-             (concatenate 'string
-;;                        (sb-ext:posix-getenv "EXTRA_LDFLAGS")
-;;                        " "
-                          #+sunos "-shared -lresolv -lsocket -lnsl"
-                          #+darwin "-bundle"
-                          #-(or darwin sunos) "-shared")
+             (clg-utils:concatenate-strings
+              (cons
+               #+sunos "-shared -lresolv -lsocket -lnsl"
+               #+darwin "-bundle"
+               #-(or darwin sunos) "-shared"
+               (slot-value dso 'ldflags))
+              #\sp)

              dso-name
              (mapcar #'unix-name
                      (mapcan (lambda (c)
              dso-name
              (mapcar #'unix-name
                      (mapcan (lambda (c)


@@ -51,10 +48,16 @@ (defmethod perform :after ((operation compile-op) (dso unix-dso))
                              (module-components dso)))))
       (error 'operation-error :operation operation :component dso))))
 
                              (module-components dso)))))
       (error 'operation-error :operation operation :component dso))))
 

+#+clisp
+(defvar *loaded-libraries* ())

 
 (defun load-dso (filename)
   #+sbcl(sb-alien:load-shared-object filename)
 
 (defun load-dso (filename)
   #+sbcl(sb-alien:load-shared-object filename)

-  #+cmu(ext:load-foreign filename))
+  #+cmu(ext:load-foreign filename)
+  #+clisp
+  (unless (find filename *loaded-libraries* :test #'equal)
+    (ffi::foreign-library (namestring filename))
+    (push filename *loaded-libraries*)))

 
 
 (defmethod perform ((o load-op) (c unix-dso))
 
 
 (defmethod perform ((o load-op) (c unix-dso))


@@ -78,7 +81,7 @@ (defmethod output-files ((op compile-op) (c c-source-file))
 (defmethod perform ((op compile-op) (c c-source-file))
   (unless
       (= 0 (run-shell-command "gcc ~A -o ~S -c ~S"
 (defmethod perform ((op compile-op) (c c-source-file))
   (unless
       (= 0 (run-shell-command "gcc ~A -o ~S -c ~S"

-           (concatenate-strings
+           (clg-utils:concatenate-strings

             (append
              (list "-fPIC")
              (when (slot-value c 'optimization)
             (append
              (list "-fPIC")
              (when (slot-value c 'optimization)


@@ -119,7 +122,7 @@ (defun split-path (path)
 
 
 (defmethod component-pathname ((lib library))
 
 
 (defmethod component-pathname ((lib library))

-  (make-pathname :type "so"
+  (make-pathname :type *dso-extension*

                 :name (component-name lib)
                 :directory (split-path (slot-value lib 'libdir))))
 
                 :name (component-name lib)
                 :directory (split-path (slot-value lib 'libdir))))
 


@@ -135,7 +138,8 @@ (defmethod operation-done-p ((o load-op) (c library))
        system::*global-table* 
        :key #'(lambda (pathname)
                 (when pathname (unix::unix-namestring pathname)))
        system::*global-table* 
        :key #'(lambda (pathname)
                 (when pathname (unix::unix-namestring pathname)))

-       :test #'equal))
+       :test #'equal)
+  #+clisp(find (component-pathname c) *loaded-libraries* :test #'equal))

 
 (defmethod operation-done-p ((o operation) (c library))
   t)
 
 (defmethod operation-done-p ((o operation) (c library))
   t)