on xenial help sign in
Do not add PPAs anymore and clean up build scripts and CODING accordingly.
commitd0bff464d1710fb3790f65f9940895356f3f2883 authorMichał Sawicz <michal.sawicz@canonical.com> dateWed 10 Jul 2013, 02:14 (13 years ago) parent80a7d99
3 files changed+5−19
CODING+3−10 build+1−6 run_on_device+1−3
CODING+3−10
@@ -23,19 +23,10 @@ $ cd ~/unity8/trunk
2323$ ./build --setup
2424
2525 this will:
26− - add the following PPA's
27− - ppa:phablet-team/desktop-deps
28− - ppa:canonical-qt5-edgers/qt5-proper
29− - ppa:ubuntu-sdk-team
3026 - install the required dependencies to build, as well as run on the desktop
3127 - it should also install unity-scope-home and unity-lens-application which
3228 are technically "recommends", not strict dependencies
3329
34−Note, once the PPA's are added, the script runs apt-get update, if you have
35−any failures associated with it, the build script will bail out of the setup
36−and fail to install all the required dependencies.
37−
38−
3930build Unity 8
4031-------------
4132
@@ -45,6 +36,7 @@ $ ./build
4536You may also rebuild with the -c for clean, which just deletes the build
4637directory.
4738
39+
4840Running Unity 8 on your desktop
4941===============================
5042
@@ -73,6 +65,7 @@ Notes
7365 - Create an EDS address book
7466 - Populate the address book with sample data
7567
68+
7669Running Unity 8 on devices
7770==========================
7871- Ubuntu Touch builds are currently only available in 13.10 flavour
@@ -91,7 +84,6 @@ $ cd ~/unity/trunk
9184$ ./run_on_device --setup
9285 this will:
9386 - install your public SSH key on the device
94− - add ppa:canonical-qt5-edgers/qt5-proper and ppa:phablet-team
9587 - install the needed dependencies
9688
9789$ ./run_on_device
@@ -109,6 +101,7 @@ $ ./run_on_device -p OR -k
109101Notes
110102-----
111103- using adb over TCP has some advantages, Google will be of help here
104+ - NOTE: this is not yet available for flipped images
112105 - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`
113106 - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`
114107 - it's unsafe - anyone can connect to your device
build+1−6
@@ -36,16 +36,11 @@ BUILD_TYPE="debug"
3636[ $# -eq 1 ] && BUILD_TYPE="$1"
3737
3838install_dependencies() {
39− [ -f /etc/apt/sources.list.d/phablet-team-desktop-deps-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:phablet-team/desktop-deps || exit 1
40− [ -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;
41− [ -f /etc/apt/sources.list.d/ubuntu-sdk-team-ppa-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:ubuntu-sdk-team/ppa || exit 3
4239 sudo apt-get update || exit 4
4340 echo "Installing Unity 8 dependencies.."
4441 sudo apt-get install devscripts \
4542 equivs \
46− libnm-glib-dev \
47− libnm-util-dev \
48− libqmenumodel-dev \
43+ qmenumodel-qml \
4944 qtdeclarative5-ubuntu-ui-toolkit-plugin \
5045 qtdeclarative5-dee-plugin \
5146 ubuntu-mobile-icons \
run_on_device+1−3
@@ -65,11 +65,9 @@ setup_adb_forwarding() {
6565}
6666
6767install_dependencies() {
68+ exec_with_adb apt-get update
6869 exec_with_adb apt-get -y install openssh-server
6970 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs
70− exec_with_ssh $SUDO add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper
71− exec_with_ssh $SUDO add-apt-repository -s -y ppa:phablet-team/ppa
72− exec_with_ssh $SUDO apt-get update
7371}
7472
7573sync_code() {