ubuntu-touch-coreapps-reviewers team mailing list archive

[Stefano Verzegnassi <stefano92.100@xxxxxxxxx>]

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-bzr-revno into lp:ubuntu-docviewer-app.

Commit message:
Fixed BZR_REVNO always set as 'latest'

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/fix-bzr-revno/+merge/279567

Fixed BZR_REVNO always set as 'latest'
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-bzr-revno into lp:ubuntu-docviewer-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-30 16:29:38 +0000
+++ CMakeLists.txt	2015-12-04 10:57:10 +0000
@@ -21,11 +21,17 @@
 set(ICON_FILE           docviewer-app.png)
 set(AUTOPILOT_DIR       ubuntu_docviewer_app)
 
+# Sets BZR_SOURCE
+if(NOT DEFINED BZR_SOURCE)
+  set(BZR_SOURCE "lp:${LP_PROJECT}")
+  message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+endif(NOT DEFINED BZR_SOURCE)
+
 # Sets BZR_REVNO
 execute_process(
-    COMMAND bzr revno ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE BZR_REVNO
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+  COMMAND bzr revno ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE BZR_REVNO
+  OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 # Find out the architecture for package building

=== modified file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake	2015-11-22 17:28:09 +0000
+++ cmake/modules/Click.cmake	2015-12-04 10:57:10 +0000
@@ -1,9 +1,4 @@
 if(CLICK_MODE)
-  if(NOT DEFINED BZR_SOURCE)
-    set(BZR_SOURCE "lp:${LP_PROJECT}")
-    message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
-  endif(NOT DEFINED BZR_SOURCE)
-
   set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
   set(CMAKE_INSTALL_PREFIX /)
   set(DATA_DIR /)