r18143 - gnucash/trunk - Fix bug 586296 – Generated gnucash-dbg and gnucash-valgrind scripts are inconsistent with the

[Phil Longstaff]

Author: plongstaff
Date: 2009-06-21 09:02:58 -0400 (Sun, 21 Jun 2009)
New Revision: 18143
Trac: http://svn.gnucash.org/trac/changeset/18143

Modified:
   gnucash/trunk/packaging/win32/install.sh
   gnucash/trunk/src/bin/gnucash-gdb.in
   gnucash/trunk/src/bin/gnucash-valgrind.in
Log:
Fix bug 586296 – Generated gnucash-dbg and gnucash-valgrind scripts are inconsistent with the
gnucash script - patch by Daniel Harding.


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2009-06-21 00:12:29 UTC (rev 18142)
+++ gnucash/trunk/packaging/win32/install.sh	2009-06-21 13:02:58 UTC (rev 18143)
@@ -1222,12 +1222,12 @@
     done
 
     if [ -z $_skip_scripts ]; then
-        # Try to fix the paths in the "gnucash" script
+        # Try to fix the paths in the "gnucash" and related scripts
         qpushd $_BUILD_UDIR/src/bin
             rm gnucash
             make PATH_SEPARATOR=";" \
                 bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
-                gnucash
+                gnucash gnucash-gdb gnucash-valgrind
         qpopd
     fi
     

Modified: gnucash/trunk/src/bin/gnucash-gdb.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-gdb.in	2009-06-21 00:12:29 UTC (rev 18142)
+++ gnucash/trunk/src/bin/gnucash-gdb.in	2009-06-21 13:02:58 UTC (rev 18143)
@@ -6,27 +6,24 @@
 GUILE_WARN_DEPRECATED="no"
 export GUILE_WARN_DEPRECATED
 
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
+GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_PATH}"
 
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_GUILE_MODULE_DIR-@"
+EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
+GUILE_LOAD_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@${GUILE_LOAD_PATH}"
 
 EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
 
-LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-TOP_SRC_DIR="@-TOP_SRC_DIR-@"
+LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
 GNC_DBD_DIR="@-GNC_DBD_DIR-@"
 
 export GNC_MODULE_PATH
 export GUILE_LOAD_PATH
 export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
 export GNC_DBD_DIR
 
-#
-# Other potentially useful options, particularly for valgrind-2.x:
-# --tool=memcheck --trace-children=yes
-#
 exec gdb gnucash-bin "$@"

Modified: gnucash/trunk/src/bin/gnucash-valgrind.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-valgrind.in	2009-06-21 00:12:29 UTC (rev 18142)
+++ gnucash/trunk/src/bin/gnucash-valgrind.in	2009-06-21 13:02:58 UTC (rev 18143)
@@ -6,23 +6,25 @@
 GUILE_WARN_DEPRECATED="no"
 export GUILE_WARN_DEPRECATED
 
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
+GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_PATH}"
 
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_GUILE_MODULE_DIR-@"
+EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
+GUILE_LOAD_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@${GUILE_LOAD_PATH}"
 
 EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
 
-LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
 TOP_SRC_DIR="@-TOP_SRC_DIR-@"
 GNC_DBD_DIR="@-GNC_DBD_DIR-@"
 
 export GNC_MODULE_PATH
 export GUILE_LOAD_PATH
 export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
 export GNC_DBD_DIR
 
 #