Ubuntu Shorts App

Merge lp:~popey/ubuntu-rssreader-app/fix-bzr into lp:ubuntu-rssreader-app

  1. fix-bzr
  2. Merge into reboot
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Joey Chan
Approved revision: 408
Merge reported by: Alan Pope 🍺🐧🐱 🦄
Merged at revision: not available
Proposed branch: lp:~popey/ubuntu-rssreader-app/fix-bzr
Merge into: lp:ubuntu-rssreader-app
Diff against target: 20 lines (+7/-1)
1 file modified
CMakeLists.txt (+7/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-rssreader-app/fix-bzr
Reviewer Review Type Date Requested Status
Ubuntu Shorts Developers Pending
Review via email: mp+269485@code.launchpad.net

Commit message

Fix bzr revno

Description of the change

Fix the bzr branch and revno so we build the click correctly containing the revno in the filename.

To post a comment you must log in.
Revision history for this message
Joey Chan (qqworini) wrote :

thx for correct my some mistakes :)

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-08-11 12:07:22 +0000
3+++ CMakeLists.txt 2015-08-28 09:57:36 +0000
4@@ -56,9 +56,15 @@
5
6 if(CLICK_MODE)
7 if(NOT DEFINED BZR_SOURCE)
8- set(BZR_SOURCE "lp:ubuntu-rssreader-app")
9+ set(BZR_SOURCE "lp:ubuntu-rssreader-app/reboot")
10 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
11 endif(NOT DEFINED BZR_SOURCE)
12+ execute_process(
13+ COMMAND bzr revno ${CMAKE_SOURCE_DIR}
14+ OUTPUT_VARIABLE BZR_REVNO
15+ OUTPUT_STRIP_TRAILING_WHITESPACE
16+ )
17+
18 set(CMAKE_INSTALL_PREFIX /)
19 set(CMAKE_INSTALL_BINDIR /)
20 set(DATA_DIR /)

Subscribers

People subscribed via source and target branches