Skip to content
Snippets Groups Projects
Commit 50282f32 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

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
parent 577abd7b
Branches
Tags
No related merge requests found
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Include> <Include>
<?if $(var.Configuration) = Release ?>
<?define Name="Jami" ?> <?define Name="Jami" ?>
<?else?>
<?define Name="Jami (BETA)" ?>
<?endif ?>
<?define ExeName="Jami" ?> <?define ExeName="Jami" ?>
<?define AppName="Jami" ?>
<?if $(var.Configuration) = Release ?> <?if $(var.Configuration) = Release ?>
<?define ReleaseDir="..\x64\Release"?> <?define ReleaseDir="..\x64\Release"?>
...@@ -14,8 +10,6 @@ ...@@ -14,8 +10,6 @@
<?define ReleaseDir="..\x64\Beta"?> <?define ReleaseDir="..\x64\Beta"?>
<?endif ?> <?endif ?>
<?define AppName="Jami" ?>
<?define Manufacturer="Savoir-Faire Linux"?> <?define Manufacturer="Savoir-Faire Linux"?>
<?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?> <?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?>
</Include> </Include>
...@@ -267,7 +267,7 @@ def run_tests(mute_jamid, output_to_files): ...@@ -267,7 +267,7 @@ def run_tests(mute_jamid, output_to_files):
sys.exit(test_result_code) sys.exit(test_result_code)
def generate_msi_installer(): def generate_msi_installer(config_str):
print('Generating application installer...') print('Generating application installer...')
vs_env_vars = {} vs_env_vars = {}
...@@ -275,7 +275,8 @@ def generate_msi_installer(): ...@@ -275,7 +275,8 @@ def generate_msi_installer():
msbuild = findMSBuild() msbuild = findMSBuild()
if not os.path.isfile(msbuild): if not os.path.isfile(msbuild):
raise IOError('msbuild.exe not found. path=' + 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) build_project(msbuild, msbuild_args, installer_project, vs_env_vars)
...@@ -325,7 +326,8 @@ def main(): ...@@ -325,7 +326,8 @@ def main():
init_submodules() init_submodules()
build_deps() build_deps()
elif parsed_args.subparser_name == 'pack': elif parsed_args.subparser_name == 'pack':
generate_msi_installer() config = ('Release', 'Beta')[parsed_args.beta]
generate_msi_installer(config)
sys.exit(1) sys.exit(1)
else: else:
config = ('Release', 'Beta')[parsed_args.beta] config = ('Release', 'Beta')[parsed_args.beta]
... ...
......
...@@ -49,7 +49,7 @@ Item { ...@@ -49,7 +49,7 @@ Item {
property string reconnectTry: qsTr("Trying to reconnect to the Jami daemon (jamid)…") property string reconnectTry: qsTr("Trying to reconnect to the Jami daemon (jamid)…")
// AboutPopUp // AboutPopUp
property string version: qsTr("Version") + (UpdateManager.isCurrentVersionBeta() ? " (BETA)" : "") property string version: qsTr("Version") + (UpdateManager.isCurrentVersionBeta() ? " (Beta)" : "")
property string companyDeclarationYear: declarationYear + " " + companyName property string companyDeclarationYear: declarationYear + " " + companyName
property string declarationYear: "© 2015-2022" property string declarationYear: "© 2015-2022"
property string companyName: "Savoir-faire Linux Inc." property string companyName: "Savoir-faire Linux Inc."
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment