From e074ec99552d25c54eaf0dbd92f3c004a5295fa5 Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Sun, 12 Aug 2012 19:36:50 +0000
Subject: [PATCH] Win32: more automated build from git fixes - use consistent
 naming for the final installer executable - Default to no for UPDATE_SOURCES

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22306 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/defaults.sh  | 4 ++--
 packaging/win32/dist-impl.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index dc84cf418e..14f85429f1 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -29,6 +29,8 @@ if [ -z "$BUILD_FROM_TARBALL" ]; then
     fi
 fi
 
+# only change this to "yes" if you are using install.sh from the outside the repository checkout
+set_default UPDATE_SOURCES noyes
 if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
     UPDATE_SOURCES=no
     set_default GNUCASH_DIR "$(wpwd ..\\..)"
@@ -36,8 +38,6 @@ if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
     # keep this pointing from BUILD_DIR to REPOS_DIR
     set_default REL_REPOS_DIR ..
 else
-    # change this to "no" if you are using install.sh from the same repository checkout
-    set_default UPDATE_SOURCES yes
     set_default GNUCASH_DIR $GLOBAL_DIR\\gnucash
     set_default REPOS_DIR $GNUCASH_DIR\\repos
     # keep this pointing from BUILD_DIR to REPOS_DIR
diff --git a/packaging/win32/dist-impl.sh b/packaging/win32/dist-impl.sh
index 181c5c6f4c..58c068735e 100755
--- a/packaging/win32/dist-impl.sh
+++ b/packaging/win32/dist-impl.sh
@@ -311,7 +311,7 @@ function dist_finish() {
         # And changing output filename
         PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
         SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
-        SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+        SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${SVN_REV}-setup.exe"
         qpushd ${_GNUCASH_UDIR}
             mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
         qpopd