r18125 - gnucash/trunk/packaging/win32 - Handle BUILD_FROM_TARBALL special for tag builds.

[Derek Atkins]

Author: warlord
Date: 2009-06-13 09:42:02 -0400 (Sat, 13 Jun 2009)
New Revision: 18125
Trac: http://svn.gnucash.org/trac/changeset/18125

Modified:
   gnucash/trunk/packaging/win32/build_package.sh
   gnucash/trunk/packaging/win32/build_tags.sh
Log:
Handle BUILD_FROM_TARBALL special for tag builds.
(Don't put the svn # in there)

Modified: gnucash/trunk/packaging/win32/build_package.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_package.sh	2009-06-13 04:43:36 UTC (rev 18124)
+++ gnucash/trunk/packaging/win32/build_package.sh	2009-06-13 13:42:02 UTC (rev 18125)
@@ -38,7 +38,14 @@
 _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
 PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
 SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
-SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+
+# Choose the output filename based on our "build_from_tarball" setting
+# Make sure this logic matches the logic in dist.sh!
+if [ "$BUILD_FROM_TARBALL" = "no" ]; then
+  SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+else
+  SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
+fi
 mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
 
 #

Modified: gnucash/trunk/packaging/win32/build_tags.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_tags.sh	2009-06-13 04:43:36 UTC (rev 18124)
+++ gnucash/trunk/packaging/win32/build_tags.sh	2009-06-13 13:42:02 UTC (rev 18125)
@@ -58,6 +58,12 @@
   # No need to update the sources we just checked out
   echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
 
+  # BUILD_FROM_TARBALL is special:
+  # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
+  # We want it to look like 'no' in install and defaults, but yes in dist
+  # so this hack works!
+  echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
+
   # Now build the tag!  (this will upload it too)
   qpushd ${w32pkg}
     ./build_package.sh ${tag}