mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build scripts/make_binary_distribution.sh: Auto merged
This commit is contained in:
@ -15,6 +15,7 @@ MV="mv"
|
|||||||
STRIP=1
|
STRIP=1
|
||||||
DEBUG=0
|
DEBUG=0
|
||||||
SILENT=0
|
SILENT=0
|
||||||
|
MACHINE=
|
||||||
TMP=/tmp
|
TMP=/tmp
|
||||||
SUFFIX=""
|
SUFFIX=""
|
||||||
NDBCLUSTER=
|
NDBCLUSTER=
|
||||||
@ -26,6 +27,7 @@ parse_arguments() {
|
|||||||
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
||||||
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
||||||
--no-strip) STRIP=0 ;;
|
--no-strip) STRIP=0 ;;
|
||||||
|
--machine=*) MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
|
||||||
--silent) SILENT=1 ;;
|
--silent) SILENT=1 ;;
|
||||||
--with-ndbcluster) NDBCLUSTER=1 ;;
|
--with-ndbcluster) NDBCLUSTER=1 ;;
|
||||||
*)
|
*)
|
||||||
@ -286,8 +288,17 @@ if [ x$NDBCLUSTER = x1 ]; then
|
|||||||
rm -rf $BASE/ndb-stage
|
rm -rf $BASE/ndb-stage
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Use the override --machine if present
|
||||||
|
if [ -n "$MACHINE" ] ; then
|
||||||
|
machine=$MACHINE
|
||||||
|
fi
|
||||||
|
|
||||||
# Change the distribution to a long descriptive name
|
# Change the distribution to a long descriptive name
|
||||||
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX
|
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX
|
||||||
|
|
||||||
|
# Print the platform name for build logs
|
||||||
|
echo "PLATFORM NAME: $system-$machine"
|
||||||
|
|
||||||
BASE2=$TMP/$NEW_NAME
|
BASE2=$TMP/$NEW_NAME
|
||||||
rm -r -f $BASE2
|
rm -r -f $BASE2
|
||||||
mv $BASE $BASE2
|
mv $BASE $BASE2
|
||||||
|
Reference in New Issue
Block a user