Fix win32 report directory startup problem on win32.

In order to help keep the various places run-time environment is created in sync, add a
comment to each place suggesting that environment changes should be reflected in all 4
places.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18263 57a11ea4-9604-0410-9ed3-97b8803252fd
pull/1/head
Phil Longstaff 17 years ago
parent 513a610d0b
commit cf8b473d0a

@ -190,6 +190,9 @@ begin
pkgdatadir := appdir + '\share\gnucash';
{ Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
{ If you make any changes here, you should probably also change the equivalent sections }
{ in packaging/win32/install.sh, src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in }
FileName := appdir + '\bin\gnucash.cmd' ;
FileString := 'setlocal'#13#10 ;
FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
@ -201,6 +204,7 @@ begin
FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
FileString := FileString + 'start gnucash-bin %*'#13#10 ;

@ -1286,6 +1286,9 @@ function make_install() {
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
# If you make any changes here, you should probably also change
# the equivalent sections in packaging/win32/gnucash.iss.in,
# src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > gnucash.cmd
echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" >> gnucash.cmd

@ -1,3 +1,6 @@
# If you make any changes here, you should probably also change the equivalent sections
# in packaging/win32/gnucash.iss.in, packaging/win32/install.sh and src/bin/gnucash-setup-env.in
PATH="@-BIN_DIR-@:${PATH}"
export PATH
XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg

@ -1,6 +1,10 @@
# gnucash-setup-env
#
# Common environment setup used by different gnucash startup scripts
#
# If you make any changes here, you should probably also change the equivalent sections
# in packaging/win32/gnucash.iss.in, packaging/win32/install.sh and
# src/bin/gnucash-setup-env-osx.in
PATH="@-BIN_DIR-@:${PATH}"
export PATH

Loading…
Cancel
Save