gnucash-on-windows master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/ce5f39c3 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/fceb5ccf (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/90df81e9 (commit)



commit ce5f39c3d0d7c61106f37e7a75fd7bf4ca33f633
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed May 6 17:05:47 2015 +0200

    Remove some commented out setup steps
    
    They were leftovers from before the migration to mingw-get
    and haven't been missed since.

diff --git a/install-impl.sh b/install-impl.sh
index 358b5dd..8dc5947 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -190,14 +190,7 @@ function inst_mingw() {
 
     if [ "$CROSS_COMPILE" != "yes" ]; then
         mingw_smart_get mingw32-pexports ${MINGW_PEXPORTS_VERSION}
-        # Some additional steps, only for native (non-cross-compile)
-        #cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
-        echo "Skipping lpthread copying for now, let's see if this is still needed..."
-        #mingw_smart_get mingw32-make ${MINGW_MAKE_VERSION}
-        echo "Skipping mingw32-make installation for now, let's see if this is still needed..."
         quiet which pexports || die "mingw-utils not installed correctly (pexports)"
-        # FIXME which library uses reimp ?
-        # quiet which reimp || die "mingw-utils not installed correctly (reimp)"
         # Hack to make Gnome's pkg-config happy (without having to rebuild it)
         cp "${_MINGW_UDIR}"/bin/libintl*.dll "${_MINGW_UDIR}/bin/intl.dll"
     else

commit fceb5ccfbab3c0e99a03777829149ec5eb268331
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed May 6 16:43:04 2015 +0200

    Move boost requirement in inst_boost instead of during step addition
    
    During the step addition phase perl is not installed yet.
    However perl is required to check the gnucash version being
    built and hence also to check whether boost is needed or not.

diff --git a/install-impl.sh b/install-impl.sh
index 8ae9798..358b5dd 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1245,6 +1245,13 @@ function inst_hh() {
 
 function inst_boost() {
     setup Boost
+    get_major_minor "$GNUCASH_SCM_REV"
+    if [ "$GNUCASH_SCM_REV" != "master" ] &&
+        (( $major_minor <= 206 )); then
+        echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
+        return
+    fi
+
     _BOOST_UDIR=`unix_path ${BOOST_DIR}`
     set_env ${_BOOST_UDIR} BOOST_ROOT
     add_to_env ${_BOOST_UDIR}/lib PATH
diff --git a/install.sh b/install.sh
index 8aff08b..0208432 100644
--- a/install.sh
+++ b/install.sh
@@ -100,11 +100,7 @@ add_step inst_libsoup
 add_step inst_enchant
 add_step inst_webkit
 #boost now needed for C++ on master only
-get_major_minor "$GNUCASH_SCM_REV"
-if [ "$GNUCASH_SCM_REV" = "master" ] ||
-   (( $major_minor > 206 )); then
-  add_step inst_boost
-fi
+add_step inst_boost
 
 ##
 if [ "$WITH_CUTECASH" = "yes" ]; then



Summary of changes:
 install-impl.sh | 14 +++++++-------
 install.sh      |  6 +-----
 2 files changed, 8 insertions(+), 12 deletions(-)