ubuntu-touch-coreapps-reviewers team mailing list archive

[Nicholas Skaggs <nskaggs@xxxxxxxxxx>]

Nicholas Skaggs has proposed merging lp:~nskaggs/reminders-app/fix-revno-in-click into lp:reminders-app.

Commit message:
Stop generating clicks with _latest_ in them

Requested reviews:
  Ubuntu Reminders app developers (reminders-app-dev)

For more details, see:
https://code.launchpad.net/~nskaggs/reminders-app/fix-revno-in-click/+merge/265319

This fixes the issues with generating remindersblah_latest.click
-- 
Your team Ubuntu Reminders app developers is requested to review the proposed merge of lp:~nskaggs/reminders-app/fix-revno-in-click into lp:reminders-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-14 23:34:29 +0000
+++ CMakeLists.txt	2015-07-20 20:37:54 +0000
@@ -45,14 +45,13 @@
     set(DESKTOP_DIR ${DATA_DIR})
     set(APPLICATION_DIR ${DATA_DIR})
 
-    # Sets BZR_REVNO
-    execute_process(
-        COMMAND bzr revno ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE BZR_REVNO
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
     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(
@@ -111,7 +110,7 @@
 
 configure_file(${APPLICATION_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE} DESTINATION ${APPLICATION_DIR})
- 
+
 # Tests
 enable_testing()