[elephant-cvs] CVS elephant

[ieslick]

Update of /project/elephant/cvsroot/elephant
In directory clnet:/tmp/cvs-serv1438

Modified Files:
	TODO ele-bdb.asd elephant.asd 
Log Message:
Small changes for lispworks; mainly fixing pointer types

--- /project/elephant/cvsroot/elephant/TODO	2007/03/12 01:32:05	1.70
+++ /project/elephant/cvsroot/elephant/TODO	2007/03/16 14:44:44	1.71
@@ -13,12 +13,12 @@
 
 Bugs:
 - Fix db open bug in SQlite
-- Fix Henrik's bugs (if still there)
 
 Migration:
 - Validate SQL migration 0.6.0->0.6.1 (Robert)
 
 Lisp Support:
+- Validate Lispworks on Mac
 - Validate Lispworks on PC
 - Validate OpenMCL pre-1.1 on Mac OS X
 - Validate OpenMCL 1.1 and/or 64-bit on Mac OS X?
--- /project/elephant/cvsroot/elephant/ele-bdb.asd	2007/03/12 01:32:05	1.20
+++ /project/elephant/cvsroot/elephant/ele-bdb.asd	2007/03/16 14:44:44	1.21
@@ -32,7 +32,7 @@
 (defmethod compiler-options ((compiler (eql :gcc)) (c bdb-c-source) &key &allow-other-keys)
   (append (library-directories c)
 	  (call-next-method)
-	  #-linux (list "-ldb45")))
+	  #-(or linux) (list "-ldb-4.5")))
 
 (defmethod compiler-options ((compiler (eql :cygwin)) (c bdb-c-source) &key &allow-other-keys)
   (append (library-directories c)
@@ -40,8 +40,8 @@
 	  (list "-ldb45")))
 
 (defun library-directories (c)
-  (let ((include (make-pathname :directory (get-config-option :berkeley-db-include-dir c)))
-	(lib (make-pathname :directory (get-config-option :berkeley-db-lib-dir c))))
+  (let ((include (make-pathname :defaults (get-config-option :berkeley-db-include-dir c)))
+	(lib (make-pathname :defaults (get-config-option :berkeley-db-lib-dir c))))
     #+(or windows mswindows)
     (list (format nil "-L\"~A\"" lib) (format nil "-I\"~A\"" include))
     #-(or windows mswindows)
@@ -49,9 +49,9 @@
 
 (defmethod foreign-libraries-to-load-first ((c bdb-c-source))
   (remove-if #'(lambda (x) (null (car x)))
-	     (list
-	      (cons (get-config-option :pthread-lib c) "pthread")
-	      (cons (get-config-option :berkeley-db-lib c) "berkeley-db"))))
+	     (list (cons (get-config-option :pthread-lib c) "pthread")
+	      (cons (get-config-option :berkeley-db-lib c) 
+		    (get-config-option :berkeley-db-lib c)))))
 
 ;;
 ;; System definition
--- /project/elephant/cvsroot/elephant/elephant.asd	2007/03/01 02:46:42	1.36
+++ /project/elephant/cvsroot/elephant/elephant.asd	2007/03/16 14:44:44	1.37
@@ -126,7 +126,7 @@
                              (compiler-options (c-compiler c) c
                                                :input-file
                                                (list (format nil "\"~A\"" (namestring 
-                                                                           (make-pathname :type "o" :defaults pathname)))
+                                                                           (make-pathname :type "o" :defaults patohname)))
                                                      "exports.o")
                                                :output-file (format nil "\"~A\"" (first (output-files o c)))
                                                :library t))))
@@ -211,7 +211,8 @@
    #+(and X86-64 linux) "-march=x86-64"
    "-fPIC"
    "-Wall"
-   "-O3"
+   "-O2"
+   "-g"
    input-file
    "-o" output-file
    "-lm"))
@@ -237,13 +238,15 @@
 
 (defmethod perform ((o load-op) (c elephant-c-source))
   ;; Load any required external libraries
-  (dolist (file+module (foreign-libraries-to-load-first c))
-    (destructuring-bind (file . module) file+module
-      (or (uffi-funcall :load-foreign-library file :module module)
-	  (error "Could not load ~A into ~A" file module))))
+  (let ((libs (foreign-libraries-to-load-first c)))
+    (dolist (file+module libs)
+      (destructuring-bind (file . module) file+module
+	(format t "Loading ~A~%" file)
+	(or (uffi-funcall :load-foreign-library file :module module)
+	    (error "Could not load ~A into ~A" file module)))))
   ;; Load the compiled libraries
   (dolist (file (output-files (make-instance 'compile-op) c))
-    (format t "~A" file)
+    (format t "Loading ~A~%" file)
     (or (uffi-funcall :load-foreign-library file :module (component-name c))
 	(error "Could not load ~A" file))))