Skip to content
Permalink
Browse files

Merge PR #2902: installer: quote GUIDs in Settings.wxi.

  • Loading branch information...
davidebeatrici committed Jul 17, 2018
2 parents 86197ff + af172cf commit 91601a1f685b8d120af18fd5f2f83f1c4fb7b4a6
Showing with 10 additions and 10 deletions.
  1. +10 −10 installer/Settings.wxi
@@ -5,23 +5,23 @@
<?define ProductVersion = "1.3.0" ?> <?define ProductVersion = "1.3.0" ?>


<?if $(sys.BUILDARCH) = "x86" ?> <?if $(sys.BUILDARCH) = "x86" ?>
<?define ProductUpgradeCode = B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D ?> <?define ProductUpgradeCode = "B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D" ?>
<?define ArchSpecificProgramFilesFolderId = "ProgramFilesFolder" ?> <?define ArchSpecificProgramFilesFolderId = "ProgramFilesFolder" ?>
<?elseif $(sys.BUILDARCH) = "x64" ?> <?elseif $(sys.BUILDARCH) = "x64" ?>
<?define ProductUpgradeCode = E028BDFC-3FE2-4BEE-A33B-EB9C80611555 ?> <?define ProductUpgradeCode = "E028BDFC-3FE2-4BEE-A33B-EB9C80611555" ?>
<?define ArchSpecificProgramFilesFolderId = "ProgramFiles64Folder" ?> <?define ArchSpecificProgramFilesFolderId = "ProgramFiles64Folder" ?>
<?else?> <?else?>
<?error Unsupported build architecture: $(sys.BUILDARCH) ?> <?error Unsupported build architecture: $(sys.BUILDARCH) ?>
<?endif?> <?endif?>


<?define MumbleExeGuid = A08F7909-1116-4AC8-9422-051FA1A1BE19 ?> <?define MumbleExeGuid = "A08F7909-1116-4AC8-9422-051FA1A1BE19" ?>
<?define MumbleDesktopShortcutGuid = 4448BE21-1AA1-41B8-887E-B3E07B28EFAE ?> <?define MumbleDesktopShortcutGuid = "4448BE21-1AA1-41B8-887E-B3E07B28EFAE" ?>
<?define MurmurDesktopShortcutGuid = 02936CED-6588-4B7E-880F-241A4CF5E7D3 ?> <?define MurmurDesktopShortcutGuid = "02936CED-6588-4B7E-880F-241A4CF5E7D3" ?>
<?define UninstallerComponentGuid = CB81DC70-063E-48DD-94C3-593BBBAB20F4 ?> <?define UninstallerComponentGuid = "CB81DC70-063E-48DD-94C3-593BBBAB20F4" ?>
<?define LicenseTextGuid = 87C7967B-5E4B-41DD-83F5-A9E9E8AD3B39 ?> <?define LicenseTextGuid = "87C7967B-5E4B-41DD-83F5-A9E9E8AD3B39" ?>
<?define ReadMeTextGuid = 15878902-B819-4E77-8C1D-0A915D79660B ?> <?define ReadMeTextGuid = "15878902-B819-4E77-8C1D-0A915D79660B" ?>
<?define ApplicationProgramsFolderRemovalComponentGuid = 0AE1745D-FF86-4D61-BAF3-44248D21D263 ?> <?define ApplicationProgramsFolderRemovalComponentGuid = "0AE1745D-FF86-4D61-BAF3-44248D21D263" ?>
<?define NSISUninstallComponentGuid = 3116B7EF-CBA3-4E0B-A2C5-0F0608038905 ?> <?define NSISUninstallComponentGuid = "3116B7EF-CBA3-4E0B-A2C5-0F0608038905" ?>


<!-- Defaults for values that aren't given by environment variables --> <!-- Defaults for values that aren't given by environment variables -->
<?ifndef env.MumbleSourceDir ?> <?ifndef env.MumbleSourceDir ?>

0 comments on commit 91601a1

Please sign in to comment.
You can’t perform that action at this time.