X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=clsql-uffi.asd;h=84bfeb2f89c45c68ece2969a5817f7cb5bad223c;hb=eabede9da3e61ef5191b601dcf9b30f30f613f3e;hp=c633488ec00cc226674fb88c0d1ffb40e63a8020;hpb=736227185dd5fcda15796ef2a0da1bebb82ee9e5;p=clsql.git

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index c633488..84bfeb2 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,21 +7,69 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-uffi.asd,v 1.15 2003/05/07 02:45:08 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
+(in-package cl-user)
+
+(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)
+;;   ())
+
 
-(defpackage #:clsql-uffi-system (:use #:asdf #:cl))
-(in-package #:clsql-uffi-system)
+;; (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 (find-package '#:clsql-uffi)
+;;        (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)))))))
 
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -30,10 +78,14 @@
   :description "Common UFFI Helper functions for Common Lisp SQL Interface Library"
   :long-description "cl-sql-uffi package provides common helper functions using the UFFI for the CLSQL package."
 
+  :depends-on (clsql #-:clsql-cffi (:version uffi "2.0")
+                     #+:clsql-cffi cffi-uffi-compat)
+
   :components
   ((:module :uffi
 	    :components
 	    ((:file "clsql-uffi-package")
-	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))))
-  :depends-on (:uffi :clsql-base))
+;;	     (: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-loader" :depends-on ("clsql-uffi-package"))
+	     (:file "clsql-uffi" :depends-on ("clsql-uffi-package"))))))