Merge lp:~sil2100/ubuntu-terminal-app/fix_cmake_revno into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Łukasz Zemczak]

Don't use 'latest' as the BZR_REVNO as it is in no way a proper bzr revision number. Instead, use bzr revno to determine the correct rev as other click projects do.

Don't use 'latest' as the BZR_REVNO as it is in no way a proper bzr revision number. Instead, use bzr revno to determine the correct rev as other click projects do.

Please note that I have no experience in click builds and this solution has been simply copied over from other working core-app projects, so please double-test it before approval.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Thanks Łukasz!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-autolanding/1/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/948
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-vivid-amd64-autolanding/1

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:46
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-ci/2/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/949
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/949/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-vivid-amd64-ci/2

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Changed development focus to reboot and will run again...

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-autolanding/2/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/950
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-vivid-amd64-autolanding/2

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-25 04:42:31 +0000
+++ CMakeLists.txt	2015-02-03 10:26:45 +0000
@@ -41,7 +41,12 @@
     set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
     set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
     if(NOT BZR_REVNO)
-        set(BZR_REVNO "latest")
+      execute_process(
+        COMMAND bzr revno
+        OUTPUT_VARIABLE BZR_REVNO
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
     endif(NOT BZR_REVNO)
 
     execute_process(