Unity

Merge lp:~aacid/unity/more_build_work into lp:unity/phablet

  1. more_build_work
  2. Merge into phablet
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 481
Proposed branch: lp:~aacid/unity/more_build_work
Merge into: lp:unity/phablet
Diff against target: 124 lines (+29/-16)
4 files modified
build (+14/-3)
build_unity (+12/-12)
debian/control (+1/-1)
run_on_device (+2/-0)
To merge this branch: bzr merge lp:~aacid/unity/more_build_work
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+153743@code.launchpad.net

Commit message

Prepare for Ubuntu Components package rename

Depend on either qt-components-ubuntu or qtdeclarative5-ubuntu-ui-toolkit-plugin
Detect if we are on raring or quantal since we need different packages and ppas
Also we don't need julius libjulius-dev for the HUD as confirmed by Pete

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/56/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/55/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/55/rebuild

review: Approve (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

Will it build fine on raring with this branch ?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/58/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/57/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Omer: Yes, it should, i'm using raring and it build fine with it, but moving targets mean we may have to readjust it again in the future, hopefully not :-)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:477
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/64/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/63/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/63/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/67/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/66/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/66/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build'
2--- build 2013-03-15 20:52:27 +0000
3+++ build 2013-03-18 16:10:35 +0000
4@@ -28,12 +28,23 @@
5 done
6
7 install_dependencies() {
8+ RARING=false
9+ grep -q raring /etc/lsb-release
10+ if [ $? -eq 0 ]; then
11+ RARING=true
12+ fi
13 sudo add-apt-repository -y ppa:phablet-team/desktop-deps || exit 1
14- sudo add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper || exit 2
15- sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa || exit 3
16+ if ! $RARING; then
17+ sudo add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper || exit 2;
18+ sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa || exit 3
19+ fi
20 sudo apt-get update || exit 4
21 echo "Installing dependencies.."
22- sudo apt-get install qt-components-ubuntu qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets || exit 5
23+ if ! $RARING; then
24+ sudo apt-get install -y qt-components-ubuntu qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets || exit 5
25+ else
26+ sudo apt-get install -y qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets || exit 6
27+ fi
28 }
29
30 if $SETUP; then
31
32=== modified file 'build_unity'
33--- build_unity 2013-03-15 15:40:30 +0000
34+++ build_unity 2013-03-18 16:10:35 +0000
35@@ -2,7 +2,7 @@
36
37 TARGET_DIR=$PWD/../unity_build
38 BUILD_DIR=$TARGET_DIR/build
39-NUX=true
40+RARING=false
41 SETUP=false
42 UPDATE=false
43 NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
44@@ -14,17 +14,15 @@
45 echo "OPTIONS:"
46 echo " -s, --setup Setup the build environment and branch Unity"
47 echo " -u, --update Update Unity's source code"
48- echo " -n, --no-nux Don't build/install nux (for raring)"
49 exit 1
50 }
51
52-set -- `getopt -n$0 -u -a --longoptions="no-nux,setup,update,help" "nsuh" "$@"`
53+set -- `getopt -n$0 -u -a --longoptions="setup,update,help" "suh" "$@"`
54
55 # FIXME: giving incorrect arguments does not call usage and exit
56 while [ $# -gt 0 ]
57 do
58 case "$1" in
59- -n|--no-nux) NUX=false;;
60 -s|--setup) SETUP=true;;
61 -u|--update) UPDATE=true;;
62 -h|--help) usage;;
63@@ -35,14 +33,11 @@
64
65 install_dependencies() {
66 echo "Installing build dependencies.."
67- [ -e /etc/apt/sources.list.d/super-friends*.list ] || \
68- sudo add-apt-repository -y ppa:super-friends/ppa || exit 1
69- sudo apt-get update || exit 2
70- if $NUX; then sudo apt-get build-dep libnux-3.0-dev || exit 3; fi
71- sudo apt-get build-dep libunity unity || exit 4
72- sudo apt-get install libgtest-dev gnome-common libfolks-dev libtelepathy-glib-dev || exit 5
73+ if ! $RARING; then sudo apt-get build-dep -y libnux-3.0-dev || exit 3; fi
74+ sudo apt-get build-dep -y libunity unity || exit 4
75+ sudo apt-get install -y libgtest-dev gnome-common libfolks-dev libtelepathy-glib-dev || exit 5
76 # HUD dependencies
77- sudo apt-get install bamfdaemon bustle dbus-test-runner debhelper dh-autoreconf gir1.2-dee-1.0 gnome-common gnome-doc-utils gobject-introspection gtk-doc-tools indicator-application indicator-appmenu indicator-appmenu-tools intltool libappindicator3-dev libbamf3-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libdbusmenu-jsonloader-dev libdbustest1-dev libdee-dev libgirepository1.0-dev libgtk-3-dev libncurses5-dev libreadline-dev libsqlite3-dev metacity sqlite3 valac-0.18 xvfb python3-dbusmock libpocketsphinx-dev libsphinxbase-dev julius libjulius-dev || exit 6
78+ sudo apt-get install -y bamfdaemon bustle dbus-test-runner debhelper dh-autoreconf gir1.2-dee-1.0 gnome-common gnome-doc-utils gobject-introspection gtk-doc-tools indicator-application indicator-appmenu indicator-appmenu-tools intltool libappindicator3-dev libbamf3-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libdbusmenu-jsonloader-dev libdbustest1-dev libdee-dev libgirepository1.0-dev libgtk-3-dev libncurses5-dev libreadline-dev libsqlite3-dev metacity sqlite3 valac-0.18 xvfb python3-dbusmock libpocketsphinx-dev libsphinxbase-dev || exit 6
79 }
80
81 branch_nux() {
82@@ -163,11 +158,16 @@
83 done
84 }
85
86+grep -q raring /etc/lsb-release
87+if [ $? -eq 0 ]; then
88+ RARING=true
89+fi
90+
91 if $SETUP; then
92 echo "Setting up environment for building Unity.."
93 install_dependencies
94 mkdir -p $TARGET_DIR
95- if $NUX; then branch_nux; fi
96+ if ! $RARING; then branch_nux; fi
97 branch_libunity
98 branch_unity
99 branch_people_lens
100
101=== modified file 'debian/control'
102--- debian/control 2013-03-15 15:44:23 +0000
103+++ debian/control 2013-03-18 16:10:35 +0000
104@@ -28,7 +28,7 @@
105 Architecture: any
106 Depends: ${shlibs:Depends},
107 ${misc:Depends},
108- qt-components-ubuntu (>= 0.1.5~),
109+ qt-components-ubuntu (>= 0.1.5~) | qtdeclarative5-ubuntu-ui-toolkit-plugin,
110 qtdeclarative5-xmllistmodel-plugin,
111 qtdeclarative5-dee-plugin,
112 indicators-client (>= 0.6.1),
113
114=== modified file 'run_on_device'
115--- run_on_device 2013-02-26 21:18:19 +0000
116+++ run_on_device 2013-03-18 16:10:35 +0000
117@@ -56,6 +56,8 @@
118 install_dependencies() {
119 exec_with_adb apt-get -y install openssh-server
120 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache
121+ exec_with_ssh $SUDO add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper
122+ exec_with_ssh $SUDO add-apt-repository -y ppa:phablet-team/ppa
123 exec_with_ssh $SUDO apt-get -y build-dep $PACKAGE
124 }
125

Subscribers

People subscribed via source and target branches