git.iko.soy/unity8
on xenial help sign in
merged lp:~saviq/unity8/tweak-run-scripts
commit99f3f0e5ccf3bc9ec9b2467bc5b5ca78a32dd85b authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 28 Nov 2013, 16:02 (13 years ago) parent4d4c90e51604c5
2 files changed+6−6
compare with xenial
unifiedsplit
run+6−5 run_on_device−1
run+6−5
@@ -1,5 +1,8 @@
11#!/bin/sh
22
3+. /etc/environment
4+export QML2_IMPORT_PATH
5+
36QML_PHONE_SHELL_PATH=./builddir/unity8
47GDB=false
58FAKE=false
@@ -40,19 +43,17 @@ do
4043done
4144
4245if $FAKE; then
43− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
46+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
4447 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
45−else
46− export QML2_IMPORT_PATH=`pkg-config --variable=plugindir unity-shell-api`
4748fi
4849
4950if $PINLOCK; then
50− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
51+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
5152 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
5253fi
5354
5455if $KEYLOCK; then
55− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
56+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
5657 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
5758fi
5859
run_on_device−1
@@ -88,7 +88,6 @@ sync_code() {
8888}
8989
9090build() {
91− exec_with_ssh "[ $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && $SUDO mk-build-deps --tool=\\\"apt-get -y --no-install-recommends\\\" --build-dep --install $CODE_DIR/debian/control"
9291 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
9392}
9493