From e25e526ec105e10322b1edaf6d7f16455c843053 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <thrrgilag@dreamfall.space>
Date: Mon, 6 Sep 2021 14:47:09 -0700
Subject: [PATCH] revert to using on-device builds for package

---
 CMakeLists.txt | 20 +++++++++++++-------
 clickable.json |  5 +++++
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 clickable.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09ec9a3..1564433 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ execute_process(
 set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
 
 set(APP_NAME "Pantalaimon UT")
-set(APP_VERSION "0.5.0")
+set(APP_VERSION "0.6.0")
 set(PROJECT_NAME "pantalaimon")
 set(FULL_PROJECT_NAME "pantalaimon.thrrgilag")
 set(CMAKE_INSTALL_PREFIX /)
@@ -41,7 +41,7 @@ endif()
 
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
 configure_file(AboutPage.qml.in ${CMAKE_CURRENT_BINARY_DIR}/AboutPage.qml)
-configure_file(pantalaimon.sh.in ${CMAKE_CURRENT_BINARY_DIR}/pantalaimon.sh)
+# NOTE: cross-build: configure_file(pantalaimon.sh.in ${CMAKE_CURRENT_BINARY_DIR}/pantalaimon.sh)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
 install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})
 install(DIRECTORY assets DESTINATION ${DATA_DIR})
@@ -49,13 +49,14 @@ install(DIRECTORY src DESTINATION ${DATA_DIR})
 
 install(DIRECTORY qml DESTINATION ${DATA_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AboutPage.qml DESTINATION ${DATA_DIR}qml/)
-# TODO: example config file for local testing
+# NOTE: example config file for local testing
 # install(FILES example.conf DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimon.conf)
 
-file(GLOB_RECURSE OLM_SO_FILES "$ENV{OLM_LIB_INSTALL_DIR}/lib/libolm.so*")
-install(FILES ${OLM_SO_FILES} DESTINATION ${QT_IMPORTS_DIR})
-install(PROGRAMS build/${ARCH_TRIPLET}/pantalaimon/dist/pantalaimon DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimonexec)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantalaimon.sh DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimon)
+# NOTE: cross-build: thesse are used for the cross compiled package
+# file(GLOB_RECURSE OLM_SO_FILES "$ENV{OLM_LIB_INSTALL_DIR}/lib/libolm.so*")
+# install(FILES ${OLM_SO_FILES} DESTINATION ${QT_IMPORTS_DIR})
+# install(PROGRAMS build/${ARCH_TRIPLET}/pantalaimon/dist/pantalaimon DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimonexec)
+# install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantalaimon.sh DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimon)
 
 # Translations
 file(GLOB_RECURSE I18N_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po qml/*.qml qml/*.js)
@@ -78,6 +79,11 @@ add_custom_target(${DESKTOP_FILE_NAME} ALL
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DATA_DIR})
 
+# NOTE: dev-build: these are used for the dev-build package
+install(PROGRAMS pantalaimon-${CLICK_ARCH} DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME pantalaimon)
+install(PROGRAMS panctl-${CLICK_ARCH} DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME panctl)
+# TODO: not needed? install(PROGRAMS build/${ARCH_TRIPLET}/pantalaimon/dist/pantalaimon DESTINATION ${CMAKE_INSTALL_PREFIX})
+
 add_subdirectory(po)
 
 # Make source files visible in qtcreator
diff --git a/clickable.json b/clickable.json
new file mode 100644
index 0000000..bafb7fc
--- /dev/null
+++ b/clickable.json
@@ -0,0 +1,5 @@
+{
+  "clickable_minimum_required": "6.12.2",
+  "builder": "cmake",
+  "kill": "qmlscene"
+}