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.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

[Alexey Kopytov (akopytov)]

Using "bzr export" means it will be impossible to use build-binary.sh when the source directory is not a bazaar branch, e.g. has been unpacked from a source tarball.

I don't understand why we need that.

[Ignacio Nin (ignacio-nin)]

> Using "bzr export" means it will be impossible to use build-binary.sh when the
> source directory is not a bazaar branch, e.g. has been unpacked from a source
> tarball.

Indeed, however these scripts convenience scripts meant for using with the full branch when we're building the packages (or a sample), not for the exported source. For an exported source a standard configure/make procedure should be used (and only the Percona-Server/ subdirectory).

Please notice that bzr(1) and a .bzr/ directory was already a requirement for the script since we use bzr revno for adding the revision number to the binary name.

[Stewart Smith (stewart)]

Alexey Kopytov <email address hidden> writes:
> Using "bzr export" means it will be impossible to use build-binary.sh
> when the source directory is not a bazaar branch, e.g. has been
> unpacked from a source tarball.
>
> I don't understand why we need that.

I'm of the idea that we should actually produce source tarball and then
build from it... this would ensure that our source tarball can be used
to build every binary we ship....

Perhaps build-binary.sh needs to check for .bzr and if so, call a (newly
created) build-source-tarball.sh which is basically just bzr export?

--
Stewart Smith

[Alexey Kopytov (akopytov)]

As discussed on IRC, we can fix build scripts to work when the source is
from a tarball by adding a REVNO file to the top-level directory in
tarballs. So the build scripts can use it, if it is available and resort
to bzr if it is not (or creating a tarball first, then using it to
build).

[Alexey Kopytov (akopytov)]

review: Needs Fixing

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	2013-03-25 17:49:38 +0000
+++ build/build-binary.sh	2013-04-19 15:30:42 +0000
@@ -101,14 +101,20 @@
 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
+    # Export a clean copy to the workdir
+    bzr export "$EXPORTDIR/"
+
+    cd "$EXPORTDIR/"
+    # Prepare source
     make clean all
 
     cd "$PRODUCT"
@@ -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"