Merge lp:~saviq/unity/phablet.protect-local-build-revisions into lp:unity/phablet

[Michał Sawicz]

only use revisions known to be working in build_unity script

Due to HUD changing build system and then bumping API version, we've had breakage of the build scripts.

Let's protect ourselves by keeping an explicit revision number that we know is working.

[Nick Dedekind (nick-dedekind)]

LGTM.
tested with full rebuild.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:532
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/239
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/587

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/238/rebuild

review: Approve (continuous-integration)

=== modified file 'build_unity'
--- build_unity	2013-04-02 09:19:49 +0000
+++ build_unity	2013-04-03 10:13:23 +0000
@@ -9,6 +9,13 @@
 NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
 LENSES="applications mockmusic mockvideos"
 
+# verified working revisions
+NUX_REV=763
+LIBUNITY_REV=214
+UNITY_REV=3257
+PEOPLE_LENS_REV=73
+HUD_REV=365
+
 usage() {
     echo "usage: build_unity [OPTIONS]\n"
     echo "Script to build Unity on Ubuntu 12.10.\n"
@@ -98,9 +105,11 @@
 compile_nux() {
     if [ -d $TARGET_DIR/nux ]; then
         echo "Configuring Nux.."
+
         if $CLEAN; then bzr clean-tree -d $TARGET_DIR/nux --quiet --unknown --ignored --force; fi
 
         cd $TARGET_DIR/nux
+        bzr revert --quiet -r $NUX_REV || exit 7
 
         ./autogen.sh --prefix $BUILD_DIR --disable-debug --disable-documentation
 
@@ -111,9 +120,11 @@
 
 compile_libunity() {
     echo "Configuring libunity.."
+
     if $CLEAN; then bzr clean-tree -d $TARGET_DIR/libunity --quiet --unknown --ignored --force; fi
 
     cd $TARGET_DIR/libunity
+    bzr revert --quiet -r $LIBUNITY_REV || exit 8
 
     ./autogen.sh --prefix $BUILD_DIR --disable-debug
 
@@ -124,8 +135,12 @@
 
 compile_unity_core() {
     echo "Configuring Unity.."
+
     if $CLEAN; then bzr clean-tree -d $TARGET_DIR/unity --quiet --unknown --ignored --force; fi
 
+    cd $TARGET_DIR/unity
+    bzr revert --quiet -r $UNITY_REV || exit 9
+
     mkdir $TARGET_DIR/unity/build
     cd $TARGET_DIR/unity/build
 
@@ -140,9 +155,11 @@
 
 compile_people_lens() {
     echo "Configuring people lens.."
+
     if $CLEAN; then bzr clean-tree -d $TARGET_DIR/people_lens --quiet --unknown --ignored --force; fi
 
     cd $TARGET_DIR/people_lens
+    bzr revert --quiet -r $PEOPLE_LENS_REV || exit 10
 
     PKG_CONFIG_PATH=$BUILD_DIR/lib/pkgconfig:$PKG_CONFIG_PATH ./autogen.sh --prefix $BUILD_DIR --enable-localinstall
 
@@ -153,8 +170,12 @@
 
 compile_hud() {
     echo "Configuring hud.."
+
     if $CLEAN; then bzr clean-tree -d $TARGET_DIR/hud --quiet --unknown --ignored --force; fi
 
+    cd $TARGET_DIR/hud
+    bzr revert -r $HUD_REV || exit 11
+
     mkdir $TARGET_DIR/hud/build
     cd $TARGET_DIR/hud/build