Automated commit for debian release 6.7.2-1

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index c28225e22833284cec52833f893c937f6a60b4b2..37263ce37d284a48dc0b5fb9795e1d8ea114aa87 100644 (file)
--- 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)
@@ -35,9 +38,10 @@
     :licence "Lessor Lisp General Public License"
     :description "Common Lisp SQL Interface library"
     :long-description "A Common Lisp interface to SQL RDBMS based on
-the Xanalys CommonSQL interface for Lispworks. It depends on the
-low-level database interfaces as well as a functional and an object
+the Xanalys CommonSQL interface for Lispworks. It provides low-level
+database interfaces as well as a functional and an object
 oriented interface."
+    :version "6.4"
     :components
     ((:module sql
              :components
@@ -50,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"))))
@@ -87,16 +92,13 @@ oriented interface."
                        :pathname ""
                        :components ((:file "generic-postgresql")
                                     (:file "generic-odbc")
-                                    (:file "sequences"))
-                       :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))
+                                    (:file "sequences")
+                                    (:file "command-object"))
+                       :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
@@ -106,4 +108,3 @@ oriented interface."
                         #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))
-