diff options
| author | Igor Zinkovsky <igorzi@microsoft.com> | 2011-12-08 15:00:48 -0800 |
|---|---|---|
| committer | Igor Zinkovsky <igorzi@microsoft.com> | 2011-12-08 15:02:59 -0800 |
| commit | b24cdb3d362bd88e4a6486a589e9fb6c498f360b (patch) | |
| tree | df76b6d1e5138144d0f5fa0d03fdb0939cf55e36 /tools/msvs | |
| parent | 871194d5fdf5359ecc9021364d3cafaf1e5af66b (diff) | |
| download | nodejs-b24cdb3d362bd88e4a6486a589e9fb6c498f360b.tar.gz nodejs-b24cdb3d362bd88e4a6486a589e9fb6c498f360b.tar.bz2 nodejs-b24cdb3d362bd88e4a6486a589e9fb6c498f360b.zip | |
Enable upgrades in MSI.
Fixes #2228.
Diffstat (limited to 'tools/msvs')
| -rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 4 | ||||
| -rw-r--r-- | tools/msvs/msi/product.wxs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index e45372457..96813d3b8 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -16,12 +16,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <OutputPath>..\..\..\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NPMSourceDir=..\..\..\deps\npm\</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);ProductId=$(NodeProductId);NPMSourceDir=..\..\..\deps\npm\</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>..\..\..\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NPMSourceDir=..\..\..\deps\npm\</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);ProductId=$(NodeProductId);NPMSourceDir=..\..\..\deps\npm\</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="product.wxs" /> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index d924a4dfe..b8b53b0be 100644 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -4,7 +4,7 @@ <?define repoDir="$(var.ProjectDir)..\..\..\" ?> <?define sourcedir="$(var.repoDir)\$(var.Configuration)\" ?> - <Product Id="cc6c176e-e26c-48ec-8970-f58bd1d046cf" + <Product Id="$(var.ProductId)" Name="node.js" Language="1033" Version="$(var.ProductVersion)" @@ -14,6 +14,9 @@ <Package InstallerVersion="200" Compressed="yes" Platform="x86" /> <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" /> + + <MajorUpgrade AllowSameVersionUpgrades="yes" + DowngradeErrorMessage="A later version of node.js is already installed. Setup will now exit." /> <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFilesFolder"> |