birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4531 from aws-lumberyard-dev/InstallerShortcutsFix

Browse Source 
Update wix installer folders to match the new binary locations.
This commit is contained in:
AMZN-Phil
2021-10-06 14:10:33 -07:00
committed by GitHub
parent ba107c06b6 39cf3f51cc
commit 4e3711f643
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+1 -1
View File
@@ -20,7 +20,7 @@
<!-- special variable name that auto maps to a WixStandardBootstrapperApplication attribute of the same name -->
<Variable Name="LaunchTarget"
Type="string"
Value="[InstallFolder]\bin\Windows\profile\o3de.exe"/>
Value="[InstallFolder]\bin\Windows\profile\Default\o3de.exe"/>
<PayloadGroup Id="Images">
<Payload Id="warning.png" SourceFile="$(var.CPACK_RESOURCE_PATH)/warning.png" Compressed="yes"/>
cmake/Platform/Windows/Packaging/Shortcuts.wxs
+9 -7
View File
@@ -18,7 +18,9 @@
<DirectoryRef Id="INSTALL_ROOT">
<Directory Id="root.bin" Name="bin">
<Directory Id="root.bin.Windows" Name="Windows">
<Directory Id="root.bin.Windows.profile" Name="profile" />
<Directory Id="root.bin.Windows.profile" Name="profile">
<Directory Id="root.bin.Windows.profile.Default" Name="Default" />
</Directory>
</Directory>
</Directory>
</DirectoryRef>
@@ -52,18 +54,18 @@
<Component Id="StartMenuShortcuts" Guid="{E6447F0F-A46E-4A72-83D8-600707B590E8}">
<Shortcut Id="StartMenuShortcut_Editor"
Target="[root.bin.Windows.profile]Editor.exe"
WorkingDirectory="root.bin.Windows.profile"
Target="[root.bin.Windows.profile.Default]Editor.exe"
WorkingDirectory="root.bin.Windows.profile.Default"
Name="$(var.CPACK_PACKAGE_NAME) Editor" />
<Shortcut Id="StartMenuShortcut_MaterialEditor"
Target="[root.bin.Windows.profile]MaterialEditor.exe"
WorkingDirectory="root.bin.Windows.profile"
Target="[root.bin.Windows.profile.Default]MaterialEditor.exe"
WorkingDirectory="root.bin.Windows.profile.Default"
Name="$(var.CPACK_PACKAGE_NAME) Material Editor" />
<Shortcut Id="StartMenuShortcut_ProjectManager"
Target="[root.bin.Windows.profile]o3de.exe"
WorkingDirectory="root.bin.Windows.profile"
Target="[root.bin.Windows.profile.Default]o3de.exe"
WorkingDirectory="root.bin.Windows.profile.Default"
Name="$(var.CPACK_PACKAGE_NAME) Project Manager" />
<RemoveFolder Id="RemoveVersionedApplicationProgramsFolder" Directory='VersionedApplicationProgramsFolder' On="uninstall"/>