ubuntu-touch-coreapps-reviewers team mailing list archive

[Alan Pope  <alan@xxxxxxxxxx>]

Alan Pope  has proposed merging lp:~popey/ubuntu-rssreader-app/fix-bzr into lp:ubuntu-rssreader-app/reboot.

Commit message:
Fix bzr revno

Requested reviews:
  Ubuntu Shorts Developers (ubuntu-rssreader-dev)

For more details, see:
https://code.launchpad.net/~popey/ubuntu-rssreader-app/fix-bzr/+merge/269485

Fix the bzr branch and revno so we build the click correctly containing the revno in the filename.
-- 
Your team Ubuntu Shorts Developers is requested to review the proposed merge of lp:~popey/ubuntu-rssreader-app/fix-bzr into lp:ubuntu-rssreader-app/reboot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-11 12:07:22 +0000
+++ CMakeLists.txt	2015-08-28 09:48:39 +0000
@@ -56,9 +56,15 @@
 
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
-        set(BZR_SOURCE "lp:ubuntu-rssreader-app")
+        set(BZR_SOURCE "lp:ubuntu-rssreader-app/reboot")
         message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
     endif(NOT DEFINED BZR_SOURCE)
+    execute_process(
+	COMMAND bzr revno ${CMAKE_SOURCE_DIR}
+	OUTPUT_VARIABLE BZR_REVNO
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)