projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automated commit for upstream build of version 6.0.1
[clsql.git]
/
clsql.asd
diff --git
a/clsql.asd
b/clsql.asd
index c70fd787e5c8696dc3d8093715527f3dbae134f6..9366281d3c44496f605e4f8d7a68f7c78316f694 100644
(file)
--- a/
clsql.asd
+++ b/
clsql.asd
@@
-3,12
+3,10
@@
;;;; FILE IDENTIFICATION
;;;;
;;;; Name: clsql.asd
;;;; 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
;;;;
;;;; 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.
;;;; 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,8
+16,15
@@
(defpackage #:clsql-system (:use #:asdf #:cl))
(in-package #:clsql-system)
(defpackage #:clsql-system (:use #:asdf #:cl))
(in-package #:clsql-system)
-;; need to load uffi for below perform :after method
+#+(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)
(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)))
(unless (find-package 'uffi)
(asdf:operate 'asdf:load-op 'uffi)))
@@
-30,9
+35,10
@@
:licence "Lessor Lisp General Public License"
:description "Common Lisp SQL Interface library"
:long-description "A Common Lisp interface to SQL RDBMS based on
: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."
oriented interface."
+ :version "5.3.4"
:components
((:module sql
:components
:components
((:module sql
:components
@@
-45,8
+51,8
@@
oriented interface."
(:file "base-classes" :depends-on ("package"))
(:file "conditions" :depends-on ("base-classes"))
(:file "db-interface" :depends-on ("conditions"))
(:file "base-classes" :depends-on ("package"))
(:file "conditions" :depends-on ("base-classes"))
(:file "db-interface" :depends-on ("conditions"))
- (:file "time" :depends-on ("package" "conditions"))
(:file "utils" :depends-on ("package" "db-interface"))
(:file "utils" :depends-on ("package" "db-interface"))
+ (:file "time" :depends-on ("package" "conditions" "utils"))
(:file "generics" :depends-on ("package"))))
(:module database
:pathname ""
(:file "generics" :depends-on ("package"))))
(:module database
:pathname ""
@@
-54,7
+60,7
@@
oriented interface."
((:file "initialize")
(:file "database" :depends-on ("initialize"))
(:file "recording" :depends-on ("database"))
((:file "initialize")
(:file "database" :depends-on ("initialize"))
(:file "recording" :depends-on ("database"))
- (:file "pool"))
+ (:file "pool"
:depends-on ("database")
))
:depends-on (base))
(:module syntax
:pathname ""
:depends-on (base))
(:module syntax
:pathname ""
@@
-67,8
+73,9
@@
oriented interface."
:pathname ""
:components ((:file "fdml")
(:file "transaction" :depends-on ("fdml"))
:pathname ""
:components ((:file "fdml")
(:file "transaction" :depends-on ("fdml"))
+ #+clisp (:file "ansi-loop")
(:file "loop-extension"
(:file "loop-extension"
- :depends-on ("fdml"))
+ :depends-on ("fdml"
#+clisp "ansi-loop"
))
(:file "fddl" :depends-on ("fdml")))
:depends-on (syntax))
(:module object
(:file "fddl" :depends-on ("fdml")))
:depends-on (syntax))
(:module object
@@
-81,7
+88,8
@@
oriented interface."
:pathname ""
:components ((:file "generic-postgresql")
(:file "generic-odbc")
:pathname ""
:components ((:file "generic-postgresql")
(:file "generic-odbc")
- (:file "sequences"))
+ (:file "sequences")
+ (:file "command-object"))
:depends-on (functional))))))
:depends-on (functional))))))
@@
-92,6
+100,12
@@
oriented interface."
(defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
(let* ((init-var (uffi:getenv "CLSQLINIT"))
(init-file (or (when init-var (probe-file init-var))
(defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
(let* ((init-var (uffi:getenv "CLSQLINIT"))
(init-file (or (when init-var (probe-file init-var))
- (probe-file "/etc/clsql-init.lisp"))))
+ (probe-file
+ (concatenate 'string
+ (namestring (user-homedir-pathname))
+ ".clsql-init.lisp"))
+ (probe-file "/etc/clsql-init.lisp")
+ #+(or mswin windows win32 win64 mswindows)
+ (probe-file "c:\\etc\\clsql-init.lisp"))))
(when init-file (load init-file))))
(when init-file (load init-file))))