X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-mysql.asd;h=378082763c040675a8d23860eb0df24e2847e065;hp=4fcd4eb1a5c6514b3d05df8297155b5dc7406770;hb=d9f41af62750c622945bb17b622a39689ee5b840;hpb=b31836193ceb646fa6e4fd7761dff378a9c67385

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 4fcd4eb..3780827 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -19,44 +19,59 @@
 (defpackage #:clsql-mysql-system (:use #:asdf #:cl))
 (in-package #:clsql-mysql-system)
 
-(defvar *asd-file-dir* (pathname-directory *load-truename*))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package 'uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
+
+(defvar *library-file-dir* (append (pathname-directory *load-truename*)
+				   (list "db-mysql")))
 
 (defclass clsql-mysql-source-file (c-source-file)
   ())
 
 (defmethod output-files ((o compile-op) (c clsql-mysql-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*))))))
+  (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
+			     :directory *library-file-dir*)))))
 
 (defmethod perform ((o load-op) (c clsql-mysql-source-file))
-  nil) ;;; library will be loaded by a loader file
+  t)
+
+(defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
+  (and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
+				(find-package '#:mysql)))
+       t)) 
 
 (defmethod perform ((o compile-op) (c clsql-mysql-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)))
+  (unless (operation-done-p o c)
+    #-(or win32 mswindows)
+    (unless (zerop (run-shell-command
+		    #-freebsd "cd ~A; make"
+		    #+freebsd "cd ~A; gmake"
+		    (namestring (make-pathname :name nil
+					       :type nil
+					       :directory *library-file-dir*))))
+      (error 'operation-error :component c :operation o))))
+
+(defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))
+  (or (and (probe-file #p"/usr/lib/clsql/mysql.so") t)
+      (let ((lib (make-pathname :defaults (component-pathname c)
+				:type (uffi:default-foreign-library-type))))
+	(and (probe-file lib)
+	     (> (file-write-date lib) (file-write-date (component-pathname c)))))))
 
 ;;; System definition
 
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem :clsql-mysql
   :name "cl-sql-mysql"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -65,13 +80,14 @@
   :description "Common Lisp SQL MySQL Driver"
   :long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
 
+  :depends-on (uffi clsql clsql-uffi)
   :components
   ((:module :db-mysql
 	    :components
-	    ((:clsql-mysql-source-file "mysql")
-	     (:file "mysql-package")
+	    ((:file "mysql-package")
+	     (:clsql-mysql-source-file "mysql" :depends-on ("mysql-package"))
 	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
-	     (:file "mysql-api" :depends-on ("mysql-loader"))
+	     (:file "mysql-client-info" :depends-on ("mysql-loader"))
+	     (:file "mysql-api" :depends-on ("mysql-client-info"))
 	     (:file "mysql-sql" :depends-on ("mysql-api"))
-	     (:file "mysql-usql" :depends-on ("mysql-sql")))))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
+	     (:file "mysql-objects" :depends-on ("mysql-sql"))))))