on xenial help sign in
Suffix .sh to our scripts and clean up debian/rules.
01c31feMichał Sawicz
CODING+9−9
@@ -20,7 +20,7 @@ install dependencies
20If its your first time, install build dependencies
20If its your first time, install build dependencies
21
21
22$ cd ~/unity8/trunk
22$ cd ~/unity8/trunk
23−$ ./build --setup
23+$ ./build.sh --setup
24
24
25 this will:
25 this will:
26 - 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,7 +31,7 @@ build Unity 8
31-------------
31-------------
32
32
33$ cd ~/unity8/trunk
33$ cd ~/unity8/trunk
34−$ ./build
34+$ ./build.sh
35
35
36You 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
37directory.
37directory.
@@ -43,10 +43,10 @@ Running Unity 8 on your desktop
43run the Unity 8 shell
43run the Unity 8 shell
44---------------------
44---------------------
45$ cd ~/unity8/trunk
45$ cd ~/unity8/trunk
46−$ ./run
46+$ ./run.sh
47
47
48Options can be passed to test the lock screen
48Options can be passed to test the lock screen
49−$ ./run -p OR -k
49+$ ./run.sh -p OR -k
50
50
51-p is for pin lock, for which the default prompt answer is "1234"
51-p is for pin lock, for which the default prompt answer is "1234"
52-k is for keylock passphrase, for which the default prompt answer is "password"
52-k is for keylock passphrase, for which the default prompt answer is "password"
@@ -78,19 +78,19 @@ Running Unity 8 on devices
78 on the device yourself)
78 on the device yourself)
79
79
80$ cd ~/unity/trunk
80$ cd ~/unity/trunk
81−$ ./run_on_device --setup
81+$ ./run_on_device.sh --setup
82 this will:
82 this will:
83 - install your public SSH key on the device
83 - install your public SSH key on the device
84 - install the needed dependencies
84 - install the needed dependencies
85
85
86−$ ./run_on_device
86+$ ./run_on_device.sh
87 this will:
87 this will:
88 - rsync the code to the device
88 - rsync the code to the device
89 - build on the device
89 - build on the device
90 - replace the running shell
90 - replace the running shell
91
91
92Options can be passed to test the lock screen
92Options can be passed to test the lock screen
93−$ ./run_on_device -p OR -k
93+$ ./run_on_device.sh -p OR -k
94
94
95-p is for pin lock, for which the default prompt answer is "1234"
95-p is for pin lock, for which the default prompt answer is "1234"
96-k is for keylock passphrase, for which the default prompt answer is "password"
96-k is for keylock passphrase, for which the default prompt answer is "password"
@@ -131,7 +131,7 @@ Running tests
131=============
131=============
132
132
133Tests are run from the build directory (which will be ./builddir if you used
133Tests are run from the build directory (which will be ./builddir if you used
134−the ./build script).
134+the ./build.sh script).
135
135
136To run the tests that do not require any graphical capability and therefore
136To run the tests that do not require any graphical capability and therefore
137are pretty fast run:
137are pretty fast run:
@@ -171,7 +171,7 @@ Running autopilot tests
171=======================
171=======================
172
172
173Autopilot tests are run from the build directory (which will be ./builddir if you used
173Autopilot tests are run from the build directory (which will be ./builddir if you used
174−the ./build script).
174+the ./build.sh script).
175
175
176$ make autopilot
176$ make autopilot
177
177
build → build.shrenamed

The content is the same.

debian/rules+1−2
@@ -6,8 +6,7 @@
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7export NO_PNG_PKG_MANGLE=1
7export NO_PNG_PKG_MANGLE=1
8
8
9−.PHONY: build
10−build %:
9+%:
11 dh $@ --parallel --fail-missing --with python2,python3
10 dh $@ --parallel --fail-missing --with python2,python3
12
11
13override_dh_auto_clean:
12override_dh_auto_clean:
run → run.shrenamed

The content is the same.

run_on_device → run_on_device.shrenamed+2−2
@@ -88,7 +88,7 @@ sync_code() {
88}
88}
89
89
90build() {
90build() {
91− exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
91+ exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build.sh"
92}
92}
93
93
94run() {
94run() {
@@ -105,7 +105,7 @@ run() {
105
105
106 exec_with_ssh "stop unity8"
106 exec_with_ssh "stop unity8"
107 exec_with_ssh "start maliit-server"
107 exec_with_ssh "start maliit-server"
108− exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"
108+ exec_with_ssh "cd $CODE_DIR/ && ./run.sh $ARGS -- $RUN_OPTIONS"
109 exec_with_ssh "stop maliit-server"
109 exec_with_ssh "stop maliit-server"
110 exec_with_ssh "start unity8"
110 exec_with_ssh "start unity8"
111}
111}