X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=37263ce37d284a48dc0b5fb9795e1d8ea114aa87;hp=9366281d3c44496f605e4f8d7a68f7c78316f694;hb=HEAD;hpb=f1d668746523a72a6893a46380468a9e033545e4

diff --git a/clsql.asd b/clsql.asd
index 9366281..37263ce 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -23,6 +23,9 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   #+:clsql-cffi
   (unless (find-package 'cffi-uffi-compat)
+    #+quicklisp
+    (ql:quickload :cffi-uffi-compat)
+    #-quicklisp
     (asdf:operate 'asdf:load-op 'cffi-uffi-compat))
   #-:clsql-cffi
   (unless (find-package 'uffi)
@@ -38,7 +41,7 @@
 the Xanalys CommonSQL interface for Lispworks. It provides low-level
 database interfaces as well as a functional and an object
 oriented interface."
-    :version "5.3.4"
+    :version "6.4"
     :components
     ((:module sql
 	      :components
@@ -51,6 +54,7 @@ oriented interface."
 			 (:file "base-classes" :depends-on ("package"))
                          (:file "conditions" :depends-on ("base-classes"))
                          (:file "db-interface" :depends-on ("conditions"))
+                         (:file "decimals" :depends-on ("package" "db-interface"))
 			 (:file "utils" :depends-on ("package" "db-interface"))
 			 (:file "time" :depends-on ("package" "conditions" "utils"))
                          (:file "generics" :depends-on ("package"))))
@@ -90,15 +94,11 @@ oriented interface."
 				     (:file "generic-odbc")
 				     (:file "sequences")
 				     (:file "command-object"))
-			:depends-on (functional))))))
-
-
-(defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
-  (operate 'load-op 'clsql-tests)
-  (operate 'test-op 'clsql-tests :force t))
+			:depends-on (functional)))))
+    :in-order-to ((test-op (test-op "clsql-tests"))))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
-  (let* ((init-var (uffi:getenv "CLSQLINIT"))
+  (let* ((init-var (uffi::getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
                         (probe-file
                          (concatenate 'string
@@ -108,4 +108,3 @@ oriented interface."
                         #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))
-