GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 18:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set product code based app_name and version

Browse Source 
This might fix upgrading of alpha versions

Contribute to CURA-9157
This commit is contained in:
Jelle Spijker 2023-01-10 17:00:09 +01:00
parent 81cb75ebd7
commit f99aeb9182
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/msi/UltiMaker-Cura.wxs.jinja
View File

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
<Product <Product
Id="*" Id="{{ product_code }}"
Name="{{ app_name }}" Name="{{ app_name }}"
Language="1033" Language="1033"
Version="{{ version_major }}.{{ version_minor }}.{{ version_patch }}" Version="{{ version_major }}.{{ version_minor }}.{{ version_patch }}"
Manufacturer="{{ company }}" Manufacturer="{{ company }}"
UpgradeCode="{{ upgrade_code }}" UpgradeCode="{{ upgrade_code }}"
> >
<Package InstallerVersion="500" <Package
Id="*"
InstallerVersion="500"
Compressed="yes" Compressed="yes"
InstallScope="perMachine" InstallScope="perMachine"
Manufacturer="{{ company }}" Manufacturer="{{ company }}"

1
packaging/msi/create_windows_msi.py
View File

@ -40,6 +40,7 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
company="UltiMaker", company="UltiMaker",
web_site="https://ultimaker.com", web_site="https://ultimaker.com",
year=datetime.now().year, year=datetime.now().year,
product_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name + os.environ.get("CURA_VERSION_MAJOR") + os.environ.get("CURA_VERSION_MINOR"))),
upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)), upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)),
shortcut_uuid=str(uuid.uuid5(uuid.NAMESPACE_DNS, f"Shortcut {app_name}")), shortcut_uuid=str(uuid.uuid5(uuid.NAMESPACE_DNS, f"Shortcut {app_name}")),
cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")), cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")),