Merge lp:~renatofilho/ubuntu-docviewer-app/ubunut-app-platform into lp:ubuntu-docviewer-app

[Renato Araujo Oliveira Filho]

Create snapcract package.

[lp:~renatofilho/ubuntu-docviewer-app/ubunut-app-platform]

357. By Renato Araujo Oliveira Filho on 2016-12-09

Filter files packed into the snap.

358. By Renato Araujo Oliveira Filho on 2016-12-09

Avoid build problems if qmake fail to report the correct QML_DIR.

[Pat McGowan (pat-mcgowan)]

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake	2016-03-10 22:37:32 +0000
+++ cmake/modules/Click.cmake	2016-12-09 15:31:32 +0000
@@ -69,5 +69,12 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
+  if (QT_IMPORTS_DIR STREQUAL "")
+     set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml")
+     message(STATUS "QT_IMPORTS_DIR is empty using default one: ${QT_IMPORTS_DIR}")
+  else()
+     message(STATUS "QT_IMPORTS_DIR set to ${QT_IMPORTS_DIR}")
+  endif()
+
   set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
 endif(CLICK_MODE)

=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-12-09 15:31:32 +0000
@@ -0,0 +1,70 @@
+name: ubuntu-docviewer-app
+version: 2.1.350
+summary: Document Viewer
+description: Document Viewer application for Ubuntu devices
+confinement: strict
+grade: devel
+
+apps:
+    ubuntu-docviewer-app:
+        command: desktop-launch $SNAP/usr/bin/ubuntu-docviewer-app ---documentsDir=$(HOME=/home/$USER xdg-user-dir DOCUMENTS) -desktop_file_hint=unity8 "$@"
+        plugs:
+            - home
+            - opengl
+            - platform
+            - unity7
+            - unity8
+
+plugs:
+    platform:
+        interface: content
+        content: ubuntu-app-platform1
+        target: ubuntu-app-platform
+        default-provider: ubuntu-app-platform
+
+parts:
+    ubuntu-docviewer-app:
+        plugin: cmake
+        configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
+        source: .
+        build-packages:
+            - cmake
+            - intltool
+            - libpoppler-qt5-dev
+            - qtbase5-private-dev
+            - qtdeclarative5-private-dev
+            - qtdeclarative5-qtquick2-plugin
+        stage-packages:
+            - qtdeclarative5-poppler1.0
+            - xdg-user-dirs
+        snap:
+            # ubuntu-docviewer-app
+            - usr/bin/ubuntu-docviewer-app
+            - usr/share/applications
+            - usr/share/locale
+            - usr/share/ubuntu-docviewer-app
+
+            # qtdeclarative5-documentviewer-common
+            # qtdeclarative5-documentviewer-libreoffice
+            # qtdeclarative5-documentviewer-pdf
+            - usr/lib/*/qt5/qml/DocumentViewer
+
+            # qtdeclarative5-poppler1.0
+            - usr/lib/*/qt5/qml/org/docviewer
+            - usr/share/doc/qtdeclarative5-poppler1.0/copyright
+
+            # xdg-user-dirs
+            - usr/share/locale/*/LC_MESSAGES/xdg-user-dirs.mo
+            - usr/bin/xdg-user-dir
+            - usr/bin/xdg-user-dirs-update
+            - etc/xdg/user-dirs.conf
+            - etc/xdg/user-dirs.defaults
+            - etc/X11/Xsession.d/60xdg-user-dirs-update
+            - usr/share/doc/xdg-user-dirs/copyright
+            - usr/share/doc/xdg-user-dirs/AUTHORS
+
+    platform:
+        plugin: dump
+        source: snap
+        after: [desktop-ubuntu-app-platform]
+        snap: [ubuntu-app-platform]

=== modified file 'src/app/config.h.in'
--- src/app/config.h.in	2015-10-20 11:58:48 +0000
+++ src/app/config.h.in	2016-12-09 15:31:32 +0000
@@ -21,6 +21,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QString>
 
+static QString SNAP_ENV = qgetenv("SNAP");
+
 inline bool isClick() {
     static bool click = (QCoreApplication::applicationDirPath().contains("click.ubuntu.com"));
     return click;
@@ -34,7 +36,9 @@
 
 inline QString docviewerDirectory()
 {
-    if (isClick()) {
+    if (!SNAP_ENV.isEmpty()) {
+        return SNAP_ENV + QString("@CMAKE_INSTALL_PREFIX@/@DATA_DIR@");
+    } else if (isClick()) {
         return QString(".");
     } else if (isRunningInstalled()) {
         return QString("@CMAKE_INSTALL_PREFIX@/@DATA_DIR@");