Merge lp:~vthompson/ubuntu-filemanager-app/1312879-home-icon into lp:ubuntu-filemanager-app

[Victor Thompson]

Install icons directory.

This installs the icons directory in the qml folder in the click package.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:165
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/176/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2251
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/176
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/176
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/126

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/176/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Ah, I see what happened, I might have forgotten to move the icons folder when rearranging the layout.

I think it might be better to:

1. 'bzr mv' the icons folder to be underneath of the src/app/qml file
2. Add *.svg to the list of patterns under the 'file(GLOB SRC_FILES' line in CMakeLists.txt

This will also take care of copying the icons folder to the build directory in order to run the app locally from Qt Creator (the 'if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")' line in src/app/CMakeLists.txt, which the current approach does not address).

review: Needs Fixing

[lp:~vthompson/ubuntu-filemanager-app/1312879-home-icon]

166. By Victor Thompson on 2014-04-28

Move icons directory

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:166
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2261
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/128

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/178/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks Victor!

I'll approve for now, but if that's ok with you, I'll wait to top-approve until https://code.launchpad.net/~dpm/ubuntu-filemanager-app/fix-desktop-run/+merge/217239 has landed, which also includes some CMakeLists.txt changes and I'd prefer it to land it first: if any conflicts come up from merges, they should be easier to fix on your branch.

review: Approve

[Victor Thompson (vthompson)]

Agreed, that sounds good to me.

[David Planella (dpm)]

The other branch has been merged, top-approving now.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-24 14:12:59 +0000
+++ CMakeLists.txt	2014-04-28 12:36:28 +0000
@@ -63,7 +63,7 @@
 
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.js)
+     *.qml *.js *.png *.svg *.js)
 install(FILES ${SRC_FILES}  DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})

=== renamed directory 'icons' => 'src/app/qml/icons'