Merge lp:~saviq/unity/8.clean-scripts into lp:unity/8.0

[Michał Sawicz]

Drop build_unity that's not needed anymore and clean up build/run scripts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/157/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/283
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/256

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Die die die unity_build!

review: Approve

=== modified file 'build'
--- build	2013-06-07 10:01:57 +0000
+++ build	2013-06-20 12:57:29 +0000
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-PACKAGE=unity8
-UNITY_BUILD_DIR=$PWD/../unity_build/build
 SETUP=false
 CLEAN=false
 NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
+CODE_DIR=$( dirname `readlink -f $0` )
 
 usage() {
     echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2
@@ -37,13 +36,24 @@
 [ $# -eq 1 ] && BUILD_TYPE="$1"
 
 install_dependencies() {
-    . /etc/lsb-release
     [ -f /etc/apt/sources.list.d/phablet-team-desktop-deps-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:phablet-team/desktop-deps || exit 1
     [ -f /etc/apt/sources.list.d/canonical-qt5-edgers-qt5-proper-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:canonical-qt5-edgers/qt5-proper || exit 2;
     [ -f /etc/apt/sources.list.d/ubuntu-sdk-team-ppa-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:ubuntu-sdk-team/ppa || exit 3
     sudo apt-get update || exit 4
     echo "Installing Unity 8 dependencies.."
-    sudo apt-get install qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtbase5-private-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets ubuntu-mobile-icons || exit 5
+    sudo apt-get install devscripts \
+                         equivs \
+                         qtdeclarative5-ubuntu-ui-toolkit-plugin \
+                         qtdeclarative5-dee-plugin \
+                         indicators-client \
+                         indicators-client-plugin-* \
+                         ubuntu-mobile-icons \
+                         unity-notifications-impl-1 \
+        || exit 5
+}
+
+mk_build_deps() {
+    [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
 }
 
 if [ -f "/usr/bin/ninja" ] ; then
@@ -56,13 +66,11 @@
 
 if $SETUP; then
     install_dependencies
-    ./build_unity --setup || exit 1$?
-    ./build_unity || exit 1$?
 else
     if $CLEAN; then rm -rf builddir; fi
     mkdir -p builddir
     cd builddir
-    PKG_CONFIG_PATH=$UNITY_BUILD_DIR/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. ${GENERATOR} || exit 6
+    mk_build_deps
+    cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6
     ${BUILD_COMMAND} || exit 7
 fi
-

=== removed file 'build_unity'
--- build_unity	2013-06-14 14:14:12 +0000
+++ build_unity	1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-TARGET_DIR=$PWD/../unity_build
-BUILD_DIR=$TARGET_DIR/build
-SETUP=false
-UPDATE=false
-CLEAN=false
-NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
-
-# verified working revisions
-LIBUNITY_REV=228
-UNITY_REV=3343
-HUD_REV=252
-
-usage() {
-    echo "usage: build_unity [OPTIONS]\n"
-    echo "Script to build Unity on Ubuntu 12.10.\n"
-    echo "OPTIONS:"
-    echo "  -s, --setup   Setup the build environment and branch Unity"
-    echo "  -u, --update  Update Unity's source code"
-    echo "  -c, --clean   Clean build trees before building"
-    exit 1
-}
-
-set -- `getopt -n$0 -u -a --longoptions="setup,update,clean,help" "such" "$@"`
-
-# FIXME: giving incorrect arguments does not call usage and exit
-while [ $# -gt 0 ]
-do
-    case "$1" in
-       -s|--setup)   SETUP=true;;
-       -u|--update)  UPDATE=true;;
-       -c|--clean)   CLEAN=true;;
-       -h|--help)    usage;;
-       --)           shift;break;;
-    esac
-    shift
-done
-
-install_utils() {
-    echo "Installing build utilities.."
-    sudo apt-get install devscripts equivs || exit 4
-}
-
-mk_build_deps() {
-    echo "Installing build dependencies.."
-    cd $TARGET_DIR
-    sudo mk-build-deps -B -i $TARGET_DIR/libunity/debian/control || exit 5
-    sudo mk-build-deps -B -i $TARGET_DIR/unity/debian/control || exit 6
-    sudo mk-build-deps -B -i $TARGET_DIR/hud/debian/control || exit 7
-}
-
-branch_libunity() {
-    echo "Branching libunity.."
-    bzr branch lp:libunity $TARGET_DIR/libunity || exit 8
-}
-
-branch_unity() {
-    echo "Branching Unity.."
-    bzr branch lp:unity $TARGET_DIR/unity || exit 9
-}
-
-branch_hud() {
-    echo "Branching hud.."
-    bzr branch lp:hud $TARGET_DIR/hud || exit 10
-}
-
-update_unity() {
-    echo "Updating Unity.."
-    bzr pull -d $TARGET_DIR/unity || exit 11
-}
-
-update_libunity() {
-    echo "Updating libunity.."
-    bzr pull -d $TARGET_DIR/libunity || exit 12
-}
-
-update_hud() {
-    echo "Updating hud"
-    bzr pull -d $TARGET_DIR/hud || exit 13
-}
-
-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 14
-
-    mkdir $TARGET_DIR/libunity/build
-    cd $TARGET_DIR/libunity/build
-
-    ../autogen.sh --prefix $BUILD_DIR --disable-debug --with-pygi-overrides-dir=$BUILD_DIR/gi-overrides || exit 15
-
-    echo "Building libunity and installing in " $BUILD_DIR
-    make -j$NUM_JOBS install || exit 16
-
-}
-
-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 17
-
-    mkdir $TARGET_DIR/unity/build
-    cd $TARGET_DIR/unity/build
-
-    PKG_CONFIG_PATH=$BUILD_DIR/lib/pkgconfig:$PKG_CONFIG_PATH cmake $TARGET_DIR/unity -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$BUILD_DIR -DCOMPIZ_PLUGIN_INSTALL_TYPE=local -DGSETTINGS_LOCALINSTALL=ON || exit 18
-
-    echo "Building UnityCore and installing in " $BUILD_DIR
-    cd UnityCore
-    make -j$NUM_JOBS install || exit 19
-
-}
-
-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 20
-
-    mkdir $TARGET_DIR/hud/build
-    cd $TARGET_DIR/hud/build
-
-    cmake $TARGET_DIR/hud/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$BUILD_DIR -DCMAKE_INSTALL_LIBDIR=lib -DLOCAL_INSTALL=ON -DENABLE_TESTS=OFF || exit 21
-
-    echo "Building hud and installing in " $BUILD_DIR
-    make install || exit 22
-
-}
-
-if $SETUP; then
-    echo "Setting up environment for building Unity.."
-    install_utils
-    mkdir -p $TARGET_DIR
-    branch_libunity
-    branch_unity
-    branch_hud
-    mk_build_deps
-elif $UPDATE; then
-    update_libunity
-    update_unity
-    update_hud
-    mk_build_deps
-else
-    if $CLEAN; then rm -Rf $BUILD_DIR; fi
-    mkdir -p $BUILD_DIR
-    compile_libunity
-    compile_unity_core
-    compile_hud
-fi
-

=== modified file 'run'
--- run	2013-06-06 12:18:34 +0000
+++ run	2013-06-20 12:57:29 +0000
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 QML_PHONE_SHELL_PATH=./builddir/unity8
-export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib
 GDB=false
 FAKE=false
 PINLOCK=false