Merge (1e802e10) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -698,6 +698,8 @@ ndb/examples/ndbapi_example2/ndbapi_example2
		ndb/examples/ndbapi_example3/ndbapi_example3
		ndb/examples/ndbapi_example5/ndbapi_example5
		ndb/examples/select_all/select_all
		ndb/include/ndb_global.h
		ndb/include/ndb_version.h
		ndb/lib/libMGM_API.so
		ndb/lib/libNDB_API.so
		ndb/lib/libNDB_ODBC.so

BUILD/compile-dist

0 → 100755

+47 −0

Original line number	Diff line number	Diff line
		#!/bin/sh
		#
		# This script's purpose is to update the automake/autoconf helper scripts and
		# to run a plain "configure" without any special compile flags. Only features
		# that affect the content of the source distribution are enabled. The resulting
		# tree can then be picked up by "make dist" to create the "pristine source
		# package" that is used as the basis for all other binary builds.
		#
		make distclean
		aclocal
		autoheader
		libtoolize --automake --force --copy
		automake --force --add-missing --copy
		autoconf
		(cd bdb/dist && sh s_all)
		(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

		# Default to gcc for CC and CXX
		if test -z "$CXX" ; then
		export CXX=gcc
		fi

		if test -z "$CC" ; then
		export CC=gcc
		fi

		# Use ccache, if available
		if ccache -V > /dev/null 2>&1
		then
		if ! (echo "$CC" \| grep "ccache" > /dev/null)
		then
		export CC="ccache $CC"
		fi
		if ! (echo "$CXX" \| grep "ccache" > /dev/null)
		then
		export CXX="ccache $CXX"
		fi
		fi

		# Make sure to enable all features that affect "make dist"
		./configure \
		--with-embedded-server \
		--with-berkeley-db \
		--with-innodb \
		--enable-thread-safe-client \
		--with-ndbcluster
		make

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ paul@frost.snake.net
		paul@ice.local
		paul@ice.snake.net
		paul@kite-hub.kitebird.com
		paul@snake-hub.snake.net
		paul@teton.kitebird.com
		pekka@mysql.com
		pem@mysql.com

Build-tools/Bootstrap

+24 −22

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ else
		}

		# Some predefined settings
		$build_command= "BUILD/compile-pentium-max";
		$build_command= "BUILD/compile-dist";
		$PWD= cwd();
		$opt_docdir= $PWD . "/mysqldoc";
		$opt_archive_log= undef;
		@@ -122,18 +122,8 @@ if (($opt_directory ne $PWD) && (!-d $opt_directory && !$opt_dry_run))
		#
		if ($opt_pull)
		{
		&logger("Updating BK tree $REPO to latest ChangeSet first");
		chdir ($REPO) or &abort("Could not chdir to $REPO!");
		&run_command("bk pull", "Could not update $REPO!");
		chdir ($PWD) or &abort("Could not chdir to $PWD!");

		unless ($opt_skip_manual)
		{
		&logger("Updating manual tree in $opt_docdir");
		chdir ($opt_docdir) or &abort("Could not chdir to $opt_docdir!");
		&run_command("bk pull", "Could not update $opt_docdir!");
		chdir ($PWD) or &abort("Could not chdir to $PWD!");
		}
		&bk_pull("$REPO");
		&bk_pull("$opt_docdir") unless ($opt_skip_manual);
		}

		#
		@@ -262,7 +252,7 @@ if (defined $opt_changelog)
		$msg= "Adding $target_dir/ChangeLog";
		$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";
		&logger($msg);
		$command= "bk changes -mv";
		$command= "bk changes -v";
		$command.= " -r" if ($opt_changelog ne "" \|\| $opt_revision);
		$command.= $opt_changelog if $opt_changelog ne "";
		$command.= ".." if ($opt_changelog ne "" && !$opt_revision);
		@@ -270,7 +260,7 @@ if (defined $opt_changelog)
		$command.= " " . $REPO . " > $target_dir/ChangeLog";
		&logger($command);
		# We cannot use run_command here because of output redirection
		if (!$opt_dry_run)
		unless ($opt_dry_run)
		{
		system($command) == 0 or &abort("Could not create $target_dir/ChangeLog!");
		}
		@@ -281,17 +271,17 @@ if (defined $opt_changelog)
		#
		unless ($opt_skip_manual)
		{
		$msg= "Updating manual files";
		&logger($msg);
		&logger("Updating manual files");
		foreach $file qw/internals manual reservedwords/
		{
		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0
		or &abort("Could not update $file.texi in $target_dir/Docs/!");
		}
		system ("rm -f $target_dir/Docs/Images/Makefile*") == 0
		or &abort("Could not remove Makefiles in $target_dir/Docs/Images/!");
		system ("cp $opt_docdir/Docs/Images/. $target_dir/Docs/Images") == 0
		or &abort("Could not copy image files in $target_dir/Docs/Images/!");

		&run_command("rm -f $target_dir/Docs/Images/Makefile*",
		"Could not remove Makefiles in $target_dir/Docs/Images/!");
		&run_command("cp $opt_docdir/Docs/Images/. $target_dir/Docs/Images",
		"Could not copy image files in $target_dir/Docs/Images/!");
		}

		#
		@@ -377,6 +367,18 @@ if ($opt_archive_log)

		exit 0;

		#
		# Run a BK pull on the given BK tree
		#
		sub bk_pull
		{
		my $bk_tree= $_[0];
		&logger("Updating BK tree $bk_tree to latest ChangeSet first");
		chdir ($bk_tree) or &abort("Could not chdir to $bk_tree!");
		&run_command("bk pull", "Could not update $bk_tree!");
		chdir ($PWD) or &abort("Could not chdir to $PWD!");
		}

		#
		# Print the help text message (with an optional message on top)
		#

Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,14 +23,14 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
		SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
		@readline_topdir@ sql-common \
		@thread_dirs@ pstack \
		@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
		@sql_union_dirs@ scripts man tests \
		netware @libmysqld_dirs@ \
		@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

		DIST_SUBDIRS = . include @docs_dirs@ zlib \
		@readline_topdir@ sql-common \
		@thread_dirs@ pstack \
		@sql_server_dirs@ @sql_client_dirs@ scripts @man_dirs@ tests SSL\
		@sql_union_dirs@ scripts @man_dirs@ tests SSL\
		BUILD netware os2 @libmysqld_dirs@ \
		@bench_dirs@ support-files @fs_dirs@ @tools_dirs@