[elephant-cvs] CVS elephant

[ieslick]

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

Modified Files:
	TODO elephant.asd 
Log Message:
Tweaks for lispworks compatability

--- /project/elephant/cvsroot/elephant/TODO	2007/02/25 20:02:29	1.63
+++ /project/elephant/cvsroot/elephant/TODO	2007/02/26 19:12:18	1.64
@@ -29,6 +29,7 @@
 - Validate OpenMCL 1.1 and/or 64-bit on Mac OS X?
   - 64-bit lisp verification
 - Verify db_deadlock for other lisps (launch and kill background program I/F)
+  sbcl and allegro are OK
 
 Test coverage:
 - Clean up interface to tests
--- /project/elephant/cvsroot/elephant/elephant.asd	2007/02/22 20:24:11	1.34
+++ /project/elephant/cvsroot/elephant/elephant.asd	2007/02/26 19:12:18	1.35
@@ -60,8 +60,8 @@
 
 
 (defvar *c-compilers*
-  '((:gcc . "/usr/bin/gcc")
-    (:cygwin . "c:\\cygwin\\usr\\bin\\gcc")
+  '((:gcc . "gcc")
+    (:cygwin . "gcc")
     (:msvc . ""))
   "Associate compilers with platforms for compiling libmemutil/libsleepycat")
 
@@ -94,32 +94,32 @@
   "Run the appropriate compiler for this platform on the source, getting
    the specific options from 'compiler-options method.  Default options 
    can be overridden or augmented by subclass methods"
-  #+windows 
+  #+(or mswindows windows)
   (progn
     (let ((pathname (component-pathname c)))
       (unless (zerop (run-shell-command
 		      (format nil "~A ~{~A ~}"
 			      (c-compiler-path c)
 			      (compiler-options (c-compiler c) c
-						:input-file (namestring pathname)
+						:input-file (format nil "\"~A\"" (namestring pathname))
 						:output-file nil
 						:library nil))))
 	(error 'operation-error :component c :operation o))
       (unless (zerop (run-shell-command
 		      (format nil "dlltool -z ~A --export-all-symbols -e exports.o -l ~A ~A"
-			      (namestring (make-pathname :type "def" :defaults pathname))
-			      (namestring (make-pathname :type "lib" :defaults pathname))
-			      (namestring (make-pathname :type "o" :defaults pathname)))))
+			      (format nil "\"~A\"" (namestring (make-pathname :type "def" :defaults pathname)))
+			      (format nil "\"~A\"" (namestring (make-pathname :type "lib" :defaults pathname)))
+			      (format nil "\"~A\"" (namestring (make-pathname :type "o" :defaults pathname))))))
 	(error 'operation-error :component c :operation o))
       (unless (zerop (run-shell-command
 		      (format nil "~A ~{~A ~} -I~A -L~A -l~A"
 			      (c-compiler-path c)
 			      (compiler-options (c-compiler c) c
 						:input-files 
-						(list (namestring 
-						       (make-pathname :type "o" :defaults pathname))
+						(list (format nil "\"~A\"" (namestring 
+						       (make-pathname :type "o" :defaults pathname)))
 						      "exports.o")
-						:output-file (first (output-files o c))
+						:output-file (format nil "\"~A\"" (first (output-files o c)))
 						:library t))))
 	(error 'operation-error :component c :operation o))))
   #-windows
@@ -156,15 +156,16 @@
 
 (defmethod compiler-options ((compiler (eql :cygwin)) (c elephant-c-source) &key input-file output-file library &allow-other-keys)
   (unless input-file
-    (error "Must specify both input and output files"))
-  `(,@(when library (list "-shared"))
-      "-mno-cygwin"
-      "-mwindows"
-      "-Wall"
-      ,@(unless library (list "-c -std=c99"))
-      "-std=c99"
-      ,@(when (symbolp input-file) (list input-file) input-file)
-      ,@(when output-file (list "-o" output-file))))
+    (error "Must specify both input files"))
+  (append
+   (when library (list "-shared"))
+   (list 
+    "-mno-cygwin"
+    "-mwindows"
+    "-Wall")
+    (unless library (list "-c -std=c99"))
+    (if (listp input-file) input-file (list input-file))
+    (when output-file (list "-o" output-file))))
 
 ;;Cygwin script:
 ;;gcc -mno-cygwin -mwindows -std=c99 -c libmemutil.c