r18149 - gnucash/trunk/src/bin - Separate environment variable setup into common file
Phil Longstaff
plongstaff at code.gnucash.org
Sun Jun 21 13:41:29 EDT 2009
Author: plongstaff
Date: 2009-06-21 13:41:29 -0400 (Sun, 21 Jun 2009)
New Revision: 18149
Trac: http://svn.gnucash.org/trac/changeset/18149
Added:
gnucash/trunk/src/bin/gnucash-setup-env.in
Modified:
gnucash/trunk/src/bin/
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/bin/gnucash-gdb.in
gnucash/trunk/src/bin/gnucash-valgrind.in
gnucash/trunk/src/bin/gnucash.in
Log:
Separate environment variable setup into common file
Property changes on: gnucash/trunk/src/bin
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
*.diff
*.diffs
*.patch
*.log
*.xac.*.xac
Makefile
Makefile.in
gnucash
gnucash-bin
gnucash-gdb
gnucash-env
gnucash-make-guids
gnucash-run-script
gnucash-valgrind
strsub
update-gnucash-gconf
semantic.cache
i18n.h
TAGS
*.exe
+ .deps
.libs
*.diff
*.diffs
*.patch
*.log
*.xac.*.xac
Makefile
Makefile.in
gnucash
gnucash-bin
gnucash-gdb
gnucash-env
gnucash-make-guids
gnucash-run-script
gnucash-setup-env
gnucash-valgrind
strsub
update-gnucash-gconf
semantic.cache
i18n.h
TAGS
*.exe
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2009-06-21 17:32:34 UTC (rev 18148)
+++ gnucash/trunk/src/bin/Makefile.am 2009-06-21 17:41:29 UTC (rev 18149)
@@ -32,30 +32,17 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la
-gnucash: gnucash.in ${top_builddir}/config.status Makefile
+gnucash: gnucash.in gnucash-setup-env ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
- -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
- -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
- -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
- -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g'
+ -e 's#@-BIN_DIR-@#${bindir}#g'
mv $@.tmp $@
chmod u+x $@
-gnucash-gdb: gnucash-gdb.in ${top_builddir}/config.status Makefile
+gnucash-gdb: gnucash-gdb.in gnucash-setup-env ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
- -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
- -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
- -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
- -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g" \
- -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g'
+ -e 's#@-BIN_DIR-@#${bindir}#g'
mv $@.tmp $@
chmod u+x $@
@@ -63,6 +50,14 @@
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's#@-BIN_DIR-@#${bindir}#g' \
+ -e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g"
+ mv $@.tmp $@
+ chmod u+x $@
+
+gnucash-setup-env: gnucash-setup-env.in ${top_builddir}/config.status Makefile
+ rm -f $@.tmp
+ sed < $< > $@.tmp \
+ -e 's#@-BIN_DIR-@#${bindir}#g' \
-e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
-e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
-e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
@@ -92,13 +87,24 @@
# by these top-level "common" scripts.
gnc_common_scripts = gnucash-env gnucash-make-guids
-bin_SCRIPTS = ${gnc_common_scripts} update-gnucash-gconf gnucash gnucash-valgrind gnucash-gdb
+bin_SCRIPTS = \
+ ${gnc_common_scripts} \
+ update-gnucash-gconf \
+ gnucash \
+ gnucash-valgrind \
+ gnucash-gdb \
+ gnucash-setup-env
# if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
-EXTRA_DIST = generate-gnc-script update-gnucash-gconf.in \
- gnucash.in gnucash-valgrind.in gnucash-gdb.in
+EXTRA_DIST = \
+ generate-gnc-script \
+ update-gnucash-gconf.in \
+ gnucash.in \
+ gnucash-valgrind.in \
+ gnucash-gdb.in \
+ gnucash-setup-env.in
## Gnucash scripts -- real code is in overrides, these just get you there.
${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status
Modified: gnucash/trunk/src/bin/gnucash-gdb.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-gdb.in 2009-06-21 17:32:34 UTC (rev 18148)
+++ gnucash/trunk/src/bin/gnucash-gdb.in 2009-06-21 17:41:29 UTC (rev 18149)
@@ -1,29 +1,5 @@
#!/bin/sh
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
+. @-BIN_DIR-@/gnucash-setup-env
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_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}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
-
-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
-
exec gdb gnucash-bin "$@"
Added: gnucash/trunk/src/bin/gnucash-setup-env.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-setup-env.in (rev 0)
+++ gnucash/trunk/src/bin/gnucash-setup-env.in 2009-06-21 17:41:29 UTC (rev 18149)
@@ -0,0 +1,29 @@
+# gnucash-setup-env
+#
+# Common environment setup used by different gnucash startup scripts
+
+PATH="@-BIN_DIR-@:${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_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}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
+
+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
Modified: gnucash/trunk/src/bin/gnucash-valgrind.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-valgrind.in 2009-06-21 17:32:34 UTC (rev 18148)
+++ gnucash/trunk/src/bin/gnucash-valgrind.in 2009-06-21 17:41:29 UTC (rev 18149)
@@ -1,32 +1,8 @@
#!/bin/sh
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
+. @-BIN_DIR-@/gnucash-setup-env
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_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}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
-
-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
-
#
# Other potentially useful options, particularly for valgrind-2.x:
# --tool=memcheck --trace-children=yes
Modified: gnucash/trunk/src/bin/gnucash.in
===================================================================
--- gnucash/trunk/src/bin/gnucash.in 2009-06-21 17:32:34 UTC (rev 18148)
+++ gnucash/trunk/src/bin/gnucash.in 2009-06-21 17:41:29 UTC (rev 18149)
@@ -1,29 +1,5 @@
#!/bin/sh
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
+. @-BIN_DIR-@/gnucash-setup-env
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_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}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
-
-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
-
exec gnucash-bin "$@"
More information about the gnucash-changes
mailing list