projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving object data out of init into separate files and each one made a dataset.
[clsql.git]
/
clsql-mysql.asd
diff --git
a/clsql-mysql.asd
b/clsql-mysql.asd
index 0ac546d23b7616eef3080d2d1c4d517b67b0e7dd..e8d89a871a6c9ddabd85fd490cd45976b05c7983 100644
(file)
--- a/
clsql-mysql.asd
+++ b/
clsql-mysql.asd
@@
-23,8
+23,10
@@
(unless (find-package 'uffi)
(asdf:operate 'asdf:load-op 'uffi)))
(unless (find-package '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,12
+39,12
@@
(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 perform ((o load-op) (c clsql-mysql-source-file))
t)
@@
-50,17
+52,15
@@
(defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
(and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
(find-package '#:mysql)))
(defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
(and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
(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))
@@
-85,8
+85,8
@@
((:module :db-mysql
:components
((:file "mysql-package")
((: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"))