Skip to content
Permalink
Browse files

Revert recent installer changes as they create more issues than they …

…fixed.

This reverts commits e728205
and 1749ef4 .
  • Loading branch information...
hacst committed Oct 21, 2014
1 parent acf73f5 commit c9f170e85a22eb941be8e11520631ec18b204ddc
Showing with 4 additions and 11 deletions.
  1. +2 −8 installer/Product.wxs
  2. +2 −3 installer/Settings.wxi
@@ -29,13 +29,7 @@
VersionNT > 501 OR (VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 1)
</Condition>

<MajorUpgrade AllowDowngrades='no' AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallInitialize' DowngradeErrorMessage='A later version of [ProductName] is already installed.' />

<Upgrade Id="$(var.Old64BitProductUpgradeCode)">
<!-- 64 bit installers had a seperate upgrade code during the beta. As we do not actually want both versions
to be installed at the same time this allows detecting the old 64 bit version and upgrading from it -->
<UpgradeVersion Minimum="1.3.0" IncludeMinimum="yes" Maximum="$(var.ProductVersion)" IncludeMaximum="yes" OnlyDetect="no" Property="REMOVEOLD64BITPRODUCT" />
</Upgrade>
<MajorUpgrade AllowDowngrades='no' AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallExecute' DowngradeErrorMessage='A later version of [ProductName] is already installed.' />

<Media Id="1" Cabinet="$(var.ProductName).cab" EmbedCab="yes" CompressionLevel="high" />

@@ -217,7 +211,7 @@
<InstallExecuteSequence>
<AppSearch Sequence='1' />
<Custom Action="SetNSISPath" After="AppSearch">NSISINSTALL</Custom>
<Custom Action='NSISUninstall' After='RemoveExistingProducts'>NSISINSTALL AND NOT Installed</Custom>
<Custom Action='NSISUninstall' After='InstallInitialize'>NSISINSTALL AND NOT Installed</Custom>
</InstallExecuteSequence>
</Product>
</Wix>
@@ -4,12 +4,11 @@
<?define ProductManufacturer = "The Mumble team" ?>
<?define ProductVersion = "1.3.0" ?>

<?define ProductUpgradeCode = B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D ?>
<?define Old64BitProductUpgradeCode = E028BDFC-3FE2-4BEE-A33B-EB9C80611555 ?>

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

0 comments on commit c9f170e

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