r22329 - gnucash/trunk/packaging/win32 - Win32 nightly: match built package name to the one expected for upload

[Geert Janssens]

Author: gjanssens
Date: 2012-08-17 16:30:41 -0400 (Fri, 17 Aug 2012)
New Revision: 22329
Trac: http://svn.gnucash.org/trac/changeset/22329

Modified:
   gnucash/trunk/packaging/win32/dist-impl.sh
Log:
Win32 nightly: match built package name to the one expected for upload

Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh	2012-08-17 16:13:03 UTC (rev 22328)
+++ gnucash/trunk/packaging/win32/dist-impl.sh	2012-08-17 20:30:41 UTC (rev 22329)
@@ -310,8 +310,11 @@
     if [ "$BUILD_FROM_TARBALL" = "no" ]; then
         # 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}-${REPOS_TYPE}-r${SVN_REV}-setup.exe"
+        REVISION=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+        if [ "$REPOS_TYPE" = "svn" ]; then
+          SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
+        else
+          SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
         qpushd ${_GNUCASH_UDIR}
             mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
         qpopd