git.iko.soy/unity8
on xenial help sign in
Only use ppa:ubuntu-unity/next and clean build scripts and CODING, accordingly.

Approved by Gerry Boland, PS Jenkins bot, Albert Astals Cid.

commit875d451c255a50bb8257f401a26b493c423ce354 authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 15 Jul 2013, 11:18 (13 years ago) parent6bad20d29591cf
3 files changed+7−12
compare with xenial
unifiedsplit
CODING+5−6 build+1−3 run_on_device+1−3
CODING+5−6
@@ -23,15 +23,12 @@ $ 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
26+ - add ppa:ubuntu-unity/next
3027 - install the required dependencies to build, as well as run on the desktop
3128 - it should also install unity-scope-home and unity-lens-application which
3229 are technically "recommends", not strict dependencies
3330
34−Note, once the PPA's are added, the script runs apt-get update, if you have
31+Note, once the PPA is added, the script runs apt-get update, if you have
3532any failures associated with it, the build script will bail out of the setup
3633and fail to install all the required dependencies.
3734
@@ -45,6 +42,7 @@ $ ./build
4542You may also rebuild with the -c for clean, which just deletes the build
4643directory.
4744
45+
4846Running Unity 8 on your desktop
4947===============================
5048
@@ -73,6 +71,7 @@ Notes
7371 - Create an EDS address book
7472 - Populate the address book with sample data
7573
74+
7675Running Unity 8 on devices
7776==========================
7877- Ubuntu Touch builds are currently only available in 13.10 flavour
@@ -91,7 +90,6 @@ $ cd ~/unity/trunk
9190$ ./run_on_device --setup
9291 this will:
9392 - install your public SSH key on the device
94− - add ppa:canonical-qt5-edgers/qt5-proper and ppa:phablet-team
9593 - install the needed dependencies
9694
9795$ ./run_on_device
@@ -109,6 +107,7 @@ $ ./run_on_device -p OR -k
109107Notes
110108-----
111109- using adb over TCP has some advantages, Google will be of help here
110+ - NOTE: this is not yet available for flipped images
112111 - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`
113112 - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`
114113 - it's unsafe - anyone can connect to your device
build+1−3
@@ -36,9 +36,7 @@ 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
39+ [ -f /etc/apt/sources.list.d/ubuntu-unity-next-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:ubuntu-unity/next || exit 1
4240 sudo apt-get update || exit 4
4341 echo "Installing Unity 8 dependencies.."
4442 sudo apt-get install devscripts \
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() {