diff options
| -rw-r--r-- | BUILD/FINISH.sh | 15 | ||||
| -rw-r--r-- | BUILD/SETUP.sh | 15 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
3 files changed, 22 insertions, 9 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 48d9c7ad21b..41eab2442d7 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -17,19 +17,24 @@ cd innobase aclocal; autoheader; aclocal; automake; autoconf cd .. -CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure +CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure" -$make $AM_MAKEFLAGS" - -if [ "x$strip" = "xyes" ] +if [ -z "$just_configure" ] then commands="$commands +$make $AM_MAKEFLAGS" + + if [ "x$strip" = "xyes" ] + then + commands="$commands + mkdir -p tmp nm --numeric-sort sql/mysqld > tmp/mysqld.sym objdump -d sql/mysqld > tmp/mysqld.S strip sql/mysqld" -fi + fi +fi if test -z "$nonono" then diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 9c267589ad6..7e0810dfd1c 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -5,18 +5,25 @@ then fi nonono= -case "$1" in --n | --just-print ) nonono=1; shift ;; --h | --help ) cat <<EOF; exit 0 ;; +just_configure= +while test $# -gt 0 +do + case "$1" in + -c | --just-configure ) just_configure=1; shift ;; + -n | --just-print ) nonono=1; shift ;; + -h | --help ) cat <<EOF; exit 0 ;; Usage: $0 [-h|-n] [configure-options] -h, --help Show this help message. -n, --just-print Don't actually run any commands; just print them. + -c, --just-configure Stop after running configure. Any other options will be passed directly to configure. Note: this script is intended for internal use by MySQL developers. EOF -esac + * ) break ;; + esac +done set -e diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index df595c5af4c..c6b865e50ad 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -5,3 +5,4 @@ sasha@mysql.sashanet.com serg@serg.mysql.com monty@donna.mysql.fi tim@threads.polyesthetic.msg +tim@work.mysql.com |