gnucash-on-windows master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Mon Jun 30 16:01:28 EDT 2014


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/0619dcfc (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/2695c31c (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/f541965a (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/822ea718 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/7f59327a (commit)



commit 0619dcfc1ef76500c763b70cf54e78f76edb770d
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Jun 30 20:28:21 2014 +0200

    Use standard sourceforge mirror for boost package

diff --git a/defaults.sh b/defaults.sh
index 18b9983..9480006 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -383,7 +383,7 @@ set_default XSLTPROCFLAGS ""
 set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz"
 set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
 
-set_default BOOST_URL "http://downloads.sf.net/boost/boost/boost_1_55_0.tar.bz2"
+set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
 set_default BOOST_DIR $GLOBAL_DIR\\boost
 
 ### Local Variables: ***

commit 2695c31caf8f40321eec6a5182dbff45a9034fd6
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Jun 30 20:25:00 2014 +0200

    Restore sourceforge mirror url

diff --git a/defaults.sh b/defaults.sh
index 003595d..18b9983 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -72,7 +72,7 @@ set_default MSYS_PATCH_VERSION "2.6.1-1"
 set_default MSYS_PERL_VERSION  "5.8.8-1"
 set_default MSYS_UNZIP_VERSION "6.0-1"
 
-set_default SF_MIRROR "http://heanet.sourceforge.net/sourceforge"
+set_default SF_MIRROR "http://heanet.dl.sourceforge.net/sourceforge"
 set_default GTK_MIRROR "ftp.gtk.org/pub"
 set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
 set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"

commit f541965a843553f3b5cc582f5366f4dd6efbfefb
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Jun 30 20:20:52 2014 +0200

    Fix hhc not found error

diff --git a/install-impl.sh b/install-impl.sh
index 289c27c..30a65af 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1158,7 +1158,7 @@ function inst_hh() {
 
     add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
     add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
-    add_to_env $_HH_UDIR PATH
+    add_to_env "$_HH_SYS_UDIR" PATH
     if quiet test_for_hh
     then
         echo "html help workshop already installed in $_HH_UDIR.  skipping."

commit 822ea7181e9bac07870e23c46be1dc36e84e568f
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Jun 30 20:20:36 2014 +0200

    Remove debugging message

diff --git a/install-impl.sh b/install-impl.sh
index 5b5863b..289c27c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1238,7 +1238,6 @@ function inst_cutecash() {
 
 function inst_gnucash() {
     setup GnuCash
-    echo $BOOST_ROOT
     _INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
     _BUILD_UDIR=`unix_path $BUILD_DIR`



Summary of changes:
 defaults.sh     | 4 ++--
 install-impl.sh | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list