on xenial help sign in
Do not add PPAs anymore and clean up build scripts and CODING accordingly.
d0bff46Michał Sawicz
CODING+3−10
@@ -23,19 +23,10 @@ $ cd ~/unity8/trunk
23$ ./build --setup
23$ ./build --setup
24
24
25 this will:
25 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
30 - install the required dependencies to build, as well as run on the desktop
26 - install the required dependencies to build, as well as run on the desktop
31 - it should also install unity-scope-home and unity-lens-application which
27 - it should also install unity-scope-home and unity-lens-application which
32 are technically "recommends", not strict dependencies
28 are technically "recommends", not strict dependencies
33
29
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−
39build Unity 8
30build Unity 8
40-------------
31-------------
41
32
@@ -45,6 +36,7 @@ $ ./build
45You may also rebuild with the -c for clean, which just deletes the build
36You may also rebuild with the -c for clean, which just deletes the build
46directory.
37directory.
47
38
39+
48Running Unity 8 on your desktop
40Running Unity 8 on your desktop
49===============================
41===============================
50
42
@@ -73,6 +65,7 @@ Notes
73 - Create an EDS address book
65 - Create an EDS address book
74 - Populate the address book with sample data
66 - Populate the address book with sample data
75
67
68+
76Running Unity 8 on devices
69Running Unity 8 on devices
77==========================
70==========================
78- Ubuntu Touch builds are currently only available in 13.10 flavour
71- Ubuntu Touch builds are currently only available in 13.10 flavour
@@ -91,7 +84,6 @@ $ cd ~/unity/trunk
91$ ./run_on_device --setup
84$ ./run_on_device --setup
92 this will:
85 this will:
93 - install your public SSH key on the device
86 - install your public SSH key on the device
94− - add ppa:canonical-qt5-edgers/qt5-proper and ppa:phablet-team
95 - install the needed dependencies
87 - install the needed dependencies
96
88
97$ ./run_on_device
89$ ./run_on_device
@@ -109,6 +101,7 @@ $ ./run_on_device -p OR -k
109Notes
101Notes
110-----
102-----
111- using adb over TCP has some advantages, Google will be of help here
103- using adb over TCP has some advantages, Google will be of help here
104+ - NOTE: this is not yet available for flipped images
112 - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`
105 - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`
113 - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`
106 - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`
114 - it's unsafe - anyone can connect to your device
107 - it's unsafe - anyone can connect to your device
build+1−6
@@ -36,16 +36,11 @@ BUILD_TYPE="debug"
36[ $# -eq 1 ] && BUILD_TYPE="$1"
36[ $# -eq 1 ] && BUILD_TYPE="$1"
37
37
38install_dependencies() {
38install_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
42 sudo apt-get update || exit 4
39 sudo apt-get update || exit 4
43 echo "Installing Unity 8 dependencies.."
40 echo "Installing Unity 8 dependencies.."
44 sudo apt-get install devscripts \
41 sudo apt-get install devscripts \
45 equivs \
42 equivs \
46− libnm-glib-dev \
43+ qmenumodel-qml \
47− libnm-util-dev \
48− libqmenumodel-dev \
49 qtdeclarative5-ubuntu-ui-toolkit-plugin \
44 qtdeclarative5-ubuntu-ui-toolkit-plugin \
50 qtdeclarative5-dee-plugin \
45 qtdeclarative5-dee-plugin \
51 ubuntu-mobile-icons \
46 ubuntu-mobile-icons \
run_on_device+1−3
@@ -65,11 +65,9 @@ setup_adb_forwarding() {
65}
65}
66
66
67install_dependencies() {
67install_dependencies() {
68+ exec_with_adb apt-get update
68 exec_with_adb apt-get -y install openssh-server
69 exec_with_adb apt-get -y install openssh-server
69 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs
70 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
73}
71}
74
72
75sync_code() {
73sync_code() {