(in-package :asdf)
-(export 'load-dso)
-
-(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
-
-(defclass unix-dso (module) ())
-(defun unix-name (pathname)
+(export '*dso-extension*)
+
+(defparameter *dso-extension*
+ #-(or darwin win32)"so" #+darwin"dylib" #+win32"dll")
+
+
+;;; 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
+
+(defclass shared-object (module)
+ ((ldflags :initform nil :initarg :ldflags)))
+
+;; For backwards compatibility
+(defclass unix-dso (shared-object)
+ ())
+
+(defun ensure-namestring (pathname)
(namestring
(typecase pathname
(logical-pathname (translate-logical-pathname pathname))
(t pathname))))
-(defmethod input-files ((operation compile-op) (dso unix-dso))
+(defmethod input-files ((operation compile-op) (dso shared-object))
(mapcar #'component-pathname (module-components dso)))
-(defmethod output-files ((operation compile-op) (dso unix-dso))
+(defmethod output-files ((operation compile-op) (dso shared-object))
(let ((dir (component-pathname dso)))
(list
- (make-pathname :type "so"
- :name (car (last (pathname-directory dir)))
+ (make-pathname :type *dso-extension*
+ :name (component-name dso)
:directory (butlast (pathname-directory dir))
:defaults dir))))
-
-(defmethod perform :after ((operation compile-op) (dso unix-dso))
- (let ((dso-name (unix-name (car (output-files operation dso)))))
+(defmethod perform :after ((operation compile-op) (dso shared-object))
+ (let ((output (first (output-files operation dso)))
+ (inputs (mapcar #'ensure-namestring
+ (mapcan #'(lambda (c)
+ (output-files operation c))
+ (module-components dso)))))
(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")
- dso-name
- (mapcar #'unix-name
- (mapcan (lambda (c)
- (output-files operation c))
- (module-components dso)))))
+ (run-shell-command "gcc ~A -o ~S ~{~S~^ ~} ~{~A~^ ~}"
+ #-(or darwin win32)"-shared"
+ #+darwin "-bundle"
+ #+win32
+ (format nil "-shared -Wl,--out-implib,~S"
+ (ensure-namestring
+ (make-pathname
+ :type "a"
+ :name (format nil "lib~Adll" (pathname-name output))
+ :defaults output)))
+ (ensure-namestring output)
+ inputs
+ (slot-value dso 'ldflags)))
(error 'operation-error :operation operation :component dso))))
+#+clisp
+(defvar *loaded-libraries* ())
-(defun load-dso (filename)
- #+sbcl(sb-alien:load-shared-object filename)
- #+cmu(system::load-object-file filename))
+(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)
+ (ffi::foreign-library namestring)
+ (push namestring *loaded-libraries*))))
-(defmethod perform ((o load-op) (c unix-dso))
+(defmethod perform ((o load-op) (c shared-object))
(let ((co (make-instance 'compile-op)))
- (let ((filename (car (output-files co c))))
- (load-dso filename))))
+ (let ((pathname (car (output-files co c))))
+ (load-shared-object pathname))))
(defmethod perform ((op compile-op) (c c-source-file))
(unless
- (= 0 (run-shell-command "gcc ~A -o ~S -c ~S"
- (concatenate-strings
- (append
- (list "-fPIC")
- (when (slot-value c 'optimization)
- (list (format nil "-O~A" (slot-value c 'optimization))))
- (loop
- for symbol in (slot-value c 'definitions)
- collect (format nil "-D~A" symbol))
- (loop
- for path in (slot-value c 'include-paths)
- collect (format nil "-I~A" path))
- (slot-value c 'cflags))
- #\sp)
- (unix-name (car (output-files op c)))
- (unix-name (component-pathname c))))
+ (= 0 (run-shell-command "gcc ~A~{ ~A~} -o ~S -c ~S"
+ #-win32 "-fPIC"
+ #+win32 "-DBUILD_DLL"
+ (nconc
+ (when (slot-value c 'optimization)
+ (list (format nil "-O~A" (slot-value c 'optimization))))
+ (loop
+ for symbol in (slot-value c 'definitions)
+ collect (format nil "-D~A" symbol))
+ (loop
+ for path in (slot-value c 'include-paths)
+ collect (format nil "-I~A" path))
+ (slot-value c 'cflags))
+ (ensure-namestring (first (output-files op c)))
+ (ensure-namestring (component-pathname c))))
(error 'operation-error :operation op :component c)))
t)
+;;; Shared libraries
+
+(defclass library (component)
+ ((libdir :initarg :libdir :initform nil)
+ (libname :initarg :libname :initform nil)))
-(defclass library (static-file)
- ((libdir :initarg :libdir)))
+(defun split-path (path)
+ (labels ((split (path)
+ (unless (zerop (length path))
+ (let ((slash (position #\/ path)))
+ (if slash
+ (cons (subseq path 0 slash) (split (subseq path (1+ slash))))
+ (list path))))))
+ (if (and (not (zerop (length path))) (char= (char path 0) #\/))
+ (cons :absolute (split (subseq path 1)))
+ (cons :relative (split path)))))
-(defun relative-pathname (path)
- (etypecase path
- (cons path)
- (string (if (char= #\/ (char path 0))
- (subseq path 1)
- path))))
(defmethod component-pathname ((lib library))
- (make-pathname :type "so"
- :name (component-name lib)
- :directory (relative-pathname (slot-value lib 'libdir))))
+ (make-pathname :type *dso-extension*
+ :name (or (slot-value lib 'libname) (component-name lib))
+ :directory (split-path (slot-value lib 'libdir))))
(defmethod perform ((o load-op) (c library))
- (load-dso (component-pathname c)))
+ (load-shared-object (component-pathname c)))
+
+(defmethod perform ((operation operation) (c 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 operation) (c library))
+ t)
~mdw / clg / blobdiff