projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10839: 15 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
clsql-uffi.asd
diff --git
a/clsql-uffi.asd
b/clsql-uffi.asd
index 215e6bcada0116514e5ddf06f24bfe6af70482fb..48372a1cff433b5060ae08a564e0f355c5108045 100644
(file)
--- a/
clsql-uffi.asd
+++ b/
clsql-uffi.asd
@@
-18,11
+18,6
@@
(in-package cl-user)
(in-package cl-user)
-;; need to load uffi for below output-files method
-(eval-when (:compile-toplevel :load-toplevel :execute)
- #+common-lisp-controller (require 'uffi)
- #-common-lisp-controller (asdf:operate 'asdf:load-op 'uffi))
-
(defpackage clsql-uffi-system (:use #:asdf #:cl))
(in-package clsql-uffi-system)
(defpackage clsql-uffi-system (:use #:asdf #:cl))
(in-package clsql-uffi-system)
@@
-70,13
+65,13
@@
(error 'operation-error :component c :operation o))))
(defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
(error 'operation-error :component c :operation o))))
(defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
- (or (and (probe-file #p"/usr/lib/clsql/uffi.so") t)
+ (or (and (probe-file #p"/usr/lib/clsql/
clsql_
uffi.so") t)
(let ((lib (make-pathname :defaults (component-pathname c)
(let ((lib (make-pathname :defaults (component-pathname c)
- :type (uffi:default-foreign-library-type))))
- (and (probe-file lib)
+ :type (funcall (intern (symbol-name '#:default-foreign-library-type)
+ (find-package '#:uffi))))))
+ (and (probe-file lib) (probe-file (component-pathname c))
(> (file-write-date lib) (file-write-date (component-pathname c)))))))
(> (file-write-date lib) (file-write-date (component-pathname c)))))))
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
(defsystem clsql-uffi
:name "cl-sql-base"
:author "Kevin M. Rosenberg <kmr@debian.org>"
(defsystem clsql-uffi
:name "cl-sql-base"
:author "Kevin M. Rosenberg <kmr@debian.org>"
@@
-91,6
+86,6
@@
((:module :uffi
:components
((:file "clsql-uffi-package")
((:module :uffi
:components
((:file "clsql-uffi-package")
- (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package"))
- (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
+ (:clsql-uffi-source-file "
clsql_
uffi" :depends-on ("clsql-uffi-package"))
+ (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "
clsql_
uffi"))
(:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))
(:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))