Merge lp:~ignacio-nin/percona-server/5.1-binary-out-of-source into lp:percona-server/5.1

[Ignacio Nin]

[Laurynas Biveinis (laurynas-biveinis)]

Perhaps "make clean" is not required then, is it?

review: Needs Information

[Ignacio Nin (ignacio-nin)]

make clean is not required indeed, as the branch has been just exported. Resubmitting without it.

Unmerged revisions

482. By Ignacio Nin on 2012-09-11

Build out of source (binary builder)

Instead of building in the source for the binary builder, export to
another directory and build there.

=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2012-08-31 12:52:50 +0000
+++ build/build-binary.sh	2012-09-26 18:39:23 +0000
@@ -101,15 +101,21 @@
 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"
     ./configure \
@@ -137,8 +143,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"
@@ -150,7 +157,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
@@ -169,5 +177,5 @@
 )
 
 # Clean up
-rm -rf "$INSTALLDIR"
+rm -rf "$TEMPDIR"