From 790f3ec976492b71e5da23c4823a212da9c829c6 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 14 May 2018 16:38:27 +0200 Subject: [PATCH] add possibility for branding the windows installer --- mea.pro | 7 ++++++- {mea => packaging/windows}/guh-logo.ico | Bin packaging/windows/maveo-logo.ico | Bin 0 -> 29211 bytes packaging/windows/win-installer.nsi | 10 +++++----- 4 files changed, 11 insertions(+), 6 deletions(-) rename {mea => packaging/windows}/guh-logo.ico (100%) create mode 100644 packaging/windows/maveo-logo.ico diff --git a/mea.pro b/mea.pro index 79d5b92f..4a26016b 100644 --- a/mea.pro +++ b/mea.pro @@ -15,7 +15,12 @@ wininstaller.depends = mea wininstaller.commands += rmdir /S /Q mea\release\out && mkdir mea\release\out && wininstaller.commands += copy mea\release\mea.exe mea\release\out\ && wininstaller.commands += windeployqt --qmldir mea\ui mea\release\out && -wininstaller.commands += makensis packaging\windows\win-installer.nsi +BR=$$BRANDING +equals(BR, "") { + wininstaller.commands += makensis /DBRANDING=guh packaging\windows\win-installer.nsi +} else { + wininstaller.commands += makensis /DBRANDING=BR packaging\windows\win-installer.nsi +} QMAKE_EXTRA_TARGETS += wininstaller target.depends += wininstaller diff --git a/mea/guh-logo.ico b/packaging/windows/guh-logo.ico similarity index 100% rename from mea/guh-logo.ico rename to packaging/windows/guh-logo.ico diff --git a/packaging/windows/maveo-logo.ico b/packaging/windows/maveo-logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..0d8399684514d384e8477b53a60731f42d9b0bfe GIT binary patch literal 29211 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ΝO>812xFSG(wIGsyeu>+4cIY^yOldc0NAmYLUF7t=1g z_i`)O2yoA2}GhLJ% zhV=GEO;RbS&a$wvNlr-cfjX6EicFqmzAI*-Xzi$uO#W_ zl{eyu!wKukLCZnCN^`!;Itbp5!w#g`usI2~?KTxQ+1V2t;Xg#Nv#|I^Mjil^E6KRR5mMlCrlz!c&O0{Cuhyk+g$5YXM4dU}cm28=c?)bM*UP#HJp<*m{UAR<5ya(qIweT4~DLR8c;S$RTFD<6}E_U=ATvvf2Wjq yMO~N-)DhEjWt6TgSY5eVno8MZY{&M`7=aKAGyl~UMY~a*x3avtT$+s0>Hh=tDy{4Q literal 0 HcmV?d00001 diff --git a/packaging/windows/win-installer.nsi b/packaging/windows/win-installer.nsi index 2ee0b6f1..a3716382 100644 --- a/packaging/windows/win-installer.nsi +++ b/packaging/windows/win-installer.nsi @@ -30,8 +30,8 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}" LicenseData "LICENSE" # This will be in the installer/uninstaller's title bar Name "${COMPANYNAME} - ${APPNAME}" -Icon "mea\guh-logo.ico" -outFile "mea-installer.exe" +Icon "${BRANDING}-logo.ico" +outFile "..\..\mea-${BRANDING}-installer.exe" !include LogicLib.nsh @@ -59,15 +59,15 @@ section "install" # Files for the install directory - to build the installer, these should be in the same directory as the install script (this file) setOutPath $INSTDIR - file "guh-logo.ico" - file /r "mea\release\out\*" + file "${BRANDING}-logo.ico" + file /r "..\..\mea\release\out\*" # Uninstaller - See function un.onInit and section "uninstall" for configuration writeUninstaller "$INSTDIR\uninstall.exe" # Start Menu createDirectory "$SMPROGRAMS\${COMPANYNAME}" - createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\mea.exe" "" "$INSTDIR\guh-logo.ico" + createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\mea.exe" "" "$INSTDIR\${BRANDING}-logo.ico" # Registry information for add/remove programs WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${COMPANYNAME} - ${APPNAME} - ${DESCRIPTION}"