Merge lp:~dpm/ubuntu-filemanager-app/click-everywhere into lp:ubuntu-filemanager-app

[David Planella]

Make the click build to work with both Qt Creator and click-buddy

Now you should be able to build the package on either:

1) Qt Creator

- Remember to 1) go to the Projects tab 2) click on the "Build" subtab of the "UbuntuSDK for armhf..." tab 3) Then go to the "CMake arguments" text field and add "-DCLICK_MODE=on" without the quotes

2) Click-buddy

$ click-buddy --dir . --arch armhf --framework ubuntu-sdk-14.04

Make the click build to work with both Qt Creator and click-buddy

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

PASSED: Continuous integration, rev:164
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/170/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2195
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/170
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/170
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/120

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Whoa, so the BZR_REVNO issue is the only one issue? If so, this is awesome! We'll need to fix the other apps as well.

[Carlos Jose Mazieri (carlos-mazieri)]

Great.

review: Approve

[Nicholas Skaggs (nskaggs)]

I can't speak fully to qtcreator, but certainly this fixes the issues with building clicks.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-09 21:28:47 +0000
+++ CMakeLists.txt	2014-04-24 14:15:46 +0000
@@ -39,7 +39,11 @@
     set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
-    install(FILES manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+    if(NOT BZR_REVNO)
+        set(BZR_REVNO "latest")
+    endif(NOT BZR_REVNO)
+    configure_file(manifest.json ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(CLICK_MODE)
     execute_process(
         COMMAND qmake -query QT_INSTALL_QML

=== modified file 'manifest.json'
--- manifest.json	2014-04-15 08:19:12 +0000
+++ manifest.json	2014-04-24 14:15:46 +0000
@@ -13,12 +13,12 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "com.ubuntu.filemanager",
     "title": "File Manager",
-    "version": "0.3",
+    "version": "0.3.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "lp:ubuntu-filemanager-app",
-        "vcs-bzr-revno": "latest"
+        "vcs-bzr-revno": "@BZR_REVNO@"
     },
     "x-test": {
         "autopilot": "ubuntu_filemanager_app"
     }
-}
\ No newline at end of file
+}