Merge lp:~dpm/ubuntu-filemanager-app/fix-libname into lp:ubuntu-filemanager-app

[David Planella]

Fix the library name to match that of the qmldir file, so that the app finds the plugin at runtime

Fix the library name to match that of the qmldir file, so that the app finds the plugin at runtime. In addition, there's also a trivial fix to the apparmor profile.

There are two possible options to test that this works:

1) Install the click package created from this branch and check that it runs on the device:
http://people.canonical.com/~dpm/click/com.ubuntu.filemanager_0.3_armhf.click

Alternatively:

2) Run the app on the device via Qt Creator:

- Start Qt Creator
- Open the top CMakeLists.txt file from this branch
- Ensure you select the UbuntuSDK armhf kit when prompted by Qt Creator (*)
- Modify the desktop file as a workaround for a Qt Creator bug. Change the Exec line to read:
  Exec=lib/arm-linux-gnueabihf/bin/@EXEC@
- Ensure you've got a device connected and that the armhf kit is selected
- Press the big green "Play" button or Ctrl+R
- The app should be deployed (unconfined) and be running on your device now

(*) If you don't have an armhf click kit, you'll need to create a click chroot first:

- Go to Tools > Options > Ubuntu > Click
- Click on Create Click Target
- Once created, you'll need to add the dependencies for the file manager app:
  - Click on the Maintain button on your chroot
  - On the terminal prompt that is started, type 'apt-get install libtag1-dev:armhf'
  - Close the terminal when the installation finishes
- Now you can either do a clean checkout and wait to be prompted by Qt Creator to add the armhf kit, or alternatively:
- Go to the Projects tab > Add kit and then select the UbuntuSDK armhf kit

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

PASSED: Continuous integration, rev:163
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/169/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2192
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/169
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/169
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/119

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested the click on my nexus 4 and it works well.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Also got it building and running on device..

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/56/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2193
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/43

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Apart from the file location, the version and name of the library were the other things I had in question. Glad you knew the answer!

[David Planella (dpm)]

Nick, would you know why Jenkins is failing on the second pass? Would it be
possible to retrigger the jobs?

On Thu, Apr 24, 2014 at 5:14 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> Apart from the file location, the version and name of the library were the
> other things I had in question. Glad you knew the answer!
> --
>
> https://code.launchpad.net/~dpm/ubuntu-filemanager-app/fix-libname/+merge/217007
> You are the owner of lp:~dpm/ubuntu-filemanager-app/fix-libname.
>

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

David, I re-triggered. Now that these build issues are solved, it's time to look at the tests and do some spring cleaning as well..

=== modified file 'apparmor.json'
--- apparmor.json	2014-04-15 08:19:12 +0000
+++ apparmor.json	2014-04-24 09:09:22 +0000
@@ -1,4 +1,5 @@
 {
-    "policy_version": 1.1, 
-    "template": "unconfined"
-}
+    "policy_version": 1.1,
+    "template": "unconfined",
+    "policy_groups": []
+}
\ No newline at end of file

=== modified file 'src/plugin/folderlistmodel/CMakeLists.txt'
--- src/plugin/folderlistmodel/CMakeLists.txt	2014-03-29 17:04:56 +0000
+++ src/plugin/folderlistmodel/CMakeLists.txt	2014-04-24 09:09:22 +0000
@@ -34,11 +34,11 @@
     trash/qtrashdir.h
 )
 
-add_library(folderlistmodel MODULE
+add_library(nemofolderlistmodel MODULE
     ${folderlistmodel_SRCS}
 )
 
-qt5_use_modules(folderlistmodel Gui Qml Quick Widgets)
+qt5_use_modules(nemofolderlistmodel Gui Qml Quick Widgets)
 
 # Copy qmldir file to build dir for running in QtCreator
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
@@ -49,6 +49,6 @@
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
 # Install plugin file
-install(TARGETS folderlistmodel DESTINATION ${QT_IMPORTS_DIR}/org/nemomobile/folderlistmodel/)
+install(TARGETS nemofolderlistmodel DESTINATION ${QT_IMPORTS_DIR}/org/nemomobile/folderlistmodel/)
 install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/org/nemomobile/folderlistmodel/)