Commit 853a2f01 authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Make sure ib_config.h is distributed. 

Clean up Do-all-build-steps.
parent 9bbe5179

Build-tools/Do-all-build-steps

+15 −4
Original line number Diff line number Diff line 
#!/bin/bash

#!/bin/sh



WD=`pwd`

# Don't write a wrong path for BD !!!!!

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.$$



# We build on work
@@ -76,15 +84,18 @@ sh $BD/Build-tools/Do-rpm 
rm -f $TMP_SCRIPT

END



set -e



log=$WD/Logs/Log-distcheck-`date +%y%m%d-%H%M`



echo "Logging script $TMP_SCRIPT into $log"

if test $to_host = "mysql-work"

then

  # Try to get the right user for MySQL builds on work so that all

  # 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

  time bash $TMP_SCRIPT > $log 2>&1

  time sh $TMP_SCRIPT > $log 2>&1

fi



# Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from

innobase/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
AUTOMAKE_OPTIONS =	foreign

TAR =			gtar



noinst_HEADERS = ib_config.h



SUBDIRS =		os ut btr buf com data dict dyn eval fil fsp fut \

			ha ibuf include lock log mach mem mtr odbc page \

			pars que read rem row srv sync thr trx usr