Merge lp:~achiang/telegram-app/libqtelegram-click-prep-2 into lp:telegram-app/app

[Alex Chiang]

With this MP, we now have click packaging working 100% from the command line and *mostly* from the IDE. You can push the resulting click to the phone, install it, and launch it. It will get through a few screens before it crashes.

If you attempt from the IDE, you will get garbage. Not sure why that is yet, still debugging there...

There are lots and lots of commits in here; please read the individual commit logs to get a sense for the evolution.

[lp:~achiang/telegram-app/libqtelegram-click-prep-2]

34. By Alex Chiang on 2014-07-31

deps.sh: fix merge conflict

35. By Alex Chiang on 2014-07-31

Fix merge conflicts

36. By Alex Chiang on 2014-07-31

CMakeLists.txt: ensure ui/ and js/ are copied during installation

[Alex Chiang (achiang)]

Note -- after merging with latest trunk, the app fails to start again. :( But I verified that reverting the merge with latest trunk, the app can still start.

So -- my request is that we just land this (modulo review comments) and iterate debugging why latest version crashes.

[Alex Chiang (achiang)]

Ah, ok. Latest merge causes crashers because qml-module-qt-labs-settings is not installed in the image.

I installed it as root, but for the general case, this might be a problem...

[Michał Karnicki (karni)]

Left minor in-line comments.

Regarding qml-module-qt-labs-settings -- let's verify if this will get into the image. If not, we can switch to using U1db, which should be rather easy/quick. (Too bad, the labs settings were very convenient to use.)

The app builds correctly, tested with the click package received in the mail.
(Most importantly, the app boots, I didn't see anything on the dialogs list, but that is not related to this MP. Contacts list works fine.)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-15 23:03:19 +0000
+++ CMakeLists.txt	2014-07-31 03:01:55 +0000
@@ -9,13 +9,13 @@
 
 # Sets BZR_REVNO
 execute_process(
-    COMMAND bzr revno
+    COMMAND bzr revno ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE BZR_REVNO
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 # Sets VERSION_TAG
 execute_process(
-    COMMAND bzr tags
+    COMMAND bzr tags -d ${CMAKE_SOURCE_DIR}
     COMMAND tail -n1
     COMMAND tr -s " "
     COMMAND cut -d " " -f1
@@ -24,7 +24,7 @@
 )
 # Sets VERSION_REV
 execute_process(
-    COMMAND bzr tags
+    COMMAND bzr tags -d ${CMAKE_SOURCE_DIR}
     COMMAND tail -n1
     COMMAND tr -s " "
     COMMAND cut -d " " -f2
@@ -38,10 +38,10 @@
 # Semantic versioning.
 set(APP_VERSION "${VERSION_TAG}+${VERSION_REV}")
 message("-- app version: ${APP_VERSION}")
-set(APP_ICON "telegram.png")
+set(APP_ICON "images/telegram.png")
 
 execute_process(
-    COMMAND dpkg-architecture -qDEB_BUILD_ARCH
+    COMMAND dpkg-architecture -qDEB_HOST_ARCH
     OUTPUT_VARIABLE ARCH
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
@@ -52,7 +52,7 @@
 )
 
 set(ARCHITECTURE "${ARCH}")
-set(FRAMEWORK "ubuntu-sdk-14.10-qml-dev3")
+set(FRAMEWORK "ubuntu-sdk-14.10-dev2")
 
 set(MAIN_QML "${APP_NAME}.qml")
 set(DESKTOP_FILE "${APP_NAME}.desktop")
@@ -78,9 +78,9 @@
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
     set(ICON ".${DATA_DIR}/${APP_ICON}")
-    set(EXEC "qmlscene $@ -I .${QT_IMPORTS_DIR} ${MAIN_QML}")
-    set(DESKTOP_DIR ${DATA_DIR})
-    set(URLS_DIR ${DATA_DIR})
+    set(EXEC "qmlscene $@ ${MAIN_QML}")
+    set(DESKTOP_DIR ${CMAKE_INSTALL_PREFIX})
+#    set(URLS_DIR ${CMAKE_INSTALL_PREFIX})
 else()
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
     configure_file(${APP_NAME}.in
@@ -90,7 +90,7 @@
     set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     set(EXEC ${APP_NAME})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-    set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
+#    set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
 endif()
 
 configure_file(
@@ -125,11 +125,21 @@
 #endforeach(LINE)
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE}
     DESTINATION ${DESKTOP_DIR}
 )
-install(
-    FILES ${URLS_FILE}
-    DESTINATION ${URLS_DIR}
-)
+#install(
+#    FILES ${URLS_FILE}
+#    DESTINATION ${URLS_DIR}
+#)
+install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(FILES "apparmor.json" DESTINATION ${DATA_DIR})
+install(DIRECTORY "images" DESTINATION ${DATA_DIR})
+install(DIRECTORY "ui" DESTINATION ${DATA_DIR})
+install(DIRECTORY "js" DESTINATION ${DATA_DIR})
 
+# Ensure all source files appear in QtCreator's UI
+add_subdirectory(library)
+add_subdirectory(components)
+file(GLOB QML_JS_FILES *.qml *.js ui/*.qml js/*.js)
+add_custom_target(QML_JS_TARGET ALL SOURCES ${QML_JS_FILES})

=== modified file 'README.org'
--- README.org	2014-07-17 20:28:07 +0000
+++ README.org	2014-07-31 03:01:55 +0000
@@ -43,3 +43,7 @@
   ** TODO Decide if we use i18n.tr() or qsTr() for translation.
   ** TODO Could we get rid of qtmultimedia5-dev build-dep?
 
+Building in the IDE
+* be sure to import CMakeLists.txt and not the qmlproject
+* "maintain" the armhf chroot and install bzr libssl-dev:armhf libsqlite3-dev:armhf
+* add -DCLICK_MODE=on as a cmake command line arg

=== modified file 'build.sh'
--- build.sh	2014-07-22 05:32:18 +0000
+++ build.sh	2014-07-31 03:01:55 +0000
@@ -33,15 +33,9 @@
 # ignore consoletelegram and uitest
 sed '/\(add_subdirectory(consoletelegram)\|add_subdirectory(uitest)\)/d' ./CMakeLists.txt > tmp.txt
 mv tmp.txt CMakeLists.txt
-mkdir -p build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib/$ARCH_TRIPLET
-make
 
 cd ..
 
-if [ "$#" -eq 1 ]; then
-    rm -rf build
-fi
-
+rm -rf build
 mkdir -p build && cd build
-cmake .. && make
+cmake .. -DCLICK_MODE=1 && make

=== modified file 'click.sh'
--- click.sh	2014-07-15 23:03:19 +0000
+++ click.sh	2014-07-31 03:01:55 +0000
@@ -8,23 +8,21 @@
 
 rm -rf click
 mkdir -p click
-mkdir -p click/lib/$ARCH
-
-cp build/manifest.json click/
-cp build/telegram.desktop click/
-cp -r build/modules/* click/lib/$ARCH_TRIPLET/
-
-cp telegram.json click/
+mkdir -p click/lib/$ARCH_TRIPLET
+
+cp manifest.json click/
+cp telegram.desktop click/
+
+cp -a build/library/lib/libqtelegram.so* click/lib/$ARCH_TRIPLET
+cp -a build/library/qmlplugin/Telegram click/lib/$ARCH_TRIPLET
+
+cp apparmor.json click/
 cp telegram.qml click/
-cp -r components click/
-cp -r images click/
-cp -r ui click/
+cp telegram.pub click/
+cp -a components click/
+cp -a images click/
+cp -a ui click/
+cp -a js click/
 
-if [ $ARCH = "armhf" ]; then
-    echo "Building and installing click package."
-    click build ./click
-    pkcon install-local *.click
-    echo "Done."
-else
-    echo "Done."
-fi
+echo "Building and installing click package."
+click build ./click

=== modified file 'deps.sh'
--- deps.sh	2014-07-29 16:28:13 +0000
+++ deps.sh	2014-07-31 03:01:55 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-apt-get -y install build-essential cmake pkg-config libssl-dev qt5-default qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev libsqlite3-dev qtdeclarative5-ubuntu-telephony-phonenumber0.1 python3-simplejson qml-module-qt-labs-settings
+apt-get -y install build-essential cmake pkg-config libssl-dev qt5-default qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev libsqlite3-dev qtdeclarative5-ubuntu-telephony-phonenumber0.1 python3-simplejson qml-module-qt-labs-settings bzr

=== modified file 'images/telegram.png'
Binary files images/telegram.png	2014-07-15 23:03:19 +0000 and images/telegram.png	2014-07-31 03:01:55 +0000 differ
=== modified file 'manifest.json.in'
--- manifest.json.in	2014-07-15 23:03:19 +0000
+++ manifest.json.in	2014-07-31 03:01:55 +0000
@@ -8,8 +8,7 @@
     "hooks": {
         "@APP_NAME@": {
             "apparmor": "apparmor.json",
-            "desktop": "@APP_NAME@.desktop",
-            "urls": "@APP_NAME@.url-dispatcher"
+            "desktop": "@APP_NAME@.desktop"
         }
     },
     "icon": "@APP_ICON@",

=== modified file 'run.sh'
--- run.sh	2014-07-18 22:46:26 +0000
+++ run.sh	2014-07-31 03:01:55 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LIBDIR="library/build/qmlplugin"
+LIBDIR="build/library/qmlplugin"
 if [ ! -d "$LIBDIR" ]; then
     echo "Library not present. Invoke ./getlib.sh first."
     exit -1

=== removed file 'telegram.json'
--- telegram.json	2014-07-15 23:03:19 +0000
+++ telegram.json	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-{
-    "policy_groups": [
-        "networking"
-    ],
-    "policy_version": 1.2
-}
\ No newline at end of file

=== modified file 'telegram.qml'
--- telegram.qml	2014-07-29 17:07:46 +0000
+++ telegram.qml	2014-07-31 03:01:55 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.1
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 import "ui"
 
 MainView {

=== modified file 'ui/ContactsPage.qml'
--- ui/ContactsPage.qml	2014-07-30 16:54:56 +0000
+++ ui/ContactsPage.qml	2014-07-31 03:01:55 +0000
@@ -3,7 +3,7 @@
 import "../components"
 import "../components/listitems"
 import "../js/time.js" as Time
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 
 TelegramPage {
     title: i18n.tr('Contacts');

=== modified file 'ui/DialogPage.qml'
--- ui/DialogPage.qml	2014-07-29 17:07:46 +0000
+++ ui/DialogPage.qml	2014-07-31 03:01:55 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import "../components"
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 
 TelegramPage {
     id: page

=== modified file 'ui/DialogsPage.qml'
--- ui/DialogsPage.qml	2014-07-30 16:54:56 +0000
+++ ui/DialogsPage.qml	2014-07-31 03:01:55 +0000
@@ -4,7 +4,7 @@
 import "../components"
 import "../components/listitems"
 import "../js/time.js" as Time
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 
 TelegramPage {
     title: i18n.tr('Telegram');