Merge lp:~ignacio-nin/percona-server/5.5-debug-binary-builder into lp:percona-server/5.5

[Ignacio Nin]

Related to https://code.launchpad.net/~ignacio-nin/percona-server/5.1-binary-out-of-source/+merge/126065

Add a --debug param

[Stewart Smith (stewart)]

review: Approve

[Ignacio Nin (ignacio-nin)]

Resubmitting with changes from https://code.launchpad.net/~ignacio-nin/percona-server/5.1-binary-out-of-source/+merge/126065's latest change

[lp:~ignacio-nin/percona-server/5.5-debug-binary-builder]

300. By Ignacio Nin on 2012-09-26

Merge changes from 5.1 for building out of source

301. By Ignacio Nin on 2012-09-26

Add a --debug flag to the binary builder

Add a --debug flag that will create a build with the debug-enabled
binaries. Also add -debug to the binary tarball and directory, as well
as the comment, in case it is a debug build.

Unmerged revisions

301. By Ignacio Nin on 2012-09-26

Add a --debug flag to the binary builder

Add a --debug flag that will create a build with the debug-enabled
binaries. Also add -debug to the binary tarball and directory, as well
as the comment, in case it is a debug build.

300. By Ignacio Nin on 2012-09-26

Merge changes from 5.1 for building out of source

=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2012-09-18 05:14:49 +0000
+++ build/build-binary.sh	2012-09-26 18:59:22 +0000
@@ -16,6 +16,8 @@
 TARGET="$(uname -m)"
 TARGET_CFLAGS=''
 QUIET='VERBOSE=1'
+CMAKE_BUILD_TYPE='RelWithDebInfo'
+DEBUG_COMMENT=''
 
 # Some programs that may be overriden
 TAR=${TAR:-tar}
@@ -23,7 +25,7 @@
 # Check if we have a functional getopt(1)
 if ! getopt --test
 then
-    go_out="$(getopt --options="iq" --longoptions=i686,quiet \
+    go_out="$(getopt --options="iqd" --longoptions=i686,quiet,debug \
         --name="$(basename "$0")" -- "$@")"
     test $? -eq 0 || exit 1
     eval set -- $go_out
@@ -38,6 +40,11 @@
         TARGET="i686"
         TARGET_CFLAGS="-m32 -march=i686"
         ;;
+    -d | --debug )
+        shift
+        CMAKE_BUILD_TYPE='Debug'
+        DEBUG_COMMENT='-debug'
+        ;;
     -q | --quiet )
         shift
         QUIET=''
@@ -90,9 +97,9 @@
 # Build information
 REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-PRODUCT_FULL="$PRODUCT_FULL-$REVISION.$(uname -s).$TARGET"
+PRODUCT_FULL="$PRODUCT_FULL-$REVISION$DEBUG_COMMENT.$(uname -s).$TARGET"
 COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
-COMMENT="$COMMENT, Revision $REVISION"
+COMMENT="$COMMENT, Revision $REVISION$DEBUG_COMMENT"
 
 # Compilation flags
 export CC=${CC:-gcc}
@@ -102,19 +109,25 @@
 export MAKE_JFLAG=-j4
 
 # Create a temporary working directory
-INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
-INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR"   # Make it absolute
+TEMPDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
+TEMPDIR="$WORKDIR_ABS/$TEMPDIR"   # Make it absolute
+EXPORTDIR="$TEMPDIR/source"
+INSTALLDIR="$TEMPDIR/install"
 
 # Build
 (
     cd "$SOURCEDIR"
  
-    # Execute clean and download mysql, apply patches
-    make clean all
+    # Export a clean copy to the workdir
+    bzr export "$EXPORTDIR/"
+
+    cd "$EXPORTDIR/"
+    # Prepare source
+    make all
 
     cd "$PRODUCT"
     cmake . -DBUILD_CONFIG=mysql_release \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
         -DWITH_EMBEDDED_SERVER=OFF \
         -DFEATURE_SET=community \
         -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
@@ -129,8 +142,9 @@
     (
         cd "storage/HandlerSocket-Plugin-for-MySQL"
         ./autogen.sh
-        CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR/$PRODUCT" \
-            --with-mysql-bindir="$SOURCEDIR/$PRODUCT/scripts" \
+        CXX=${HS_CXX:-g++} ./configure \
+            --with-mysql-source="$EXPORTDIR/$PRODUCT" \
+            --with-mysql-bindir="$EXPORTDIR/$PRODUCT/scripts" \
             --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
             --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
             --prefix="/usr/local/$PRODUCT_FULL"
@@ -142,7 +156,8 @@
     # Build UDF
     (
         cd "UDF"
-        CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
+        CXX=${UDF_CXX:-g++} ./configure \
+            --includedir="$EXPORTDIR/$PRODUCT/include" \
             --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
         make
         make DESTDIR="$INSTALLDIR" install
@@ -161,5 +176,5 @@
 )
 
 # Clean up
-rm -rf "$INSTALLDIR"
+rm -rf "$TEMPDIR"