@@ -11,7 +11,6 @@ LENSES="applications mockmusic mockvideos"
1111# verified working revisions
1212LIBUNITY_REV=215
1313UNITY_REV=3260
14−PEOPLE_LENS_REV=74
1514HUD_REV=252
1615
1716usage() {
@@ -49,48 +48,37 @@ mk_build_deps() {
4948 cd $TARGET_DIR
5049 sudo mk-build-deps -B -i $TARGET_DIR/libunity/debian/control || exit 5
5150 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
53− sudo mk-build-deps -B -i $TARGET_DIR/hud/debian/control || exit 8
51+ sudo mk-build-deps -B -i $TARGET_DIR/hud/debian/control || exit 7
5452}
5553
5654branch_libunity() {
5755 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
5957}
6058
6159branch_unity() {
6260 echo "Branching Unity.."
63− bzr branch lp:unity/phablet-mods $TARGET_DIR/unity || exit 10
64−}
65−
66−branch_people_lens() {
67− echo "Branching people lens.."
68− bzr branch lp:unity-lens-people $TARGET_DIR/people_lens || exit 11
61+ bzr branch lp:unity/phablet-mods $TARGET_DIR/unity || exit 9
6962}
7063
7164branch_hud() {
7265 echo "Branching hud.."
73− bzr branch lp:hud $TARGET_DIR/hud || exit 12
66+ bzr branch lp:hud $TARGET_DIR/hud || exit 10
7467}
7568
7669update_unity() {
7770 echo "Updating Unity.."
78− bzr pull -d $TARGET_DIR/unity || exit 13
71+ bzr pull -d $TARGET_DIR/unity || exit 11
7972}
8073
8174update_libunity() {
8275 echo "Updating libunity.."
83− bzr pull -d $TARGET_DIR/libunity || exit 14
84−}
85−
86−update_people_lens() {
87− echo "Updating people lens.."
88− bzr pull -d $TARGET_DIR/people_lens || exit 15
76+ bzr pull -d $TARGET_DIR/libunity || exit 12
8977}
9078
9179update_hud() {
9280 echo "Updating hud"
93− bzr pull -d $TARGET_DIR/hud || exit 16
81+ bzr pull -d $TARGET_DIR/hud || exit 13
9482}
9583
9684compile_libunity() {
@@ -99,12 +87,15 @@ compile_libunity() {
9987 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/libunity --quiet --unknown --ignored --force; fi
10088
10189 cd $TARGET_DIR/libunity
102− bzr revert --quiet -r $LIBUNITY_REV || exit 17
90+ bzr revert --quiet -r $LIBUNITY_REV || exit 14
10391
104− ./autogen.sh --prefix $BUILD_DIR --disable-debug || exit 18
92+ mkdir $TARGET_DIR/libunity/build
93+ cd $TARGET_DIR/libunity/build
94+
95+ ../autogen.sh --prefix $BUILD_DIR --disable-debug || exit 15
10596
10697 echo "Building libunity and installing in " $BUILD_DIR
107− make -j$NUM_JOBS install || exit 19
98+ make -j$NUM_JOBS install || exit 16
10899
109100}
110101
@@ -114,31 +105,16 @@ compile_unity_core() {
114105 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/unity --quiet --unknown --ignored --force; fi
115106
116107 cd $TARGET_DIR/unity
117− bzr revert --quiet -r $UNITY_REV || exit 20
108+ bzr revert --quiet -r $UNITY_REV || exit 17
118109
119110 mkdir $TARGET_DIR/unity/build
120111 cd $TARGET_DIR/unity/build
121112
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
123114
124115 echo "Building UnityCore and installing in " $BUILD_DIR
125116 cd UnityCore
126− make -j$NUM_JOBS install || exit 21
127−
128−}
129−
130−compile_people_lens() {
131− echo "Configuring people lens.."
132−
133− if $CLEAN; then bzr clean-tree -d $TARGET_DIR/people_lens --quiet --unknown --ignored --force; fi
134−
135− cd $TARGET_DIR/people_lens
136− bzr revert --quiet -r $PEOPLE_LENS_REV || exit 22
137−
138− PKG_CONFIG_PATH=$BUILD_DIR/lib/pkgconfig:$PKG_CONFIG_PATH ./autogen.sh --prefix $BUILD_DIR --enable-localinstall || exit 23
139−
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
117+ make -j$NUM_JOBS install || exit 19
142118
143119}
144120
@@ -148,15 +124,15 @@ compile_hud() {
148124 if $CLEAN; then bzr clean-tree -d $TARGET_DIR/hud --quiet --unknown --ignored --force; fi
149125
150126 cd $TARGET_DIR/hud
151− bzr revert -r $HUD_REV || exit 25
127+ bzr revert -r $HUD_REV || exit 20
152128
153129 mkdir $TARGET_DIR/hud/build
154130 cd $TARGET_DIR/hud/build
155131
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
157133
158134 echo "Building hud and installing in " $BUILD_DIR
159− make install || exit 27
135+ make install || exit 22
160136
161137}
162138
@@ -174,13 +150,11 @@ if $SETUP; then
174150 mkdir -p $TARGET_DIR
175151 branch_libunity
176152 branch_unity
177− branch_people_lens
178153 branch_hud
179154 mk_build_deps
180155elif $UPDATE; then
181156 update_libunity
182157 update_unity
183− update_people_lens
184158 update_hud
185159 mk_build_deps
186160else
@@ -188,7 +162,6 @@ else
188162 mkdir -p $BUILD_DIR
189163 compile_libunity
190164 compile_unity_core
191− compile_people_lens
192165 compile_hud
193166 link_lenses
194167fi