Merge lp:~popey/ubuntu-filemanager-app/set-bzr-revno into lp:ubuntu-filemanager-app

Status: Merged
Approved by: Carlos Jose Mazieri on 2015-10-20
Approved revision: 481
Merged at revision: 483
Proposed branch: lp:~popey/ubuntu-filemanager-app/set-bzr-revno
Merge into: lp:ubuntu-filemanager-app
Diff against target: 17 lines (+7/-0)
1 file modified
CMakeLists.txt (+7/-0)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/set-bzr-revno
Reviewer Review Type Date Requested Status
Carlos Jose Mazieri 2015-10-19 Approve on 2015-10-20
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-10-19
Review via email: mp+274957@code.launchpad.net

Commit message

Correctly set the bzr revno during build. Otherwise in some circumstances it builds with "latest" in the filename, where we standardised on the bzr revision number in the filename. This fixes that.

To post a comment you must log in.
review: Approve (continuous-integration)

Nice, Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-10-13 16:49:05 +0000
3+++ CMakeLists.txt 2015-10-19 22:15:50 +0000
4@@ -25,6 +25,13 @@
5 add_definitions(-D_LARGEFILE_SOURCE)
6 add_definitions(-D_FILE_OFFSET_BITS=64)
7
8+# Sets BZR_REVNO
9+execute_process(
10+ COMMAND bzr revno ${CMAKE_SOURCE_DIR}
11+ OUTPUT_VARIABLE BZR_REVNO
12+ OUTPUT_STRIP_TRAILING_WHITESPACE
13+)
14+
15 if(CLICK_MODE)
16 if(NOT DEFINED BZR_SOURCE)
17 set(BZR_SOURCE "lp:${LP_PROJECT}")

Subscribers

People subscribed via source and target branches