diff options
| author | João Reis <reis@janeasystems.com> | 2015-08-18 19:50:10 +0100 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2015-08-25 12:42:44 +0100 |
| commit | b630ebaf43c55d50903cb895387942a87c83eeac (patch) | |
| tree | ded6014a36167e7ba3f51c76b050fc5e34b5e394 /tools/msvs | |
| parent | a2e43412cf07be750ea077319e9e1de6b10b74c2 (diff) | |
| download | node-new-b630ebaf43c55d50903cb895387942a87c83eeac.tar.gz | |
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 24def662936ae8c15770ede0344cd7a7402a63ef.
PR-URL: https://github.com/nodejs/node/pull/2439
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'tools/msvs')
| -rw-r--r-- | tools/msvs/msi/i18n/de-de.wxl | 2 | ||||
| -rw-r--r-- | tools/msvs/msi/i18n/en-us.wxl | 2 | ||||
| -rwxr-xr-x | tools/msvs/msi/product.wxs | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/tools/msvs/msi/i18n/de-de.wxl b/tools/msvs/msi/i18n/de-de.wxl index 8d419fa872..432d1eeaac 100644 --- a/tools/msvs/msi/i18n/de-de.wxl +++ b/tools/msvs/msi/i18n/de-de.wxl @@ -3,7 +3,7 @@ <!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx --> <String Id="LocaleId">1031</String> - <String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.

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="MajorUpgrade_DowngradeErrorMessage">Eine neuere Version von [ProductName] ist bereits installiert. Der Installationsassistent wird jetzt geschlossen.</String> diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index 35305affbd..fd23724b56 100644 --- a/tools/msvs/msi/i18n/en-us.wxl +++ b/tools/msvs/msi/i18n/en-us.wxl @@ -3,7 +3,7 @@ <!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx --> <String Id="LocaleId">1033</String> - <String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.

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="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index e9014a0396..21246fed38 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -25,6 +25,15 @@ <MajorUpgrade AllowSameVersionUpgrades="yes" 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"/> <Property Id="ARPPRODUCTICON" Value="NodeIcon"/> <Property Id="ApplicationFolderName" Value="node"/> |