New file clsql-cffi.asd

diff --git a/ChangeLog b/ChangeLog
index ce68a033b0429e159f66984d8f56eee15e190245..ce425a366ba19d3744fc91f0a3c59d6eef9d255a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-29  Kevin Rosenberg <kevin@rosenberg.net
+       * clsql-cffi.asd: New file that causes CLSQL to use
+       CFFI-UFFI-COMPAT library rather than UFFI. Perform 'asdf:load-op
+       on this system rather than clsql to use CFFI-UFFI-COMPAT.
+
 2010-01-29  Nathan Bird  <nathan@acceleration.net>
        * tests/*.lisp: A lot more tests and test setup tweaks.
        * sql/expressions.lisp: output-sql on sql-relational-exp does

diff --git a/clsql-cffi.asd b/clsql-cffi.asd
new file mode 100644 (file)
index 0000000..fb6fb7d
--- /dev/null
+++ b/clsql-cffi.asd
@@ -0,0 +1,27 @@
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:     clsql-cffi.asd
+;;;; Purpose:  ASDF System definition for CLSQL using CFFI-UFFI-COMPAT
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Jan 2010
+;;;;
+;;;; 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.
+;;;; *************************************************************************
+
+(push :clsql-cffi cl:*features*)
+
+(defpackage #:clsql-cffi-system (:use #:asdf #:cl))
+(in-package #:clsql-cffi-system)
+
+(defsystem clsql-cffi
+    :name "CLSQL-CFFI"
+    :author "Kevin Rosenberg <kevin@rosenberg.net>"
+    :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
+    :licence "Lessor Lisp General Public License"
+    :description "CLSQL using CFFI-UFFI-COMPAT interface"
+    :depends-on (clsql)
+    :components nil)

diff --git a/clsql.asd b/clsql.asd
index 29e2f38bf55d7835402837963faeee29ff297f29..c28225e22833284cec52833f893c937f6a60b4b2 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -3,7 +3,7 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:     clsql.asd
-;;;; Purpose:  ASDF system definition for CLSQL
+;;;; Purpose:  ASDF System definition for CLSQL
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004
 ;;;;
@@ -16,14 +16,15 @@
 (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)
+    (asdf:operate 'asdf:load-op 'cffi-uffi-compat))
+  #-:clsql-cffi
   (unless (find-package 'uffi)
     (asdf:operate 'asdf:load-op 'uffi)))