X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-uffi.asd;h=90e77de97a323fd524e46d05551ebe45614e29db;hp=ddd3c912dd5e124fe779618e6447cb0c432ee5d5;hb=937a3d6ab1f7d730c741b213f60ed5f5f4cf2021;hpb=b31836193ceb646fa6e4fd7761dff378a9c67385

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index ddd3c91..90e77de 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,55 +7,18 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; 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 *asd-file-dir* (pathname-directory *load-truename*))
-
-(defclass clsql-uffi-source-file (c-source-file)
-  ())
-
-(defmethod output-files ((o compile-op) (c clsql-uffi-source-file))
-  (let ((searched (or
-		   (probe-file #p"/usr/lib/clsql/uffi.so")
-		   (probe-file (make-pathname
-				:directory *asd-file-dir*
-				:name "uffi"
-				:type "so")))))
-    (if searched
-	(list searched)
-	(list (merge-pathnames
-	       (make-pathname :name (component-name c)
-			      :type "so"
-			      :directory '(:relative "tests"))
-	       (make-pathname :directory *asd-file-dir*))))))
+(defpackage clsql-uffi-system (:use #:asdf #:cl))
+(in-package clsql-uffi-system)
 
-(defmethod perform ((o load-op) (c clsql-uffi-source-file))
-  nil) ;;; library will be loaded by a loader file
-
-(defmethod perform ((o compile-op) (c clsql-uffi-source-file))
-  (unless (zerop (run-shell-command
-		  "cd ~A; make"
-		  (namestring (merge-pathnames
-			       (make-pathname
-				:name nil
-				:type nil
-				:directory '(:relative "uffi"))
-			       (make-pathname
-				:directory *asd-file-dir*)))))
-    (error 'operation-error :component c :operation o)))
-
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -64,11 +27,12 @@
   :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
-	    ((:clsql-uffi-source-file "uffi")
-	     (:file "clsql-uffi-package")
-	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
-	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))))
-  :depends-on (:uffi :clsql-base))
+	    ((:file "clsql-uffi-package")
+             (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+	     (:file "clsql-uffi" :depends-on ("clsql-uffi-package"))))))