Migrate to CMake

CMakeLists.txt

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.0.0)
+project(telescope C CXX)
+
+# Automatically create moc files
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickControls2 REQUIRED)
+
+execute_process(
+    COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+    OUTPUT_VARIABLE ARCH_TRIPLET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
+
+set(PROJECT_NAME "telescope")
+set(FULL_PROJECT_NAME "telescope.asteroidos")
+set(DATA_DIR /)
+set(DESKTOP_FILE_NAME ${PROJECT_NAME}.desktop)
+
+# This command figures out the minimum SDK framework for use in the manifest
+# file via the environment variable provided by Clickable or sets a default value otherwise.
+if(DEFINED ENV{SDK_FRAMEWORK})
+    set(CLICK_FRAMEWORK "$ENV{SDK_FRAMEWORK}")
+else()
+    set(CLICK_FRAMEWORK "ubuntu-sdk-20.04")
+endif()
+
+# This figures out the target architecture for use in the manifest file.
+if(DEFINED ENV{ARCH})
+    set(CLICK_ARCH "$ENV{ARCH}")
+else()
+    execute_process(
+        COMMAND dpkg-architecture -qDEB_HOST_ARCH
+        OUTPUT_VARIABLE CLICK_ARCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endif()
+
+configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})
+install(FILES asteroidsyncserviced.apparmor DESTINATION ${DATA_DIR})
+install(FILES assets/icon.svg assets/icon.png DESTINATION assets)
+
+# Translations
+file(GLOB_RECURSE I18N_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po qml/*.qml qml/*.js)
+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE_NAME}.in.h)
+
+find_program(INTLTOOL_MERGE intltool-merge)
+if(NOT INTLTOOL_MERGE)
+    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
+endif()
+find_program(INTLTOOL_EXTRACT intltool-extract)
+if(NOT INTLTOOL_EXTRACT)
+    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
+endif()
+
+add_custom_target(${DESKTOP_FILE_NAME} ALL
+    COMMENT "Merging translations into ${DESKTOP_FILE_NAME}..."
+    COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_SOURCE_DIR}/${DESKTOP_FILE_NAME}.in ${DESKTOP_FILE_NAME}
+    COMMAND sed -i 's/${PROJECT_NAME}-//g' ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DATA_DIR})
+
+add_subdirectory(po)
+add_subdirectory(app)
+add_subdirectory(asteroidsyncservice)
+
+# Make source files visible in qtcreator
+file(GLOB_RECURSE PROJECT_SRC_FILES
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    qml/*.qml
+    qml/*.js
+    app/*
+    asteroidsyncservice/*
+    *.json
+    *.json.in
+    *.apparmor
+    *.desktop.in
+)
+
+add_custom_target(${PROJECT_NAME}_FILES ALL SOURCES ${PROJECT_SRC_FILES})

app/CMakeLists.txt

@@ -0,0 +1,5 @@
+qt5_add_resources(QT_RESOURCES app.qrc)
+add_executable(${PROJECT_NAME} main.cpp ${QT_RESOURCES})
+set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE -s)
+target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Qml Qt5::Quick Qt5::QuickControls2)
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})

app/qml/components/ExpandableListItem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 ListItem {
     id: expandableListItem
@@ -45,7 +45,7 @@ ListItem {
                     rotation: expandableListItem.expansion.expanded ? 180 : 0
 
                     Behavior on rotation {
-                        UbuntuNumberAnimation {}
+                        LomiriNumberAnimation {}
                     }
                 }
             }

app/qml/components/InfoBar.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Rectangle {
     id: infoBar
@@ -49,14 +49,14 @@ Rectangle {
     SequentialAnimation {
         id: animaDestroy
 
-        UbuntuNumberAnimation {
+        LomiriNumberAnimation {
             target: infoBar.anchors
             property: "bottomMargin"
             to: -infoBar.height
             duration: 500; easing.type: Easing.InOutCirc
         }
 
-        UbuntuNumberAnimation {
+        LomiriNumberAnimation {
             target: infoBar
             property: "opacity"
             to: 0
@@ -66,10 +66,10 @@ Rectangle {
 
 
     Behavior on opacity {
-        UbuntuNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
+        LomiriNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
     }
 
     Behavior on anchors.bottomMargin {
-        UbuntuNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
+        LomiriNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
     }
 }

app/qml/components/NotificationServiceItem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import "../components"
 
 Item {

app/qml/components/StandardListItem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 ListItem {
     id: listItem

app/qml/pages/ExportPage.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.9
-import Ubuntu.Components 1.3
-import Ubuntu.Content 1.3
+import Lomiri.Components 1.3
+import Lomiri.Content 1.3
 import "../components"
 
 Page {

app/qml/pages/InfoPage.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
 
@@ -33,7 +33,7 @@ Page {
         anchors.top: header.bottom
         width:parent.width
 
-        UbuntuShape {
+        LomiriShape {
             width: units.gu(15); height: units.gu(15)
             anchors.horizontalCenter: parent.horizontalCenter
             radius: "medium"
@@ -53,7 +53,7 @@ Page {
 
         Label {
             width: parent.width
-            color: UbuntuColors.ash
+            color: LomiriColors.ash
             horizontalAlignment: Text.AlignHCenter
             text: i18n.tr("Version ") + "0.0.7"
         }
@@ -67,7 +67,7 @@ Page {
 
         Label {
             width: parent.width
-            linkColor: UbuntuColors.orange
+            linkColor: LomiriColors.orange
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             //TRANSLATORS: Please make sure the URLs are correct

app/qml/pages/LoadingPage.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
     id: root

app/qml/pages/LocationPicker.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
 

app/qml/pages/MainMenuPage.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Controls.Suru 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import "../components"
 
 Page {

app/qml/pages/ScreenshotPage.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import Ubuntu.Content 1.3
+import Lomiri.Components 1.3
+import Lomiri.Content 1.3
 
 Page {
     id: scrShot

app/qml/pages/WatchesPage.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Controls.Suru 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
     id: watchesPage

app/qml/pages/WeatherSettingsDialog.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
 

app/qml/telescope.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import org.asteroid.syncservice 1.0
 import "controller"
 

asteroidsyncserviced.apparmor

@@ -8,5 +8,5 @@
         "content_exchange_source"
     ],
     "template": "unconfined",
-    "policy_version": 16.04
+    "policy_version": 20.04
 }

clickable.yaml

@@ -1,7 +1,7 @@
-clickable_minimum_required: 7.1.2
-builder: qmake
+clickable_minimum_required: 8.0.0
+builder: cmake
 kill: telescope
-build_args: CONFIG+=telescope
-make_jobs: 2
+build_args: -DUBUNTU_TOUCH_PLATFORM=ON
+make_jobs: 1
 ignore_review_warnings: true
 

manifest.json.in

@@ -15,6 +15,6 @@
     },
     "version": "0.0.7",
     "maintainer": "Stefan Weng <[email protected]>",
-    "framework" : "ubuntu-sdk-16.04.5"
+    "framework" : "ubuntu-sdk-20.04"
 }
 

po/CMakeLists.txt

@@ -0,0 +1,36 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${FULL_PROJECT_NAME})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+# Creates the .pot file containing the translations template
+add_custom_target(${POT_FILE} ALL
+    COMMENT "Generating translation template"
+    COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+        --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE_NAME}.in
+
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+        -D ${CMAKE_CURRENT_SOURCE_DIR}
+        -D ${CMAKE_CURRENT_BINARY_DIR}
+        --from-code=UTF-8
+        --c++ --qt --language=javascript --add-comments=TRANSLATORS
+        --keyword=tr --keyword=tr:1,2 --keyword=ctr:1c,2 --keyword=dctr:2c,3 --keyword=N_ --keyword=_
+        --keyword=dtr:2 --keyword=dtr:2,3 --keyword=tag --keyword=tag:1c,2
+        --package-name='${DOMAIN}'
+        --sort-by-file
+        ${I18N_SRC_FILES}
+#    COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# Builds the binary translations catalog for each language
+# it finds source translations (*.po) for
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/share/locale/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

telescope.apparmor

@@ -5,5 +5,5 @@
         "accounts"
     ],
     "template": "unconfined",
-    "policy_version": 16.04
+    "policy_version": 20.04
 }

telescope.desktop.in

@@ -4,4 +4,4 @@ Exec=env QML2_IMPORT_PATH=usr/lib/$${ARCH_TRIPLET}/qt5/qml telescope
 Icon=assets/icon.svg
 Terminal=false
 Type=Application
-X-Ubuntu-Touch=true
+X-Lomiri-Touch=true