ubuntu-touch-coreapps-reviewers team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/music-app/content-hub-desktop into lp:music-app.

Commit message:
Install the content-hub peer registration json file properly when installing from a deb.  Renamed .desktop file when installed from deb.


Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Music App Developers (music-app-dev)

For more details, see:
https://code.launchpad.net/~ken-vandine/music-app/content-hub-desktop/+merge/279333

Install the content-hub peer registration json file properly when installing from a deb.  Renamed .desktop file when installed from deb.

-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ken-vandine/music-app/content-hub-desktop into lp:music-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-08 18:32:22 +0000
+++ CMakeLists.txt	2015-12-02 19:28:55 +0000
@@ -60,10 +60,12 @@
 
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.js *.json)
+     *.qml *.js *.png *.js)
 install(DIRECTORY app DESTINATION ${DATA_DIR})
 install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
+install(FILES music-app-content.json DESTINATION ${CMAKE_INSTALL_PREFIX}/share/content-hub/peers/ RENAME music-app)
+
 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
 
 add_custom_target(${DESKTOP_FILE} ALL
@@ -72,7 +74,7 @@
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
-    DESTINATION ${DESKTOP_DIR})
+    DESTINATION ${DESKTOP_DIR} RENAME music-app.desktop)
 
 install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})