diff --git a/JamiInstaller/Config.wxi b/JamiInstaller/Config.wxi index 66157310bcb6399597d04fdae03855273fe52bdf..f5da57f4ecde1142f4b6704b8ac3fe6a5bc3e89c 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 3585e51996ea2b7057d050104de0dc8f1974bdd9..4ed80c5aad71704bc20a607d0c199a13e03a021a 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 b204361531e68e04fb07fe71a71ee142b405ca72..3c6f5f5774925c3afe2ad074024f4850244496b0 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."