Merge lp:~saviq/unity8/fix-rules into lp:unity8

[Michał Sawicz]

Suffix .sh to our scripts and clean up debian/rules.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * Did you make sure that your branch does not contain spurious tags?
Yup.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes.

 * If you changed the UI, has there been a design review?
N/A

[Didier Roche-Tolomelli (didrocks)]

Looks way saner, thanks Michal!

review: Approve

[Albert Astals Cid (aacid)]

There's two instances of run_on_device in CODING that you probably want to change to run_on_device.sh ?

review: Needs Fixing

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
dpkg-buildpacakge works

* Did CI run pass? If not, please explain why.
Doesn't matter

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/unity8-ci/2904/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/594
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1429
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6773

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2904/rebuild

review: Approve (continuous-integration)

=== modified file 'CODING'
--- CODING	2014-04-24 08:40:40 +0000
+++ CODING	2014-05-05 09:38:13 +0000
@@ -20,7 +20,7 @@
 If its your first time, install build dependencies
 
 $ cd ~/unity8/trunk
-$ ./build --setup
+$ ./build.sh --setup
 
   this will:
   - install the required dependencies to build, as well as run on the desktop
@@ -31,7 +31,7 @@
 -------------
 
 $ cd ~/unity8/trunk
-$ ./build
+$ ./build.sh
 
 You may also rebuild with the -c for clean, which just deletes the build
 directory.
@@ -43,10 +43,10 @@
 run the Unity 8 shell
 ---------------------
 $ cd ~/unity8/trunk
-$ ./run
+$ ./run.sh
 
 Options can be passed to test the lock screen
-$ ./run -p OR -k
+$ ./run.sh -p OR -k
 
 -p is for pin lock, for which the default prompt answer is "1234"
 -k is for keylock passphrase, for which the default prompt answer is "password"
@@ -78,19 +78,19 @@
   on the device yourself)
 
 $ cd ~/unity/trunk
-$ ./run_on_device --setup
+$ ./run_on_device.sh --setup
   this will:
   - install your public SSH key on the device
   - install the needed dependencies
 
-$ ./run_on_device
+$ ./run_on_device.sh
   this will:
   - rsync the code to the device
   - build on the device
   - replace the running shell
 
 Options can be passed to test the lock screen
-$ ./run_on_device -p OR -k
+$ ./run_on_device.sh -p OR -k
 
 -p is for pin lock, for which the default prompt answer is "1234"
 -k is for keylock passphrase, for which the default prompt answer is "password"
@@ -107,9 +107,9 @@
 - exporting ANDROID_SERIAL=$your_device_serial or 
   ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about 
   multiple devices
-- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device
+- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh
   to not use adb forwarding - useful if you use multiple devices
-- using Ninja (package ninja-build - run_on_device -s installs this now)
+- using Ninja (package ninja-build - run_on_device.sh -s installs this now)
   will improve build times (especially in the nothing-to-build case)
 
 
@@ -131,7 +131,7 @@
 =============
 
 Tests are run from the build directory (which will be ./builddir if you used
-the ./build script).
+the ./build.sh script).
 
 To run the tests that do not require any graphical capability and therefore
 are pretty fast run:
@@ -171,7 +171,7 @@
 =======================
 
 Autopilot tests are run from the build directory (which will be ./builddir if you used
-the ./build script).
+the ./build.sh script).
 
 $ make autopilot
 

=== renamed file 'build' => 'build.sh'
=== modified file 'debian/rules'
--- debian/rules	2014-03-24 11:32:45 +0000
+++ debian/rules	2014-05-05 09:38:13 +0000
@@ -6,8 +6,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 export NO_PNG_PKG_MANGLE=1
 
-.PHONY: build
-build %:
+%:
 	dh $@ --parallel --fail-missing --with python2,python3
 
 override_dh_auto_clean:

=== renamed file 'run' => 'run.sh'
=== renamed file 'run_on_device' => 'run_on_device.sh'
--- run_on_device	2014-03-31 14:01:27 +0000
+++ run_on_device.sh	2014-05-05 09:38:13 +0000
@@ -88,7 +88,7 @@
 }
 
 build() {
-    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
+    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build.sh"
 }
 
 run() {
@@ -105,7 +105,7 @@
 
     exec_with_ssh "stop unity8"
     exec_with_ssh "start maliit-server"
-    exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"
+    exec_with_ssh "cd $CODE_DIR/ && ./run.sh $ARGS -- $RUN_OPTIONS"
     exec_with_ssh "stop maliit-server"
     exec_with_ssh "start unity8"
 }