gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/57290a2a (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/34f50a33 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/45bd108b (commit)



commit 57290a2ae8b98ac7f4d1878585137a569295fb98
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 16 20:08:55 2016 +0000

    Ensure GIT_CMD is defined even when build_package is called directly.

diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 93e1fbf..5a0b6dd 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -4,7 +4,10 @@
 # This assumes we're in the "gnucash-on-windows" directory for the correct build.
 # It could be for tag build environment, or it could
 # be the top-level daily-build gnucash-on-windows directory.
-# Note: GIT_CMD below should have been set by a calling script.
+# For this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
 #
 
 set -o pipefail
@@ -26,6 +29,9 @@ GC_WIN_DIR="$BUILDSERVER_DIR/.."
 . ./defaults.sh
 . ./custom.sh
 
+_GIT_UDIR=`unix_path $GIT_DIR`
+set_env "$_GIT_UDIR/bin/git" GIT_CMD
+export GIT_CMD
 tag="${1:-$GNUCASH_SCM_REV}"
 
 # Determine where to upload to

commit 34f50a339268b2e29f4cc2173a790e43b3e37064
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 16 20:08:23 2016 +0000

    Fix error in config.h location.
    
    This *finally* fixes copying built packages to code.

diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index f19f39d..93e1fbf 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -88,7 +88,7 @@ _GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
 if [ "$WITH_CMAKE" == "yes" ]; then
   _GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
 fi
-PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H} | cut -d" " -f3 | cut -d\" -f2 `
 REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
 
 if [ "$BUILD_FROM_TARBALL" = "no" ]; then



Summary of changes:
 buildserver/build_package.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)