From daa5144ccc92c9060f712f7fccfe750966186f51 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@pelagicore.com>
Date: Tue, 4 Dec 2018 14:14:19 +0100
Subject: Use the new appman qmake integration for packaging the apps

Fixes: AUTOSUITE-691
Change-Id: I9e7b2f8ce6443c72e44e63b50902a50c8654bf6f
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
---
 qmake-features/app.prf       | 10 ----------
 qmake-features/package.prf   | 32 --------------------------------
 qmake-features/qmlplugin.prf | 23 -----------------------
 3 files changed, 65 deletions(-)
 delete mode 100644 qmake-features/app.prf
 delete mode 100644 qmake-features/package.prf
 delete mode 100644 qmake-features/qmlplugin.prf

(limited to 'qmake-features')

diff --git a/qmake-features/app.prf b/qmake-features/app.prf
deleted file mode 100644
index 0329256..0000000
--- a/qmake-features/app.prf
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = aux
-
-APPMAN_APP = TRUE
-
-app.files = $$FILES
-app.path = $$OUT_PWD/../install/
-
-isEmpty(NAME): NAME = $$basename(_PRO_FILE_PWD_)
-
-INSTALLS += app
diff --git a/qmake-features/package.prf b/qmake-features/package.prf
deleted file mode 100644
index 23d9d3a..0000000
--- a/qmake-features/package.prf
+++ /dev/null
@@ -1,32 +0,0 @@
-# generate code coverage information using gcov/lcov/genhtml
-message("PACKAGE")
-CONFIG(debug,debug|release) {
-    equals(TEMPLATE, "subdirs") {
-        package.target = package
-        package.CONFIG = recursive
-        QMAKE_EXTRA_TARGETS += package
-    } equals(APPMAN_APP, "TRUE") {
-
-        !isEmpty(EXTRA_METADATA): OPTIONS += --extra-metadata $$EXTRA_METADATA
-        !isEmpty(EXTRA_METADATA_FILE): OPTIONS += --extra-metadata-file $$EXTRA_METADATA_FILE
-        !isEmpty(EXTRA_SIGNED_METADATA): OPTIONS += --extra-signed-metadata $$EXTRA_SIGNED_METADATA
-        !isEmpty(EXTRA_SIGNED_METADATA_FILE): OPTIONS += --extra-signed-metadata-file $$EXTRA_SIGNED_METADATA_FILE
-
-        # The actual packaging step
-        package.CONFIG += recursive
-        package.commands += @echo && echo "PACKAGING $$NAME" && echo &&
-        package.commands += $$[QT_HOST_BINS]/appman-packager create-package $${OPTIONS} $${BUILD_DIR}/$${NAME}.pkg $$OUT_PWD/../install
-        build_pass|!debug_and_release:package.depends = install
-
-        QMAKE_EXTRA_TARGETS *= package
-
-        QMAKE_CLEAN += $${BUILD_DIR}/$${NAME}.pkg
-    } else {
-        # Create a dummy target for all other project files
-        package.CONFIG += recursive
-        build_pass|!debug_and_release:package.depends = install
-
-        QMAKE_EXTRA_TARGETS *= package
-    }
-}
-
diff --git a/qmake-features/qmlplugin.prf b/qmake-features/qmlplugin.prf
deleted file mode 100644
index 59b3895..0000000
--- a/qmake-features/qmlplugin.prf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Add a long padded rpath, so the installer can replace it with a relative rpath
-QMAKE_RPATHDIR += "$$INSTALL_PREFIX/long_padding/long_padding/long_padding/long_padding/long_padding\
-                   long_padding/long_padding/long_padding/long_padding/long_padding/long_padding/"
-
-CONFIG += skip_target_version_ext
-TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = $$OUT_PWD/imports/$$replace(uri, \\., /)
-
-OTHER_FILES = qmldir
-
-!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
-    copy_qmldir.target = $$replace(DESTDIR, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir
-    copy_qmldir.depends = $$replace(_PRO_FILE_PWD_, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir
-    copy_qmldir.commands = $(COPY_FILE) \"$$copy_qmldir.depends\" \"$$copy_qmldir.target\"
-    QMAKE_EXTRA_TARGETS += copy_qmldir
-    PRE_TARGETDEPS += $$copy_qmldir.target
-}
-
-qmldir.files = qmldir
-installPath = $$OUT_PWD/../install/imports/$$replace(uri, \\., /)
-qmldir.path = $$installPath
-target.path = $$installPath
-INSTALLS += target qmldir
-- 
cgit v1.2.3