3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use auto generated shortcut Guid

Browse source 
This should remove the short-cuts

Contributes to CURA-9157
This commit is contained in:
Jelle Spijker 2023-01-13 15:42:55 +01:00
parent fe4679e4e8
commit 24cb9e16a8
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packaging/msi/UltiMaker-Cura.wxs.jinja
View file

@ -122,7 +122,7 @@
<!--Shortcuts--> <!--Shortcuts-->
<DirectoryRef Id="ShortCutDir"> <DirectoryRef Id="ShortCutDir">
<Component Id="CMP_Shortcuts" Guid="{{ shortcut_uuid }}"> <Component Id="CMP_Shortcuts" Guid="*">
<Shortcut Id="SHRT_Cura" <Shortcut Id="SHRT_Cura"
Name="{{ app_name }} {{ version }}" Name="{{ app_name }} {{ version }}"
Description="{{ app_name }} {{ version }}" Description="{{ app_name }} {{ version }}"
@ -150,6 +150,6 @@
<ComponentGroupRef Id="NewFilesGroup" /> <ComponentGroupRef Id="NewFilesGroup" />
<ComponentRef Id="CMP_Shortcuts" /> <ComponentRef Id="CMP_Shortcuts" />
</Feature> </Feature>
<Feature Id="UninstallOlderVersionFeature" Title="Uninstall previous versions" Level="{{ 1 if "Enterprise" in app_name else 2 }}" Description="..."/> <Feature Id="UninstallOlderVersionFeature" Title="Uninstall previous versions" Level="{{ 1 if "Enterprise" in app_name else 0 }}" Description="..."/>
</Product> </Product>
</Wix> </Wix>

1
packaging/msi/create_windows_msi.py
View file

@ -41,7 +41,6 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
web_site="https://ultimaker.com", web_site="https://ultimaker.com",
year=datetime.now().year, year=datetime.now().year,
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}")),
cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")), cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")),
cura_banner_top=str(source_loc.joinpath("packaging", "msi", "banner_top.bmp")), cura_banner_top=str(source_loc.joinpath("packaging", "msi", "banner_top.bmp")),
cura_banner_side=str(source_loc.joinpath("packaging", "msi", "banner_side.bmp")), cura_banner_side=str(source_loc.joinpath("packaging", "msi", "banner_side.bmp")),