diff options
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 8 | ||||
| -rwxr-xr-x | Build-tools/Do-compile | 2 | ||||
| -rwxr-xr-x | Build-tools/Do-rpm | 25 |
3 files changed, 25 insertions, 10 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index c236fe20f99..a9989aae768 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -63,9 +63,13 @@ aclocal; autoheader; aclocal; automake; autoconf --with-low-memory \ --with-mit-threads=yes $EXTRA_CONFIG \ --enable-thread-safe-client \ - --with-berkeley-db \ --enable-local-infile \ - --with-innodb + --with-berkeley-db \ + --with-innodb \ + --with-vio \ + --without-pstack \ + --with-extra-tools \ + --with-embedded-server gmake -j 2 diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index e0e7fb51933..39af865a68e 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -221,7 +221,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) { system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); safe_cd("${test_dir}/mysql-test"); - check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --sleep=10", "tests were successful"); + check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); } # Start the server if we are going to run any of the benchmarks diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index 046ba93a1dd..6ce8c9c3e45 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -5,6 +5,7 @@ function copy_to_bmachine { if [ x$local_build = x1 ]; then + rm -f $2 cp $1 $2 else scp $1 $owner@$bmachine:$2 @@ -14,6 +15,7 @@ function copy_to_bmachine function copy_from_bmachine { if [ x$local_build = x1 ]; then + rm -f $2 cp $1 $2 else scp $owner@$bmachine:$1 $2 @@ -90,10 +92,7 @@ while test $# -gt 0; do done echo "Removing old MySQL packages" -rm -rf $rpmdir/BUILD/mysql-* -rm -f $rpmdir/SOURCES/mysql-* -rm -f $rpmdir/SRPMS/MySQL-* -rm -f $rpmdir/SPEC/mysql-* +rm -f $bpath/NEW-RPMS/MySQL-*rpm if [ ! -d "$logdir" ]; then echo "$logdir does not exist, creating" @@ -105,12 +104,20 @@ if [ ! -f "$tarball" ]; then exit 1 fi -echo "Building RPM for MySQL version $VER on $bmachine" - log=$logdir/Log-RPM-`date +%y%m%d-%H%M` +echo "Building RPM for MySQL version $VER on $bmachine" +echo "Details in $log" + ( set -x +# remove old stuff +rm -rf $rpmdir/BUILD/mysql-* +rm -f $rpmdir/SOURCES/mysql-* +rm -f $rpmdir/SRPMS/MySQL-* +rm -f $rpmdir/SPECS/mysql-* +rm -rf /var/tmp/mysql + # Copy MySQL source and spec files #Sasha: I left the scp stuff commented out instead of deleted to make it @@ -156,7 +163,7 @@ if [ ! x$skip_perl=x1 ]; then set -x # First clean up so we do not get old versions when wildcard matching - rm -f $rpmdir/SOURCES/DBI-*.spec + rm -f $rpmdir/SOURCES/DBI-*.spec $rpmdir/SOURCES/mysql* rm -f $rpmdir/RPMS/i386/Perl-*.rpm rm -f $rpmdir/SRPMS/Perl-*.rpm rm -f $rpmdir/RPMS/i386/MySQL*-$VER_NO_DASH*.rpm @@ -226,5 +233,9 @@ if [ x$local_build != x1 ]; then # And the perl ones #scp $owner@$bmachine:$rpmdir/RPMS/i386/Perl*-*.rpm $bpath/NEW-RPMS #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS + + #Remove some of the files that can interfere with future builds + + rm -rf /var/tmp/mysql fi ) > $log 2>&1 |