projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version number
[clsql.git]
/
clsql-mysql.asd
diff --git
a/clsql-mysql.asd
b/clsql-mysql.asd
index fe661dc84972765f4951491e4272db5a09538259..12b8479dbec78c9c1a4efa647b78d6096596555a 100644
(file)
--- a/
clsql-mysql.asd
+++ b/
clsql-mysql.asd
@@
-7,9
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@
-20,11
+18,13
@@
(in-package #:clsql-mysql-system)
(eval-when (:compile-toplevel :load-toplevel :execute)
(in-package #:clsql-mysql-system)
(eval-when (:compile-toplevel :load-toplevel :execute)
-
#+common-lisp-controller (requir
e 'uffi)
-
#-common-lisp-controller (asdf:operate 'asdf:load-op 'uffi
))
+
(unless (find-packag
e 'uffi)
+
(asdf:operate 'asdf:load-op 'uffi)
))
-(defvar *library-file-dir* (append (pathname-directory *load-truename*)
- (list "db-mysql")))
+(defvar *library-file-dir*
+ (merge-pathnames "db-mysql/"
+ (make-pathname :name nil :type nil
+ :defaults *load-truename*)))
(defclass clsql-mysql-source-file (c-source-file)
())
(defclass clsql-mysql-source-file (c-source-file)
())
@@
-37,42
+37,40
@@
(probe-file (make-pathname :directory dir
:name (component-name c)
:type library-file-type)))
(probe-file (make-pathname :directory dir
:name (component-name c)
:type library-file-type)))
- '((:absolute "usr" "lib" "clsql")))))
+ '((:absolute "usr" "lib" "clsql")))))
(list (if found
found
(make-pathname :name (component-name c)
:type library-file-type
(list (if found
found
(make-pathname :name (component-name c)
:type library-file-type
- :d
irectory
*library-file-dir*)))))
+ :d
efaults
*library-file-dir*)))))
(defmethod perform ((o load-op) (c clsql-mysql-source-file))
t)
(defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
(defmethod perform ((o load-op) (c clsql-mysql-source-file))
t)
(defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
- (and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
+ (and (find-package '#:mysql)
+ (symbol-function (intern (symbol-name '#:mysql-get-client-info)
(find-package '#:mysql)))
(find-package '#:mysql)))
- t))
+ t))
(defmethod perform ((o compile-op) (c clsql-mysql-source-file))
(unless (operation-done-p o c)
(defmethod perform ((o compile-op) (c clsql-mysql-source-file))
(unless (operation-done-p o c)
- #-(or win32 mswindows)
+ #-(or win32
win64 windows
mswindows)
(unless (zerop (run-shell-command
#-freebsd "cd ~A; make"
#+freebsd "cd ~A; gmake"
(unless (zerop (run-shell-command
#-freebsd "cd ~A; make"
#+freebsd "cd ~A; gmake"
- (namestring (make-pathname :name nil
- :type nil
- :directory *library-file-dir*))))
+ (namestring *library-file-dir*)))
(error 'operation-error :component c :operation o))))
(defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))
(error 'operation-error :component c :operation o))))
(defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))
- (or (and (probe-file #p"/usr/lib/clsql/mysql.so") t)
+ (or (and (probe-file #p"/usr/lib/clsql/
clsql_
mysql.so") t)
(let ((lib (make-pathname :defaults (component-pathname c)
:type (uffi:default-foreign-library-type))))
(let ((lib (make-pathname :defaults (component-pathname c)
:type (uffi:default-foreign-library-type))))
- (and (probe-file lib)
+ (and (probe-file lib)
(probe-file (component-pathname c))
(> (file-write-date lib) (file-write-date (component-pathname c)))))))
;;; System definition
(> (file-write-date lib) (file-write-date (component-pathname c)))))))
;;; System definition
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
(defsystem :clsql-mysql
:name "cl-sql-mysql"
:author "Kevin M. Rosenberg <kmr@debian.org>"
(defsystem :clsql-mysql
:name "cl-sql-mysql"
:author "Kevin M. Rosenberg <kmr@debian.org>"
@@
-81,13
+79,13
@@
:description "Common Lisp SQL MySQL Driver"
:long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
:description "Common Lisp SQL MySQL Driver"
:long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
- :depends-on (
uffi
clsql clsql-uffi)
+ :depends-on (clsql clsql-uffi)
:components
((:module :db-mysql
:components
((:file "mysql-package")
:components
((:module :db-mysql
:components
((:file "mysql-package")
- (:clsql-mysql-source-file "mysql" :depends-on ("mysql-package"))
- (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
+ (:clsql-mysql-source-file "
clsql_
mysql" :depends-on ("mysql-package"))
+ (:file "mysql-loader" :depends-on ("mysql-package" "
clsql_
mysql"))
(:file "mysql-client-info" :depends-on ("mysql-loader"))
(:file "mysql-api" :depends-on ("mysql-client-info"))
(:file "mysql-sql" :depends-on ("mysql-api"))
(:file "mysql-client-info" :depends-on ("mysql-loader"))
(:file "mysql-api" :depends-on ("mysql-client-info"))
(:file "mysql-sql" :depends-on ("mysql-api"))