From 50282f3259a31fc27a95443ead38e81e8b9627c4 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Fri, 7 Oct 2022 15:20:21 -0400
Subject: [PATCH] windows-packaging: hide the reference to "Beta" in the about
 dialog

- Removes the explicit "(BETA)" from the msi installer.
- Changes BETA to Beta in the about menu.

Change-Id: Ifbf300ef1c39a4648f6a235cf3a17a89145d2152
---
 JamiInstaller/Config.wxi         | 10 ++--------
 build.py                         |  8 +++++---
 src/app/constant/JamiStrings.qml |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/JamiInstaller/Config.wxi b/JamiInstaller/Config.wxi
index 66157310b..f5da57f4e 100644
--- a/JamiInstaller/Config.wxi
+++ b/JamiInstaller/Config.wxi
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-    <?if $(var.Configuration) = Release ?>
     <?define Name="Jami" ?>
-    <?else?>
-    <?define Name="Jami (BETA)" ?>
-    <?endif ?>
-
-    <?define ExeName="Jami"?>
+    <?define ExeName="Jami" ?>
+    <?define AppName="Jami" ?>
 
     <?if $(var.Configuration) = Release ?>
     <?define ReleaseDir="..\x64\Release"?>
@@ -14,8 +10,6 @@
     <?define ReleaseDir="..\x64\Beta"?>
     <?endif ?>
 
-    <?define AppName="Jami" ?>
-
     <?define Manufacturer="Savoir-Faire Linux"?>
     <?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?>
 </Include>
diff --git a/build.py b/build.py
index 3585e5199..4ed80c5aa 100644
--- a/build.py
+++ b/build.py
@@ -267,7 +267,7 @@ def run_tests(mute_jamid, output_to_files):
     sys.exit(test_result_code)
 
 
-def generate_msi_installer():
+def generate_msi_installer(config_str):
     print('Generating application installer...')
 
     vs_env_vars = {}
@@ -275,7 +275,8 @@ def generate_msi_installer():
     msbuild = findMSBuild()
     if not os.path.isfile(msbuild):
         raise IOError('msbuild.exe not found. path=' + msbuild)
-    msbuild_args = getMSBuildArgs('x64', 'Release')
+
+    msbuild_args = getMSBuildArgs('x64', config_str)
 
     build_project(msbuild, msbuild_args, installer_project, vs_env_vars)
 
@@ -325,7 +326,8 @@ def main():
         init_submodules()
         build_deps()
     elif parsed_args.subparser_name == 'pack':
-        generate_msi_installer()
+        config = ('Release', 'Beta')[parsed_args.beta]
+        generate_msi_installer(config)
         sys.exit(1)
     else:
         config = ('Release', 'Beta')[parsed_args.beta]
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index b20436153..3c6f5f577 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -49,7 +49,7 @@ Item {
     property string reconnectTry: qsTr("Trying to reconnect to the Jami daemon (jamid)…")
 
     // AboutPopUp
-    property string version: qsTr("Version") + (UpdateManager.isCurrentVersionBeta() ? " (BETA)" : "")
+    property string version: qsTr("Version") + (UpdateManager.isCurrentVersionBeta() ? " (Beta)" : "")
     property string companyDeclarationYear: declarationYear + " " + companyName
     property string declarationYear: "© 2015-2022"
     property string companyName: "Savoir-faire Linux Inc."
-- 
GitLab