r22306 - gnucash/trunk/packaging/win32 - Win32: more automated build from git fixes

[Geert Janssens]

Author: gjanssens
Date: 2012-08-12 15:36:50 -0400 (Sun, 12 Aug 2012)
New Revision: 22306
Trac: http://svn.gnucash.org/trac/changeset/22306

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/dist-impl.sh
Log:
Win32: more automated build from git fixes
- use consistent naming for the final installer executable
- Default to no for UPDATE_SOURCES

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2012-08-11 16:29:56 UTC (rev 22305)
+++ gnucash/trunk/packaging/win32/defaults.sh	2012-08-12 19:36:50 UTC (rev 22306)
@@ -29,6 +29,8 @@
     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 @@
     # 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

Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh	2012-08-11 16:29:56 UTC (rev 22305)
+++ gnucash/trunk/packaging/win32/dist-impl.sh	2012-08-12 19:36:50 UTC (rev 22306)
@@ -311,7 +311,7 @@
         # 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