r15273 - gnucash/branches/reshuffle-modules/src - In gnc-test-env, define is-windows? based on whether the environment variable "OSTYPE"

[Andreas Köhler]

Author: andi5
Date: 2006-12-28 14:34:06 -0500 (Thu, 28 Dec 2006)
New Revision: 15273
Trac: http://svn.gnucash.org/trac/changeset/15273

Modified:
   gnucash/branches/reshuffle-modules/src/gnc-test-env
Log:
In gnc-test-env, define is-windows? based on whether the environment variable "OSTYPE"
equals "msys". Adjust PATH environment variable on Windows.


Modified: gnucash/branches/reshuffle-modules/src/gnc-test-env
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-test-env	2006-12-28 19:30:10 UTC (rev 15272)
+++ gnucash/branches/reshuffle-modules/src/gnc-test-env	2006-12-28 19:34:06 UTC (rev 15273)
@@ -14,7 +14,10 @@
 ;; Are we on MS Windows here? If yes, make this a #t.
 ;; (utsname:sysname (uname)) wasn't available in my guile-1.6.7 on
 ;; mingw, so I don't know an automated way to do this so far.
-(define is-windows? #f)
+(define is-windows?
+  (let ((ostype (getenv "OSTYPE")))
+    (and ostype
+	 (string=? ostype "msys"))))
 
 (define args (cdr (command-line)))
 (define display-exports? #t)
@@ -118,12 +121,13 @@
 
 (if is-windows?
     (begin
-      (display " PATH=${PATH}")
+      (display " PATH=\"${PATH}")
       (display (apply string-append
 		      (map
 		       (lambda (dir)
-			 (string-append ":" dir ":" dir "/.libs"))
-		       (append gnc-module-dirs library-dirs))))))
+			 (string-append ":" dir "/.libs"))
+		       library-dirs)))
+      (display "\"")))
 
 (if display-exports?
     (begin
@@ -131,7 +135,9 @@
       (display " export GNC_MODULE_PATH;")
       (display " export GUILE_LOAD_PATH;")
       (display " export LD_LIBRARY_PATH;")
-      (display " export DYLD_LIBRARY_PATH;")))
+      (display " export DYLD_LIBRARY_PATH;")
+      (if is-windows?
+	  (display " export PATH;"))))
 
 ;; Local Variables:
 ;; mode: scheme