Automated commit for debian release 6.6.3-2

[clsql.git] / clsql-uffi.asd

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 53c6152121868274cc98c66ae6b4e26fce24777a..90e77de97a323fd524e46d05551ebe45614e29db 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -19,56 +19,6 @@
 (defpackage clsql-uffi-system (:use #:asdf #:cl))
 (in-package clsql-uffi-system)
 
-(defvar *clsql-uffi-library-dir*
-  (merge-pathnames "uffi/"
-                  (make-pathname :name nil :type nil :defaults *load-truename*)))
-
-(defclass clsql-uffi-source-file (c-source-file)
-  ())
-
-
-(defmethod output-files ((o compile-op) (c clsql-uffi-source-file))
-  (let* ((library-file-type
-         (funcall (intern (symbol-name'#:default-foreign-library-type)
-                          (symbol-name '#:uffi))))
-        (found
-         (some #'(lambda (dir)
-                   (probe-file (make-pathname
-                                :directory dir
-                                :name (component-name c)
-                                :type library-file-type)))
-               '((:absolute "usr" "lib" "clsql")))))
-    (list (if found
-             found
-             (make-pathname :name (component-name c)
-                            :type library-file-type
-                            :defaults *clsql-uffi-library-dir*)))))
-
-(defmethod perform ((o load-op) (c clsql-uffi-source-file))
-  nil) ;;; library will be loaded by a loader file
-
-(defmethod operation-done-p ((o load-op) (c clsql-uffi-source-file))
-  (and (symbol-function (intern (symbol-name '#:atol64)
-                               (find-package '#:clsql-uffi)))
-       t))
-
-(defmethod perform ((o compile-op) (c clsql-uffi-source-file))
-  (unless (operation-done-p o c)
-    #-(or win32 win64 windows mswindows)
-    (unless (zerop (run-shell-command
-                   #-(or freebsd netbsd) "cd ~A; make"
-                   #+(or freebsd netbsd) "cd ~A; gmake"
-                   (namestring *clsql-uffi-library-dir*)))
-      (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/clsql_uffi.so") t)
-      (let ((lib (make-pathname :defaults (component-pathname c)
-                               :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)))))))
-
 (defsystem clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -84,6 +34,5 @@
   ((:module :uffi
            :components
            ((:file "clsql-uffi-package")
-            (: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-loader" :depends-on ("clsql-uffi-package"))
+            (:file "clsql-uffi" :depends-on ("clsql-uffi-package"))))))