r15232 - gnucash/branches/reshuffle-modules - Clean up gnc-test-env

Andreas Köhler andi5 at cvs.gnucash.org
Tue Dec 19 04:06:52 EST 2006


Author: andi5
Date: 2006-12-19 04:06:46 -0500 (Tue, 19 Dec 2006)
New Revision: 15232
Trac: http://svn.gnucash.org/trac/changeset/15232

Modified:
   gnucash/branches/reshuffle-modules/
   gnucash/branches/reshuffle-modules/src/gnc-test-env
Log:
Clean up gnc-test-env
* --gnc-module-dir params are added to $GNC_MODULE_PATH
* --guile-load-dir params are added to $GUILE_LOAD_PATH
* Drop --library-dir, $LD_LIBRARY_PATH and $LTDL_LIBRARY_PATH




Property changes on: gnucash/branches/reshuffle-modules
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1004
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1005
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/branches/reshuffle-modules/src/gnc-test-env
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-test-env	2006-12-19 09:06:23 UTC (rev 15231)
+++ gnucash/branches/reshuffle-modules/src/gnc-test-env	2006-12-19 09:06:46 UTC (rev 15232)
@@ -3,8 +3,7 @@
 !#
 
 ;; Spit out the environment variable settings needed based on
-;; arguments listing gnc-module-dirs, guile-load-dirs, and
-;; library-dirs
+;; arguments listing gnc-module-dirs and guile-load-dirs
 
 (use-modules (srfi srfi-13) (srfi srfi-14)) ;; for string-tokenize
 (debug-enable 'backtrace)
@@ -21,13 +20,11 @@
 
 (define gnc-module-dirs '())
 (define guile-load-dirs '())
-(define library-dirs '())
 
 (define (usage-death)
   (display "Usage: gnc-test-env [ --no-exports ]\n")
   (display "                    [ (--gnc-module-dir dir | \n")
   (display "                       --guile-load-dir dir | \n")
-  (display "                       --library-dir dir) ... ]\n")
   (exit 1))
 
 (define (process-args! args)
@@ -40,13 +37,9 @@
      ((string=? "--guile-load-dir" (car rest))
       (set! guile-load-dirs (cons (cadr rest) guile-load-dirs))
       (loop (cddr rest)))
-     ((string=? "--library-dir" (car rest))
-      (set! library-dirs (cons (cadr rest) library-dirs))
-      (loop (cddr rest)))
      (else (usage-death))))
   (set! gnc-module-dirs (reverse gnc-module-dirs))
-  (set! guile-load-dirs (reverse guile-load-dirs))
-  (set! library-dirs (reverse library-dirs)))
+  (set! guile-load-dirs (reverse guile-load-dirs)))
 
 ;; The character set of everything except a directory separator as
 ;; necessary for string-tokenize below
@@ -84,33 +77,23 @@
 
 (process-args! args)
 
-(display "GNC_MODULE_PATH=${GNC_MODULE_PATH}:")
+(display "GNC_MODULE_PATH=\"${GNC_MODULE_PATH}")
+(display path-sep-str)
 (display (adapt-dirsep
-	  (string-join gnc-module-dirs
-		       ":")))
+	  (string-join (map
+			(lambda (dir)
+			  (string-append dir "/.libs"))
+			gnc-module-dirs)
+		       path-sep-str)))
+(display "\"")
 
 (display " GUILE_LOAD_PATH=\"${GUILE_LOAD_PATH}")
 (display path-sep-str)
 (display (adapt-dirsep
-	  (string-join (append gnc-module-dirs guile-load-dirs)
+	  (string-join guile-load-dirs
 		       path-sep-str)))
 (display "\"")
 
-(display " LD_LIBRARY_PATH=${LD_LIBRARY_PATH}")
-(display (adapt-dirsep
-	  (apply string-append
-		 (map
-		  (lambda (dir)
-		    (string-append ":" dir ":" dir "/.libs"))
-		  (append gnc-module-dirs library-dirs)))))
-
-(display " LTDL_LIBRARY_PATH=${LTDL_LIBRARY_PATH}")
-(display (apply string-append
-                (map
-                 (lambda (dir)
-                   (string-append ":" dir ":" dir "/.libs"))
-                 (append gnc-module-dirs library-dirs))))
-
 (if is-windows?
     (begin
       (display " PATH=${PATH}")
@@ -124,9 +107,7 @@
     (begin
       (display "; ")
       (display " export GNC_MODULE_PATH;")
-      (display " export GUILE_LOAD_PATH;")
-      (display " export LD_LIBRARY_PATH;")
-      (display " export LTDL_LIBRARY_PATH;")))
+      (display " export GUILE_LOAD_PATH;")))
 
 ;; Local Variables:
 ;; mode: scheme



More information about the gnucash-changes mailing list