bk commit into 4.0 tree (lenz:1.2121)

[lenz]

Below is the list of changes that have just been committed into a local
4.0 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2121 05/07/06 13:58:29 lenz@stripped +1 -0
  - backported a change for make_binary_distribution.sh from 5.0 for easier building of
    all versions: added an option "--machine" that allows to override the autodetected
    architecture string (e.g. "i386") that becomes part of the binary package name with 
    a different one
  - moved the removal of the BASE directory to the end of the make_binary_distribution
    script

  scripts/make_binary_distribution.sh
    1.61 05/07/06 13:58:27 lenz@stripped +11 -0
    - backported and fixed a change from 5.0 for easier building of all versions: added an
      option "--machine" that allows to override the autodetected architecture string 
      (e.g. "i386") that becomes part of the binary package name with a different one
    - moved the removal of the BASE directory to the end of the script

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.0-build

--- 1.60/scripts/make_binary_distribution.sh	2005-06-01 12:59:07 +02:00
+++ 1.61/scripts/make_binary_distribution.sh	2005-07-06 13:58:27 +02:00
@@ -15,6 +15,7 @@
 STRIP=1
 DEBUG=0
 SILENT=0
+MACHINE=
 TMP=/tmp
 SUFFIX=""
 
@@ -25,6 +26,7 @@
       --tmp=*)    TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
       --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
       --no-strip) STRIP=0 ;;
+      --machine=*)  MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
       --silent)   SILENT=1 ;;
       *)
 	echo "Unknown argument '$arg'"
@@ -252,8 +254,17 @@
   find $BASE/sql-bench -name SCCS -print | xargs rm -r -f
 fi
 
+# Use the override --machine if present
+if [ -n "$MACHINE" ] ; then
+  machine=$MACHINE
+fi
+
 # Change the distribution to a long descriptive name
 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
 rm -r -f $BASE2
 mv $BASE $BASE2