X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-mysql.asd;h=62945386fdacf30519241d7c6cdf3f3ad25db810;hp=815709e6a20773e19789990347bb17e3019b627b;hb=5c11038381563b1442d966822749bfc12ec0697c;hpb=bf8d709a2b29f30ceaa6a48b842b4b16a8c99b13

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 815709e..6294538 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -19,6 +19,10 @@
 (defpackage #:clsql-mysql-system (:use #:asdf #:cl))
 (in-package #:clsql-mysql-system)
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  #+common-lisp-controller (require 'uffi)
+  #-common-lisp-controller (asdf:operate 'asdf:load-op 'uffi))
+
 (defvar *library-file-dir* (append (pathname-directory *load-truename*)
 				   (list "db-mysql")))
 
@@ -43,7 +47,11 @@
 (defmethod perform ((o load-op) (c clsql-mysql-source-file))
   nil) ;;; library will be loaded by a loader file
 
+(defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
+  nil) 
+
 (defmethod perform ((o compile-op) (c clsql-mysql-source-file))
+  #-(or win32 mswindows)
   (unless (zerop (run-shell-command
 		  "cd ~A; make"
 		  (namestring (make-pathname :name nil
@@ -51,6 +59,12 @@
 					     :directory *library-file-dir*))))
     (error 'operation-error :component c :operation o)))
 
+(defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))
+  (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)
@@ -62,13 +76,13 @@
   :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-base clsql-uffi)
   :components
   ((:module :db-mysql
 	    :components
 	    ((:clsql-mysql-source-file "mysql")
 	     (:file "mysql-package")
 	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
-	     (:file "mysql-api" :depends-on ("mysql-loader"))
-	     (:file "mysql-sql" :depends-on ("mysql-api"))
-	     (:file "mysql-usql" :depends-on ("mysql-sql")))))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
+	     (:file "mysql-client-info" :depends-on ("mysql-loader"))
+	     (:file "mysql-api" :depends-on ("mysql-client-info"))
+	     (:file "mysql-sql" :depends-on ("mysql-api"))))))