@@ -11,7 +11,6 @@ LENSES="applications mockmusic mockvideos"
11# verified working revisions
11# verified working revisions
12LIBUNITY_REV=215
12LIBUNITY_REV=215
13UNITY_REV=3260
13UNITY_REV=3260
15HUD_REV=252
14HUD_REV=252
@@ -49,48 +48,37 @@ mk_build_deps() {
49 cd $TARGET_DIR
48 cd $TARGET_DIR
50 sudo mk-build-deps -B -i $TARGET_DIR/libunity/debian/control || exit 5
49 sudo mk-build-deps -B -i $TARGET_DIR/libunity/debian/control || exit 5
51 sudo mk-build-deps -B -i $TARGET_DIR/unity/debian/control || exit 6
50 sudo mk-build-deps -B -i $TARGET_DIR/unity/debian/control || exit 6
52− sudo mk-build-deps -B -i $TARGET_DIR/people_lens/debian/control || exit 7
51+ sudo mk-build-deps -B -i $TARGET_DIR/hud/debian/control || exit 7
53− sudo mk-build-deps -B -i $TARGET_DIR/hud/debian/control || exit 8
56branch_libunity() {
54branch_libunity() {
57 echo "Branching libunity.."
55 echo "Branching libunity.."
58− bzr branch lp:libunity/phablet $TARGET_DIR/libunity || exit 9
56+ bzr branch lp:libunity/phablet $TARGET_DIR/libunity || exit 8
61branch_unity() {
59branch_unity() {
62 echo "Branching Unity.."
60 echo "Branching Unity.."
63− bzr branch lp:unity/phablet-mods $TARGET_DIR/unity || exit 10
61+ bzr branch lp:unity/phablet-mods $TARGET_DIR/unity || exit 9
66−branch_people_lens() {
67− echo "Branching people lens.."
68− bzr branch lp:unity-lens-people $TARGET_DIR/people_lens || exit 11
71branch_hud() {
64branch_hud() {
72 echo "Branching hud.."
65 echo "Branching hud.."
73− bzr branch lp:hud $TARGET_DIR/hud || exit 12
66+ bzr branch lp:hud $TARGET_DIR/hud || exit 10
76update_unity() {
69update_unity() {
77 echo "Updating Unity.."
70 echo "Updating Unity.."
78− bzr pull -d $TARGET_DIR/unity || exit 13
71+ bzr pull -d $TARGET_DIR/unity || exit 11
81update_libunity() {
74update_libunity() {
82 echo "Updating libunity.."
75 echo "Updating libunity.."
83− bzr pull -d $TARGET_DIR/libunity || exit 14
76+ bzr pull -d $TARGET_DIR/libunity || exit 12
86−update_people_lens() {
87− echo "Updating people lens.."
88− bzr pull -d $TARGET_DIR/people_lens || exit 15
91update_hud() {
79update_hud() {
92 echo "Updating hud"
80 echo "Updating hud"
93− bzr pull -d $TARGET_DIR/hud || exit 16
81+ bzr pull -d $TARGET_DIR/hud || exit 13
96compile_libunity() {
84compile_libunity() {
@@ -99,12 +87,15 @@ compile_libunity() {
99 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/libunity --quiet --unknown --ignored --force; fi
87 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/libunity --quiet --unknown --ignored --force; fi
101 cd $TARGET_DIR/libunity
89 cd $TARGET_DIR/libunity
102− bzr revert --quiet -r $LIBUNITY_REV || exit 17
90+ bzr revert --quiet -r $LIBUNITY_REV || exit 14
92+ mkdir $TARGET_DIR/libunity/build
93+ cd $TARGET_DIR/libunity/build
104− ./autogen.sh --prefix $BUILD_DIR --disable-debug || exit 18
95+ ../autogen.sh --prefix $BUILD_DIR --disable-debug || exit 15
106 echo "Building libunity and installing in " $BUILD_DIR
97 echo "Building libunity and installing in " $BUILD_DIR
107− make -j$NUM_JOBS install || exit 19
98+ make -j$NUM_JOBS install || exit 16
@@ -114,31 +105,16 @@ compile_unity_core() {
114 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/unity --quiet --unknown --ignored --force; fi
105 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/unity --quiet --unknown --ignored --force; fi
116 cd $TARGET_DIR/unity
107 cd $TARGET_DIR/unity
117− bzr revert --quiet -r $UNITY_REV || exit 20
108+ bzr revert --quiet -r $UNITY_REV || exit 17
119 mkdir $TARGET_DIR/unity/build
110 mkdir $TARGET_DIR/unity/build
120 cd $TARGET_DIR/unity/build
111 cd $TARGET_DIR/unity/build
122− 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 21
113+ 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
124 echo "Building UnityCore and installing in " $BUILD_DIR
115 echo "Building UnityCore and installing in " $BUILD_DIR
125 cd UnityCore
116 cd UnityCore
126− make -j$NUM_JOBS install || exit 21
117+ make -j$NUM_JOBS install || exit 19
130−compile_people_lens() {
131− echo "Configuring people lens.."
133− if $CLEAN; then bzr clean-tree -d $TARGET_DIR/people_lens --quiet --unknown --ignored --force; fi
135− cd $TARGET_DIR/people_lens
136− bzr revert --quiet -r $PEOPLE_LENS_REV || exit 22
138− PKG_CONFIG_PATH=$BUILD_DIR/lib/pkgconfig:$PKG_CONFIG_PATH ./autogen.sh --prefix $BUILD_DIR --enable-localinstall || exit 23
140− echo "Building people lens and installing in " $BUILD_DIR
141− MAINTAINER_VALAFLAGS="--vapidir=${BUILD_DIR}/share/vala/vapi" make -j$NUM_JOBS install || exit 24
@@ -148,15 +124,15 @@ compile_hud() {
148 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/hud --quiet --unknown --ignored --force; fi
124 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/hud --quiet --unknown --ignored --force; fi
150 cd $TARGET_DIR/hud
126 cd $TARGET_DIR/hud
151− bzr revert -r $HUD_REV || exit 25
127+ bzr revert -r $HUD_REV || exit 20
153 mkdir $TARGET_DIR/hud/build
129 mkdir $TARGET_DIR/hud/build
154 cd $TARGET_DIR/hud/build
130 cd $TARGET_DIR/hud/build
156− cmake $TARGET_DIR/hud/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$BUILD_DIR -DCMAKE_INSTALL_LIBDIR=lib -DLOCAL_INSTALL=ON -DENABLE_TESTS=OFF || exit 26
132+ 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
158 echo "Building hud and installing in " $BUILD_DIR
134 echo "Building hud and installing in " $BUILD_DIR
159− make install || exit 27
135+ make install || exit 22
@@ -174,13 +150,11 @@ if $SETUP; then
174 mkdir -p $TARGET_DIR
150 mkdir -p $TARGET_DIR
175 branch_libunity
151 branch_libunity
176 branch_unity
152 branch_unity
178 branch_hud
153 branch_hud
179 mk_build_deps
154 mk_build_deps
180elif $UPDATE; then
155elif $UPDATE; then
181 update_libunity
156 update_libunity
182 update_unity
157 update_unity
184 update_hud
158 update_hud
185 mk_build_deps
159 mk_build_deps
@@ -188,7 +162,6 @@ else
188 mkdir -p $BUILD_DIR
162 mkdir -p $BUILD_DIR
189 compile_libunity
163 compile_libunity
190 compile_unity_core
164 compile_unity_core
192 compile_hud
165 compile_hud
193 link_lenses
166 link_lenses