Merge lp:~dpm/ubuntu-docviewer-app/cmake-fixes into lp:ubuntu-docviewer-app/trunk

[David Planella]

Some cmake fixes for the app to build from Qt Creator or plain cmake.

Some cmake fixes for the app to build from Qt Creator or plain cmake.

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

PASSED: Continuous integration, rev:32
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/67/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/507
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/507/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/39

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Awesome, managed to build and review a click package inside qtcreator and with click-buddy.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-17 16:32:46 +0000
+++ CMakeLists.txt	2014-09-24 09:47:51 +0000
@@ -10,36 +10,48 @@
 option(CLICK_MODE "Installs to a contained location" on)
 
 set(APP_NAME docviewer)
-set(DESKTOP_FILE "ubuntu-docviewer-app.desktop")
+set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
 #set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 set(MAIN_QML ubuntu-docviewer-app.qml)
 set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR ubuntu_docviewer_app)
 set(APP_HARDCODE docviewer-app)
-set(UBUNTU_MANIFEST_PATH "manifest.json" CACHE INTERNAL "Relative path to the manifest file")
+set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
-		set(BZR_SOURCE "lp:ubuntu-${APP_HARDCODE}")
-		message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+        set(BZR_SOURCE "lp:ubuntu-${APP_HARDCODE}")
+        message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
     endif(NOT DEFINED BZR_SOURCE)
+    if(NOT BZR_REVNO)
+        set(BZR_REVNO "latest")
+    endif(NOT BZR_REVNO)
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
-	set(DATA_DIR /)
-	set (ICON ${ICON_FILE})
-	set(EXEC "qmlscene %u ${MAIN_QML}")
-	set(DESKTOP_DIR ${DATA_DIR})
-	set(URLS_DIR ${DATA_DIR})
+    set(DATA_DIR /)
+    set (ICON ${ICON_FILE})
+    set(EXEC "qmlscene %u ${MAIN_QML}")
+    set(DESKTOP_DIR ${DATA_DIR})
+    set(URLS_DIR ${DATA_DIR})
+    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor
+            DESTINATION ${CMAKE_INSTALL_PREFIX})
+    # Make the click files visible in Qt Creator
+    file(GLOB CLICK_FILES
+         RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+         *.json *.json.in *.apparmor)
+
+    add_custom_target(com_ubuntu_shorts_CLICKFiles ALL SOURCES ${CLICK_FILES})
 else(CLICK_MODE)
-	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/ubuntu-${APP_HARDCODE})
-	set(EXEC ${APP_HARDCODE})
-	set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
-	configure_file(${APP_HARDCODE}.in
-		${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
-	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
-		DESTINATION ${CMAKE_INSTALL_BINDIR})
-	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-	set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
+    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/ubuntu-${APP_HARDCODE})
+    set(EXEC ${APP_HARDCODE})
+    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
+    configure_file(${APP_HARDCODE}.in
+        ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
+        DESTINATION ${CMAKE_INSTALL_BINDIR})
+    set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+    set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES

=== removed file '[e-mail]'
Binary files [e-mail]	2013-02-12 16:18:48 +0000 and [e-mail]	1970-01-01 00:00:00 +0000 differ
=== renamed file 'ubuntu-docviewer-app.desktop.in.in' => 'com.ubuntu.docviewer.desktop.in.in'
--- ubuntu-docviewer-app.desktop.in.in	2014-09-11 20:10:32 +0000
+++ com.ubuntu.docviewer.desktop.in.in	2014-09-24 09:47:51 +0000
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
 Exec=@EXEC@
 Icon=@ICON@
-Name=Document Viewer
+_Name=Document Viewer
+_Keywords=documents;viewer;pdf;reader;
 MimeType=text/plain;image/png;image/jpeg;image/svg+xml;application/pdf
-Path=/usr/share/ubuntu-docviewer-app
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage

=== modified file 'docviewer.apparmor'
--- docviewer.apparmor	2014-09-14 16:09:19 +0000
+++ docviewer.apparmor	2014-09-24 09:47:51 +0000
@@ -1,4 +1,4 @@
 {
     "policy_groups": [],
     "policy_version": 1.2
-}
+}
\ No newline at end of file

=== renamed file 'manifest.json' => 'manifest.json.in'
--- manifest.json	2014-09-12 21:37:38 +0000
+++ manifest.json.in	2014-09-24 09:47:51 +0000
@@ -1,15 +1,15 @@
 {
     "description": "Document Viewer application for Ubuntu devices",
-    "framework": "ubuntu-sdk-13.10",
-    "architecture": "@CLICK_ARCH@",
+    "framework": "ubuntu-sdk-14.10-qml-dev3",
+    "architecture": "all",
     "hooks": {
-        "ubuntu-docviewer-app": {
+        "docviewer": {
             "apparmor": "docviewer.apparmor",
-            "desktop": "ubuntu-docviewer-app.desktop"
+            "desktop": "com.ubuntu.docviewer.desktop"
         }
     },
-    "maintainer": "Granger Anthony <[e-mail]>",
-    "name": "com.ubuntu.ubuntu-docviewer-app",
-    "title": "Docviewer",
-    "version": "0.1"
+    "maintainer": "Ubuntu App Cats <[e-mail]>",
+    "name": "com.ubuntu.docviewer",
+    "title": "Document viewer",
+    "version": "0.1.@BZR_REVNO@"
 }

=== modified file 'ubuntu-docviewer-app.qml'
--- ubuntu-docviewer-app.qml	2014-03-13 18:11:54 +0000
+++ ubuntu-docviewer-app.qml	2014-09-24 09:47:51 +0000
@@ -11,7 +11,7 @@
 MainView {
     objectName: "docviewer"
 
-    applicationName: "ubuntu-docviewer-app"
+    applicationName: "com.ubuntu.docviewer"
     
     width: units.gu(50)
     height: units.gu(75)