Commit 277d59b8 authored by unknown's avatar unknown

Make sure ib_config.h is distributed.

Clean up Do-all-build-steps.


Build-tools/Do-all-build-steps:
  Make this script run on machines other than mysql-work.
innobase/Makefile.am:
  Make sure ib_config.h is distributed.
parent f652a372
#!/bin/bash #!/bin/sh
WD=`pwd` WD=`pwd`
# Don't write a wrong path for BD !!!!! # Don't write a wrong path for BD !!!!!
BD=/my/tmp/BUILD if [ -w /my/tmp ]
then
BD=/my/tmp/BUILD
elif [ -n "$TMPDIR" ]
then
BD=$TMPDIR/BUILD
else
BD=/tmp/BUILD
fi
TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$ TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$
# We build on work # We build on work
...@@ -76,15 +84,18 @@ sh $BD/Build-tools/Do-rpm ...@@ -76,15 +84,18 @@ sh $BD/Build-tools/Do-rpm
rm -f $TMP_SCRIPT rm -f $TMP_SCRIPT
END END
set -e
log=$WD/Logs/Log-distcheck-`date +%y%m%d-%H%M` log=$WD/Logs/Log-distcheck-`date +%y%m%d-%H%M`
echo "Logging script $TMP_SCRIPT into $log"
if test $to_host = "mysql-work" if test $to_host = "mysql-work"
then then
# Try to get the right user for MySQL builds on work so that all # Try to get the right user for MySQL builds on work so that all
# files is owned by the same user (mysql) # files is owned by the same user (mysql)
ssh -n $to_host -l my "time bash $TMP_SCRIPT" > $log 2>&1 ssh -n $to_host -l my "time sh $TMP_SCRIPT" > $log 2>&1
else else
time bash $TMP_SCRIPT > $log 2>&1 time sh $TMP_SCRIPT > $log 2>&1
fi fi
# Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from # Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
TAR = gtar TAR = gtar
noinst_HEADERS = ib_config.h
SUBDIRS = os ut btr buf com data dict dyn eval fil fsp fut \ SUBDIRS = os ut btr buf com data dict dyn eval fil fsp fut \
ha ibuf include lock log mach mem mtr odbc page \ ha ibuf include lock log mach mem mtr odbc page \
pars que read rem row srv sync thr trx usr pars que read rem row srv sync thr trx usr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment