summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTimothy Smith <timothy.smith@sun.com>2009-02-07 16:29:37 +0100
committerTimothy Smith <timothy.smith@sun.com>2009-02-07 16:29:37 +0100
commitaf193ed97e10778c7e62a0b71a0534fc29de12f4 (patch)
tree7824de7ad1c1c8196cff59ffc277e56e02c6e5be /scripts
parent0ea110d8585f478249883928d0fe7bfe08fea80b (diff)
parent5a4e3eaa7a8ca355d6d49d8a9eaa6f1bc8b94aa1 (diff)
downloadmariadb-git-af193ed97e10778c7e62a0b71a0534fc29de12f4.tar.gz
Auto-merge 5.1-build -> 5.1-bugteam
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 339b2a4c219..ee7c36b097d 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -60,13 +60,16 @@ STRIP=1 # Option ignored
SILENT=0
PLATFORM=""
TMP=/tmp
+NEW_NAME="" # Final top directory and TAR package name
SUFFIX=""
+SHORT_PRODUCT_TAG="" # If don't want server suffix in package name
NDBCLUSTER="" # Option ignored
for arg do
case "$arg" in
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
+ --short-product-tag=*) SHORT_PRODUCT_TAG=`echo "$arg" | sed -e "s;--short-product-tag=;;"` ;;
--no-strip) STRIP=0 ;;
--machine=*) machine=`echo "$arg" | sed -e "s;--machine=;;"` ;;
--platform=*) PLATFORM=`echo "$arg" | sed -e "s;--platform=;;"` ;;
@@ -113,7 +116,11 @@ case $PLATFORM in
esac
# Change the distribution to a long descriptive name
-NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX
+if [ x"$SHORT_PRODUCT_TAG" != x"" ] ; then
+ NEW_NAME=mysql-$SHORT_PRODUCT_TAG-@VERSION@-$PLATFORM$SUFFIX
+else
+ NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX
+fi
# ----------------------------------------------------------------------
# Define BASE, and remove the old BASE directory if any