From fe953232db81394aaef476a960734d7a23ea673a Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 30 Mar 2021 13:23:40 +0200
Subject: [PATCH] .

---
 config.pri    |  3 +++
 nymea-app.pro | 18 +++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/config.pri b/config.pri
index 43f92572..5bb0ac0d 100644
--- a/config.pri
+++ b/config.pri
@@ -1,2 +1,5 @@
 APPLICATION_NAME="nymea-app"
 ORGANISATION_NAME="nymea"
+
+PACKAGE_URN=com.consolinno.energy
+PACKAGE_NAME=consolinno-energy
diff --git a/nymea-app.pro b/nymea-app.pro
index a181522d..eea1c186 100644
--- a/nymea-app.pro
+++ b/nymea-app.pro
@@ -22,24 +22,16 @@ equals(OVERLAY_PATH, "") {
 } else {
     PACKAGE_BASE_DIR = $${OVERLAY_PATH}\packaging
 }
-equals(BRANDING, "") {
-    APP_NAME = nymea-app
-    PACKAGE_URN = io.nymea.nymeaapp
-    PACKAGE_NAME = nymea-app-win-installer
-    PACKAGE_DIR = $${PACKAGE_BASE_DIR}\windows
-} else {
-    APP_NAME = $${BRANDING}
-    PACKAGE_URN = io.nymea.$${APP_NAME}
-    PACKAGE_NAME = $${BRANDING}-win-installer
-    PACKAGE_DIR = $${PACKAGE_BASE_DIR}\windows_$${APP_NAME}
-}
+
+PACKAGE_DIR = $${PACKAGE_BASE_DIR}\windows
+
 OLDSTRING="<Version>.*</Version>"
 NEWSTRING="<Version>$${APP_VERSION}</Version>"
 wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml\" &&
 wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data & mkdir $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data &&
 wininstaller.commands += copy $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\logo.ico $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\logo.ico &&
-CONFIG(debug,debug|release):wininstaller.commands += copy nymea-app\debug\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APP_NAME}.exe &&
-CONFIG(release,debug|release):wininstaller.commands += copy nymea-app\release\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APP_NAME}.exe &&
+CONFIG(debug,debug|release):wininstaller.commands += copy nymea-app\debug\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APPLICATION_NAME}.exe &&
+CONFIG(release,debug|release):wininstaller.commands += copy nymea-app\release\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APPLICATION_NAME}.exe &&
 wininstaller.commands += copy \"$${top_srcdir}\"\3rdParty\windows\windows_openssl\*.dll $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data &&
 wininstaller.commands += windeployqt --compiler-runtime --qmldir \"$${top_srcdir}\"\nymea-app\ui $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\ &&
 wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME}-$${APP_VERSION}