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

diff --git a/clsql.asd b/clsql.asd
index 35e172a..37263ce 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -3,12 +3,10 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:     clsql.asd
-;;;; Purpose:  System definition for CLSQL-CLASSIC
+;;;; Purpose:  ASDF System definition for CLSQL
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
@@ -18,14 +16,18 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
-#+clisp
-(progn
-  (asdf:operate 'asdf:load-op 'cffi)
-  (asdf:operate 'asdf:load-op 'cffi-uffi-compat)
-  (asdf:defsystem uffi :depends-on (cffi-uffi-compat)))
+#+(and clisp (not :clsql-cffi))
+(asdf:operate 'asdf:load-op 'clsql-cffi)
 
 ;; need to load uffi for below perform :after method
 (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)
     (asdf:operate 'asdf:load-op 'uffi)))
 
@@ -36,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
@@ -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"))))
@@ -88,23 +92,19 @@ 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
                                       (namestring (user-homedir-pathname))
                                       ".clsql-init.lisp"))
                         (probe-file "/etc/clsql-init.lisp")
-                        #+(or mswin windows win32)
+                        #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))
-