From c4d88bd40291915849b0ebf7ee99c56463b6fc5d Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 30 Mar 2021 12:26:05 +0200 Subject: [PATCH] introduce a config.pri for the overlay --- androidservice/androidservice.pro | 2 +- libnymea-app/connection/awsclient.cpp | 1 + libnymea-app/libnymea-app.pro | 2 +- nymea-app.pro | 12 ++++++----- nymea-app/config.txt | 3 --- nymea-app/main.cpp | 6 +++--- nymea-app/nymea-app.pro | 30 +++++++++------------------ nymea-app/styles.qrc | 1 - nymea-app/ui/Configuration.qml | 2 +- config.pri => shared.pri | 10 ++++++++- 10 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 nymea-app/config.txt rename config.pri => shared.pri (81%) diff --git a/androidservice/androidservice.pro b/androidservice/androidservice.pro index febffa09..7503e717 100644 --- a/androidservice/androidservice.pro +++ b/androidservice/androidservice.pro @@ -4,7 +4,7 @@ CONFIG += dll QT += core androidextras QT += network qml quick quickcontrols2 svg websockets bluetooth charts nfc -include(../config.pri) +include(../shared.pri) include(../3rdParty/android/android_openssl/openssl.pri) diff --git a/libnymea-app/connection/awsclient.cpp b/libnymea-app/connection/awsclient.cpp index 7085bda3..fa2162a3 100644 --- a/libnymea-app/connection/awsclient.cpp +++ b/libnymea-app/connection/awsclient.cpp @@ -42,6 +42,7 @@ #include "sigv4utils.h" #include "logging.h" +#include "config.h" AWSClient* AWSClient::s_instance = nullptr; diff --git a/libnymea-app/libnymea-app.pro b/libnymea-app/libnymea-app.pro index c5ad1308..c5f32314 100644 --- a/libnymea-app/libnymea-app.pro +++ b/libnymea-app/libnymea-app.pro @@ -2,7 +2,7 @@ TARGET = nymea-app TEMPLATE = lib CONFIG += staticlib -include(../config.pri) +include(../shared.pri) include(libnymea-app.pri) LIBS += -lssl -lcrypto diff --git a/nymea-app.pro b/nymea-app.pro index 178789c1..a181522d 100644 --- a/nymea-app.pro +++ b/nymea-app.pro @@ -1,7 +1,9 @@ -include(config.pri) -message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})") TEMPLATE=subdirs +include(shared.pri) +message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})") + + SUBDIRS = libnymea-app nymea-app nymea-app.depends = libnymea-app @@ -15,10 +17,10 @@ withtests: { # $ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" # $ make wininstaller wininstaller.depends = nymea-app -!equals(OVERLAY_PATH, "") { - PACKAGE_BASE_DIR = $${OVERLAY_PATH}\packaging -} else { +equals(OVERLAY_PATH, "") { PACKAGE_BASE_DIR = $$shell_path($$PWD)\packaging +} else { + PACKAGE_BASE_DIR = $${OVERLAY_PATH}\packaging } equals(BRANDING, "") { APP_NAME = nymea-app diff --git a/nymea-app/config.txt b/nymea-app/config.txt deleted file mode 100644 index 85526e3d..00000000 --- a/nymea-app/config.txt +++ /dev/null @@ -1,3 +0,0 @@ -[General] -organisation=nymea -app=nymea-app diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index effcc25d..862590ba 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -46,6 +46,7 @@ #include "nfchelper.h" #include "nfcthingactionwriter.h" #include "platformhelper.h" +#include "../config.h" #include "logging.h" @@ -71,9 +72,8 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication application(argc, argv); - QSettings config(":/config.txt", QSettings::IniFormat); - application.setApplicationName(config.value("app").toString()); - application.setOrganizationName(config.value("organisation").toString()); + application.setApplicationName(APPLICATION_NAME); + application.setOrganizationName(ORGANISATION_NAME); QCommandLineParser parser; parser.addHelpOption(); diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 1a996aed..90f41593 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -1,6 +1,7 @@ TEMPLATE=app -TARGET=nymea-app -include(../config.pri) +include(../shared.pri) + +TARGET=$${APPLICATION_NAME} CONFIG += link_pkgconfig @@ -52,10 +53,6 @@ RESOURCES += resources.qrc \ RESOURCES += styles.qrc } -win32 { - QT += webview -} - android { include(../3rdParty/android/android_openssl/openssl.pri) @@ -117,13 +114,6 @@ ios: { OBJECTIVE_SOURCES += $$PWD/../packaging/ios/platformhelperios.mm \ $$PWD/../packaging/ios/pushnotifications.mm \ -# Firebase CPP SDK -# QMAKE_LFLAGS += -ObjC $(inherited) -# INCLUDEPATH += /Users/micha/Downloads/firebase_cpp_sdk/include/ -# LIBS += -F/Users/micha/Downloads/firebase_cpp_sdk/libs/ios/arm64/ -# LIBS += -ObjC -L/Users/micha/Downloads/firebase_cpp_sdk/libs/ios/arm64/ -lfirebase_messaging -lfirebase_app -# LIBS += -framework "FirebaseCore" - # Add Firebase SDK QMAKE_LFLAGS += -ObjC $(inherited) firebase_files.files += $$files(../packaging/ios/GoogleService-Info.plist) @@ -177,13 +167,13 @@ ubports: { SOURCES += platformintegration/ubports/pushclient.cpp } -BR=$$BRANDING -!equals(BR, "") { - message("Branding the to: $${BR}") - DEFINES += BRANDING=\\\"$${BR}\\\" - win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico -} else { - win32:RCC_ICONS += ../packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico +win32 { + QT += webview + equals(OVERLAY_PATH, "") { + win32:RCC_ICONS += ../packaging/windows/packages/io.nymea.nymeaapp/meta/logo.ico + } else { + win32:RCC_ICONS += $${OVERLAY_PATH}/packaging/windows/packages/io.guh.$${BR}/meta/logo.ico + } } target.path = /usr/bin diff --git a/nymea-app/styles.qrc b/nymea-app/styles.qrc index 3890dafc..b05c2acf 100644 --- a/nymea-app/styles.qrc +++ b/nymea-app/styles.qrc @@ -32,6 +32,5 @@ styles/lime/logo-wide.svg styles/noir/logo-wide.svg ui/Configuration.qml - config.txt diff --git a/nymea-app/ui/Configuration.qml b/nymea-app/ui/Configuration.qml index 83e5c74f..cbbc40aa 100644 --- a/nymea-app/ui/Configuration.qml +++ b/nymea-app/ui/Configuration.qml @@ -1,6 +1,6 @@ pragma Singleton import QtQuick 2.0 -Item { +ConfigurationBase { } diff --git a/config.pri b/shared.pri similarity index 81% rename from config.pri rename to shared.pri index ffd506c4..d9168630 100644 --- a/config.pri +++ b/shared.pri @@ -3,11 +3,19 @@ CONFIG += c++11 top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) +# Read version info from version.txt VERSION_INFO=$$cat(version.txt) APP_VERSION=$$member(VERSION_INFO, 0) APP_REVISION=$$member(VERSION_INFO, 1) -DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\" +equals(OVERLAY_PATH, "") { + include(config.pri) +} else { + include($${OVERLAY_PATH}/config.pri) +} + +QMAKE_SUBSTITUTES += $${top_srcdir}/config.h.in +INCLUDEPATH += $${top_builddir} # We want -Wall to keep the code clean and tidy, however: # On Windows, -Wall goes mental, so not using it there