Merge lp:~ourdelta-core/ourdelta/ourdelta-mariadb51 into lp:~ourdelta-core/ourdelta/trunk015fmt

[Kristian Nielsen]

[Kristian Nielsen (knielsen)]

Initial scripts for 5.1 binaries based on MariaDB as upstream. Source tarballs and bintar package only.

[Arjen Lentz (arjen-lentz)]

Bits might need work and adding... Toby working on this. Although it's separate scripts, best to get it all sorted before merging into trunk.

review: Needs Fixing (testing)

[lp:~ourdelta-core/ourdelta/ourdelta-mariadb51]

57. By Kristian Nielsen on 2009-09-30

Use BUILD/compile-dist instead of long custom ./configure
The BUILD/compile-dist script will be kept up-to-date using Buildbot, so this reduces the
risk of accidentally missing some stuff due to incorrect ./configure option.

Unmerged revisions

57. By Kristian Nielsen on 2009-09-30

Use BUILD/compile-dist instead of long custom ./configure
The BUILD/compile-dist script will be kept up-to-date using Buildbot, so this reduces the
risk of accidentally missing some stuff due to incorrect ./configure option.

=== modified file 'bakery/autobake-bintar.sh'
--- bakery/autobake-bintar.sh	2009-03-25 12:54:42 +0000
+++ bakery/autobake-bintar.sh	2009-09-30 13:37:10 +0000
@@ -20,6 +20,10 @@
 BUILD_BASE_DIR="$(pwd)/build-temp-$$"
 INSTALLROOT="/usr/local/mysql"
 
+# Source our shared util functions.
+#
+. ${BAKERY_BASE_DIR}/util/util.sh
+
 if [ ! $# -eq 1 ]; then
 	echo "Usage: $0 [tarball]"
 	echo "    tarball: ourdelta or ourdelta-sail tarball"
@@ -84,16 +88,7 @@
 OURDELTA_VERSION_STRING="${UPSTREAM}-d${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}${REPO_VERSION}-$(uname -o | cut -d '/' -f 2)-$(uname -m)"
 
 
-case `gcc -dumpmachine` in
-          x86_64-*)
-                # gcc barfs on -march=... on x64
-                CPUOPT="-m64 -mtune=generic"
-                ;;
-          *)
-                # we'd use i586 to not trip up mobile/lowpower devices
-                CPUOPT="-m32 -march=i586 -mtune=generic"
-                ;;
-esac
+get_cpuopt
 
 # we need the following to set up proper for Sphinx Engine
 sh BUILD/autorun.sh

=== added file 'bakery/autobake-bintar51.sh'
--- bakery/autobake-bintar51.sh	1970-01-01 00:00:00 +0000
+++ bakery/autobake-bintar51.sh	2009-09-30 13:37:10 +0000
@@ -0,0 +1,98 @@
+#! /bin/bash
+
+# Build generic binaries.
+#
+# We link libc dynamically, otherwise we get lots of problems loading
+# .so files at runtime (either system stuff like NSS, or server
+# plugins).
+#
+# We link libgcc statically (and avoid linking libstdc++ at all by
+# CXX=gcc), to avoid reduce nasty library version dependencies.
+
+# Abort on error
+set -e
+
+BAKERY_BASE_DIR="$(dirname $(readlink -f ${0}))"
+INSTALLROOT="/usr/local/mysql"
+
+TARBALL="${1}"
+if [ -z "$TARBALL" ]; then
+	echo 1>&2 "Usage: $0 tarball.tar.gz"
+	exit 1
+fi
+
+WORKDIR="build-temp-$$"
+
+if [ ! -f "$TARBALL" ]; then
+	echo 1>&2 "Can't find tarball: $TARBALL"
+	exit 1
+else
+	TARBALL="$(readlink -f "$TARBALL")"
+fi
+
+# Determine source name
+#
+SOURCE_DIR=$(basename ${TARBALL} .tar.gz)
+BINDIST_NAME="$SOURCE_DIR-$(uname -o | cut -d '/' -f 2)-$(uname -m)"
+
+if [ -e "$INSTALLROOT" ]; then
+	echo "${INSTALLROOT} exists, move it out of the way first"
+	exit 2
+fi
+
+if [ -e "/usr/local/$BINDIST_NAME" ]; then
+	echo "/usr/local/$BINDIST_NAME exists, move it out of the way first"
+	exit 2
+fi
+
+
+# Source our shared util functions.
+#
+. ${BAKERY_BASE_DIR}/util/util.sh
+
+echo "Unpacking sources..."
+
+mkdir "$WORKDIR"
+cd "$WORKDIR"
+tar zxf "$TARBALL"
+cd "$SOURCE_DIR"
+
+echo "Compiling ..."
+
+get_cpuopt
+
+# Use gcc rather than g++ to avoid linking libstdc++.so (which we don't need).
+
+COMP="gcc -static-libgcc"
+FLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall $CPUOPT"
+
+CC="$COMP" CXX="$COMP" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \
+	./configure \
+	--prefix=/usr/local/mysql \
+	--exec-prefix=/usr/local/mysql \
+	--libexecdir=/usr/local/mysql/bin \
+	--localstatedir=/usr/local/mysql/data \
+	--with-comment="(OurDelta - http://ourdelta.org/)" \
+	--with-system-type=linux-gnu \
+	--enable-shared --enable-static \
+	--enable-thread-safe-client --enable-local-infile --with-big-tables \
+	--without-docs --with-extra-charsets=all \
+	--with-libwrap --with-ssl --with-readline --with-libevent --with-zlib-dir=bundled \
+	--with-partition --with-embedded-server \
+	--with-plugins=max-no-ndb \
+	> build.log 2>&1
+make -j4 >> build.log 2>&1
+
+echo "Building binary distribution..."
+
+make install >> build.log 2>&1
+mv /usr/local/mysql "/usr/local/$BINDIST_NAME"
+
+cd ..
+cd ..
+
+tar zcf "$BINDIST_NAME.tar.gz" -C /usr/local/ "$BINDIST_NAME/" && rm -Rf "/usr/local/$BINDIST_NAME"
+
+echo "Successfully build generic bintar package $BINDIST_NAME.tar.gz"
+
+exit 0

=== added file 'bakery/tarbake51.sh'
--- bakery/tarbake51.sh	1970-01-01 00:00:00 +0000
+++ bakery/tarbake51.sh	2009-09-30 13:37:10 +0000
@@ -0,0 +1,61 @@
+#! /bin/bash
+
+# Script to produce source tarball from Launchpad bzr repo for OurDelta builds.
+#
+# Kristian Nielsen <[e-mail]>
+
+# Abort on error.
+set -e
+
+# For a release, it is important to know which bzr revision was used
+# to do the release. So fail if none specified, rather than default to
+# latest.
+#
+# (One can specify last:1 for latest version).
+#
+# Also, it is best to use revid: specifications, as revno: numbers are
+# not stable, and can change whenever new stuff is merged.
+#
+# After the release, the revision specified here should be tagged (or
+# can specify tag: revision if placing tag before release).
+
+BZR_REVSPEC="${1}"
+if [ -z "$BZR_REVSPEC" ]; then
+	echo 1>&2 "Usage: $0 bzr-revisionspec"
+	exit 1
+fi
+BZR_BRANCH="${2}"
+if [ -z "$BZR_BRANCH" ]; then
+	BZR_BRANCH="lp:maria/5.1"
+fi
+
+echo "Checking out sources from bzr repo..."
+
+# Make sure we have a shared repository, so we don't have to download
+# everything every time.
+
+bzr info . >/dev/null 2>&1 || bzr init-repo .
+WORKDIR="build-temp-$$"
+test -d "$WORKDIR" && rm -Rf "$WORKDIR"
+bzr checkout "$BZR_BRANCH" "$WORKDIR"
+
+echo "Building..."
+
+cd "$WORKDIR"
+BUILD/compile-dist > build.log 2>&1
+
+echo "Making source tarball..."
+
+make dist >> build.log 2>&1
+
+# Grab the version info from configure.in to know tarball names.
+set $(perl -ne 'print "$1 $2" if /AM_INIT_AUTOMAKE\((.*), (.*)\)/' configure.in)
+echo >../.mariadb-version "PACKAGE_NAME=$1"    # we may change this to mariadb later
+echo >>../.mariadb-version "VERSION=$2"
+source ../.mariadb-version
+TARBALL="${PACKAGE_NAME}-${VERSION}.tar.gz"
+mv "$TARBALL" ..
+cd ..
+rm -Rf "$WORKDIR"
+
+echo "Successfully made source tarball $TARBALL"

=== modified file 'bakery/util/util.sh'
--- bakery/util/util.sh	2008-11-05 02:03:01 +0000
+++ bakery/util/util.sh	2009-09-30 13:37:10 +0000
@@ -23,3 +23,18 @@
 	fi
 	return 0
 }
+
+# Setting cpu options.
+get_cpuopt () {
+	case "$(gcc -dumpmachine)" in
+          x86_64-*)
+                # gcc barfs on -march=... on x64
+                CPUOPT="-m64 -mtune=generic"
+                ;;
+          *)
+                # we'd use i586 to not trip up mobile/lowpower devices
+                CPUOPT="-m32 -march=i586 -mtune=generic"
+                ;;
+	esac
+	return 0
+}