Browse Source

win,msi: Upgrade from old upgrade code

This enables the MSI to upgrade old Node.js versions and
early versions of io.js before the upgrade code was changed.

This also reverts 24def66293.

PR-URL: https://github.com/nodejs/node/pull/2439
Reviewed-By: Rod Vagg <rod@vagg.org>
v4.0.0-rc
João Reis 9 years ago
parent
commit
b630ebaf43
  1. 2
      tools/msvs/msi/i18n/de-de.wxl
  2. 2
      tools/msvs/msi/i18n/en-us.wxl
  3. 9
      tools/msvs/msi/product.wxs

2
tools/msvs/msi/i18n/de-de.wxl

@ -3,7 +3,7 @@
<!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx --> <!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
<String Id="LocaleId">1031</String> <String Id="LocaleId">1031</String>
<String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.&#xD;&#xA;&#xD;&#xA;WARNUNG: Wenn Sie von io.js v1.0.0 oder v1.0.1 aus updaten wollen, müssen Sie diese Versionen zuerst manuell deinstallieren.</String> <String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.</String>
<String Id="InstallDirDlgDescription">Wählen Sie einen anderen Installationsort oder klicken Sie auf Weiter zum installieren.</String> <String Id="InstallDirDlgDescription">Wählen Sie einen anderen Installationsort oder klicken Sie auf Weiter zum installieren.</String>
<String Id="MajorUpgrade_DowngradeErrorMessage">Eine neuere Version von [ProductName] ist bereits installiert. Der Installationsassistent wird jetzt geschlossen.</String> <String Id="MajorUpgrade_DowngradeErrorMessage">Eine neuere Version von [ProductName] ist bereits installiert. Der Installationsassistent wird jetzt geschlossen.</String>

2
tools/msvs/msi/i18n/en-us.wxl

@ -3,7 +3,7 @@
<!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx --> <!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
<String Id="LocaleId">1033</String> <String Id="LocaleId">1033</String>
<String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.&#xD;&#xA;&#xD;&#xA;WARNING: if you're upgrading from io.js v1.0.0 or v1.0.1, you must first uninstall these versions manually.</String> <String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.</String>
<String Id="InstallDirDlgDescription">Choose a custom location or click Next to install.</String> <String Id="InstallDirDlgDescription">Choose a custom location or click Next to install.</String>
<String Id="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String> <String Id="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String>

9
tools/msvs/msi/product.wxs

@ -25,6 +25,15 @@
<MajorUpgrade AllowSameVersionUpgrades="yes" <MajorUpgrade AllowSameVersionUpgrades="yes"
DowngradeErrorMessage="!(loc.MajorUpgrade_DowngradeErrorMessage)"/> DowngradeErrorMessage="!(loc.MajorUpgrade_DowngradeErrorMessage)"/>
<Upgrade Id="1d60944c-b9ce-4a71-a7c0-0384eb884baa">
<UpgradeVersion Maximum="1.0.0"
IncludeMaximum="no"
Property="NODE_0X_DETECTED" />
<UpgradeVersion Minimum="1.0.0"
IncludeMinimum="yes"
Property="EARLY_IO_DETECTED" />
</Upgrade>
<Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/> <Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/>
<Property Id="ARPPRODUCTICON" Value="NodeIcon"/> <Property Id="ARPPRODUCTICON" Value="NodeIcon"/>
<Property Id="ApplicationFolderName" Value="node"/> <Property Id="ApplicationFolderName" Value="node"/>

Loading…
Cancel
Save