gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Mon Feb 2 12:29:39 EST 2015


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/520492e2 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/516ede1f (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/802ada5d (commit)



commit 520492e2ec3c6623c49c217fa6b0097611b6274b
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Feb 2 11:02:12 2015 -0800

    Fix ACLOCAL_FLAGS, add boost to /c/Users/john/bin:.:/usr/local/bin:/mingw/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Program Files/TortoiseSVN/bin:/c/Windows/System32/WindowsPowerShell/v1.0/:/c/Windows/System32/WindowsPowerShell/v1.0/:/c/Program Files (x86)/QuickTime/QTSystem/:/c/strawberry/c/bin:/c/strawberry/perl/site/bin:/c/strawberry/perl/bin:/c/Program Files (x86)/Oracle/Berkeley DB 11gR2 5.1.29/bin:/c/Program Files/Microsoft SQL Server/110/Tools/Binn/:/c/Program Files/TortoiseGit/bin:/c/Program Files (x86)/Windows Kits/8.1/Windows Performance Toolkit/:/c/Program Files (x86)/Oracle/Berkeley DB 4.8.30/bin:/c/Program Files (x86)/Oracle/Berkeley DB 4.8.30/bin/debug:/c/Program Files/Mercurial in devrc.sh.

diff --git a/devrc.sh b/devrc.sh
index 307b961..73468d5 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -48,8 +48,9 @@ REGEX_UDIR=$GLOBAL_UDIR/regex
 SQLITE3_UDIR=$GLOBAL_UDIR/sqlite3
 SWIG_UDIR=$GLOBAL_UDIR/swig
 WEBKIT_UDIR=$GLOBAL_UDIR/webkit
+BOOST_UDIR=$GLOBAL_UDIR/boost
 
-PATH=$AQBANKING_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$WEBKIT_UDIR/bin
+PATH=$AQBANKING_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
 
 PATH=$PATH:$OLDPATH
 
@@ -57,12 +58,12 @@ export PATH
 
 export LTDL_LIBRARY_PATH=$GNUCASH_UDIR/lib
 export GNOME2_PATH=$GNOME_UDIR
-export ACLOCAL_FLAGS="-I $GNOME_UDIR/share/aclocal -I GUILE_UDIR/share/aclocal"
+export ACLOCAL_FLAGS="-I $GNOME_UDIR/share/aclocal -I $GUILE_UDIR/share/aclocal"
 
 export PKG_CONFIG_PATH="$AQBANKING_UDIR/lib/pkgconfig:$ENCHANT_UDIR/lib/pkgconfig:$GOFFICE_UDIR/lib/pkgconfig:$GNOME_UDIR/lib/pkgconfig:$GNUTLS_UDIR/lib/pkgconfig:$GUILE_UDIR/lib/pkgconfig:$GWENHYWFAR_UDIR/lib/pkgconfig:$GLOBAL_UDIR/isocodes/share/pkgconfig:$LIBGSF_UDIR/lib/pkgconfig:$LIBOFX_UDIR/lib/pkgconfig:$LIBSOUP_UDIR/lib/pkgconfig:$LIBXSLT_UDIR/lib/pkgconfig:$PCRE_UDIR/lib/pkgconfig:$WEBKIT_UDIR/lib/pkgconfig"
 
 export CPPFLAGS="-I$AQBANKING_UDIR/include -I$ENCHANT_UDIR/include -I$GOFFICE_UDIR/include -I$GNOME_UDIR/include -I$GNOME_UDIR/include/glib-2.0 -I$GNOME_UDIR/lib/glib-2.0/include -I$GNUTLS_UDIR/include -I$GUILE_UDIR/include -I$GWENHYWFAR_UDIR/include -I$GLOBAL_UDIR/isocodes/include -I$LIBGSF_UDIR/include -I$LIBOFX_UDIR/include -I$LIBSOUP_UDIR/include -I$LIBXSLT_UDIR/include -I$PCRE_UDIR/include -I$WEBKIT_UDIR/pkgconfig -I$LIBDBI_UDIR/include -D__USE_MINGW_ANSI_STDIO"
 
-export LDFLAGS="-L$AQBANKING_UDIR/lib -L$ENCHANT_UDIR/lib -L$GOFFICE_UDIR/lib -L$GNOME_UDIR/lib -L$GNUTLS_UDIR/lib -L$GUILE_UDIR/lib -L$GWENHYWFAR_UDIR/lib -L$GLOBAL_UDIR/isocodes/lib  -L$LIBGSF_UDIR/lib -L$LIBOFX_UDIR/lib -L$LIBSOUP_UDIR/lib -L$LIBXSLT_UDIR/lib -L$PCRE_UDIR/lib -L$WEBKIT_UDIR/lib -L$LIBDBI_UDIR/lib -L$GLOBAL_UDIR/hh/lib"
+export LDFLAGS="-L$AQBANKING_UDIR/lib -L$ENCHANT_UDIR/lib -L$GOFFICE_UDIR/lib -L$GNOME_UDIR/lib -L$GNUTLS_UDIR/lib -L$GUILE_UDIR/lib -L$GWENHYWFAR_UDIR/lib -L$GLOBAL_UDIR/isocodes/lib  -L$LIBGSF_UDIR/lib -L$LIBOFX_UDIR/lib -L$LIBSOUP_UDIR/lib -L$LIBXSLT_UDIR/lib -L$PCRE_UDIR/lib -L$WEBKIT_UDIR/lib -L$LIBDBI_UDIR/lib -L$GLOBAL_UDIR/hh/lib -L$REGEX_UDIR/lib -L$BOOST_UDIR/lib"
 
 export GIT_CMD=$GLOBAL_UDIR/git/git.exe

commit 516ede1ff2517d7434f81ffc4abbb813cd5648cc
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Feb 2 10:59:27 2015 -0800

    Change default working directory to the user's Documents folder.
    
    From the binary installation directory, the wrong place to save data files.

diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 4c40bb6..56eaf72 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -41,7 +41,7 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
 Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{userdocs}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
 Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
 Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
@@ -49,11 +49,11 @@ Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cm
 Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
 
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{userdocs}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
 
 [Run]
 Filename: "{app}\bin\pango-querymodules.exe"; Parameters: " --system --update-cache"; Flags: runhidden
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{userdocs}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
 Filename: "{app}\bin\guile.cmd"; Flags: runhidden
 
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;



Summary of changes:
 devrc.sh               | 7 ++++---
 inno_setup/gnucash.iss | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)



More information about the gnucash-changes mailing list