diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-05-15 16:03:22 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-05-15 16:03:22 +0300 |
| commit | feef9ed1de74a6eed17f0b93c46fcf10bb525f36 (patch) | |
| tree | d856200ac1d0551f4315dd0b893a584e168a0cca /scripts | |
| parent | 65febd1abfc16f4e23aeae2bead29b1d1c972382 (diff) | |
| parent | 23f36c89dd72470a6ffc7cf1d6b0a0b46c71af62 (diff) | |
| download | mariadb-git-feef9ed1de74a6eed17f0b93c46fcf10bb525f36.tar.gz | |
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 9 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 2 |
2 files changed, 8 insertions, 3 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 # ---------------------------------------------------------------------- diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 5eb5a5643f1..3360d8459f8 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -126,7 +126,7 @@ if [ -e $DESTDIR ] ; then usage fi -trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR +trap 'echo "Cleaning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR # ---------------------------------------------------------------------- # Adjust target name if needed, release with debug info has another name |