Handle BUILD_FROM_TARBALL special for tag builds.

(Don't put the svn # in there)

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18125 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2009-06-13 13:42:02 +00:00
parent aa0a88039f
commit cc55697374
2 changed files with 14 additions and 1 deletions

View File

@ -38,7 +38,14 @@ _BUILD_UDIR=`unix_path $BUILD_DIR`
_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}
#

View File

@ -58,6 +58,12 @@ for tag in $tags ; do
# 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}