X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql-uffi.asd;h=ddd3c912dd5e124fe779618e6447cb0c432ee5d5;hb=d26a88bb2cbd2bf5b1430b2f54e11fef252787fe;hp=c45d31cf7e73330afbfb583a552eb69596aa5cf3;hpb=31d1a78ee915ae4db7c042b7e5cb1ab7b5a73448;p=clsql.git

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index c45d31c..ddd3c91 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-uffi.asd,v 1.8 2002/09/17 17:16:43 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,22 +16,59 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 
-(in-package :asdf)
+(defpackage #:clsql-uffi-system (:use #:asdf #:cl))
+(in-package #:clsql-uffi-system)
 
-;;; System definition
+(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*))))))
+
+(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>"
+  :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
+  :licence "Lessor Lisp General Public License"
+  :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."
 
-(defsystem :clsql-uffi
   :components
   ((:module :uffi
 	    :components
-	    ((:file "clsql-uffi-package")
-	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+	    ((: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))
-
-
-(defmethod source-file-type  ((c cl-source-file)
-			      (s (eql (find-system 'clsql-uffi)))) 
-   "cl")