Merge lp:~dpm/music-app/fixes-1282500 into lp:music-app/trusty

Proposed by David Planella
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 348
Merged at revision: 349
Proposed branch: lp:~dpm/music-app/fixes-1282500
Merge into: lp:music-app/trusty
Diff against target: 37 lines (+4/-3)
1 file modified
CMakeLists.txt (+4/-3)
To merge this branch: bzr merge lp:~dpm/music-app/fixes-1282500
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan (community) user testing Approve
Review via email: mp+207399@code.launchpad.net

Commit message

Fixes bug 1282500 whereby when building click packages the icon file is missing.

Description of the change

Fixes bug 1282500 whereby when building click packages the icon file is missing.

To test it's working:

1. Check out this branch and cd into it
2. click-buddy --dir .
3. Examine the click package to ensure it contains the icon
4. Install the click package to ensure it works

To install the click package: http://pastebin.ubuntu.com/6964813/

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

I get the following error,

CMake Error at cmake_install.cmake:89 (FILE):
  file INSTALL cannot find
  "/home/krnekhelesh/Documents/Ubuntu-Projects/fixes-1282500/music-app@30.png".

make: *** [install] Error 1
Usage: click build [options] DIRECTORY

click: error: directory "/tmp/tmp.4RuHol7zLI" does not contain manifest file "manifest.json"
cp: cannot stat '*.click': No such file or directory

I noticed that the music-app@30.png file is not present in this MP

review: Needs Fixing
lp:~dpm/music-app/fixes-1282500 updated
348. By David Planella

Fixed path of icon file

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

click install now works properly and the new icon is visible on the dash :)

review: Approve (user testing)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

New icon appears in the dash for me :)

LGTM

review: Approve
Revision history for this message
Victor Thompson (vthompson) wrote :

Thanks for taking care of all this guys. I'm on the road without a device
until tomorrow. I appreciate it.
On Feb 20, 2014 7:26 AM, "Andrew Hayzen" <email address hidden> wrote:

> Review: Approve
>
> New icon appears in the dash for me :)
>
> LGTM
> --
> https://code.launchpad.net/~dpm/music-app/fixes-1282500/+merge/207399
> Your team Music App Developers is subscribed to branch lp:music-app.
>

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 2014-02-18 21:18:58 +0000
3+++ CMakeLists.txt 2014-02-20 11:52:45 +0000
4@@ -12,7 +12,7 @@
5 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6 set(APP_HARDCODE music-app)
7 set(MAIN_QML music-app.qml)
8-set(ICON music-app@30.png)
9+set(ICON_FILE images/music-app@30.png)
10 set(AUTOPILOT_DIR music_app)
11
12
13@@ -24,13 +24,14 @@
14 set(CMAKE_INSTALL_PREFIX /)
15 set(CMAKE_INSTALL_BINDIR /)
16 set(DATA_DIR /)
17+ set(ICON ${ICON_FILE})
18 set(EXEC "qmlscene ${MAIN_QML}")
19 set(DESKTOP_DIR ${DATA_DIR})
20 set(URLS_DIR ${DATA_DIR})
21 else(CLICK_MODE)
22 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
23 set(EXEC ${APP_HARDCODE})
24- set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
25+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
26 configure_file(${APP_HARDCODE}.in
27 ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
28 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
29@@ -55,7 +56,7 @@
30 LibraryListModel.qml MusicaddtoPlaylist.qml settings.js
31 scrobble.js playlists.js worker-library-loader.js
32 meta-database.js DESTINATION ${DATA_DIR})
33-install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
34+install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
35
36 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
37 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}

Subscribers

People subscribed via source and target branches

to status/vote changes: