From d6e40e1032b47f85de47aa0ce883d315a3dd2ddd Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Tue, 31 Mar 2009 17:31:17 +0200 Subject: [PATCH] Handle the two part version number of cluster builds (general server part + NDB part) automatically when creating a binary package, include only the NDBpart in the package (file) name. scripts/make_binary_distribution.sh: The "version" string of a cluster build contains information about both the general server part and the NDB part. This is intentional, but it isn't suitable for the package file name. When packaging a binary build, the script now detects whether it is dealing with a cluster build or not. If it is a cluster build, the script now removes the server part from the version number, leaving the NDB part. Example: "5.1.31-ndb-6.4.2" -> "6.4.2" so packages are named like "mysql-cluster-gpl-6.4.2-linux-i686-glibc23.tar.gz" --- scripts/make_binary_distribution.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index ee7c36b097d..152225f86b1 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -116,10 +116,15 @@ case $PLATFORM in esac # Change the distribution to a long descriptive name +# For the cluster product, concentrate on the second part +VERSION_NAME=@VERSION@ +case $VERSION_NAME in + *-ndb-* ) VERSION_NAME=`echo $VERSION_NAME | sed -e 's/[.0-9]*-ndb-//'` ;; +esac if [ x"$SHORT_PRODUCT_TAG" != x"" ] ; then - NEW_NAME=mysql-$SHORT_PRODUCT_TAG-@VERSION@-$PLATFORM$SUFFIX + NEW_NAME=mysql-$SHORT_PRODUCT_TAG-$VERSION_NAME-$PLATFORM$SUFFIX else - NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX + NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$VERSION_NAME-$PLATFORM$SUFFIX fi # ----------------------------------------------------------------------