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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-08-11 12:07:22 +0000
+++ CMakeLists.txt 2015-08-28 09:57:36 +0000
@@ -56,9 +56,15 @@
5656
57if(CLICK_MODE)57if(CLICK_MODE)
58 if(NOT DEFINED BZR_SOURCE)58 if(NOT DEFINED BZR_SOURCE)
59 set(BZR_SOURCE "lp:ubuntu-rssreader-app")59 set(BZR_SOURCE "lp:ubuntu-rssreader-app/reboot")
60 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")60 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
61 endif(NOT DEFINED BZR_SOURCE)61 endif(NOT DEFINED BZR_SOURCE)
62 execute_process(
63 COMMAND bzr revno ${CMAKE_SOURCE_DIR}
64 OUTPUT_VARIABLE BZR_REVNO
65 OUTPUT_STRIP_TRAILING_WHITESPACE
66 )
67
62 set(CMAKE_INSTALL_PREFIX /)68 set(CMAKE_INSTALL_PREFIX /)
63 set(CMAKE_INSTALL_BINDIR /)69 set(CMAKE_INSTALL_BINDIR /)
64 set(DATA_DIR /)70 set(DATA_DIR /)

Subscribers

People subscribed via source and target branches