diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-12-17 01:57:36 +0400 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-12-17 01:57:36 +0400 |
| commit | 1865b11dcb77b452ef84fac6970cc742b387dfab (patch) | |
| tree | 4f7a6fd12041fc0598606188d68a1b036701bd70 /tools | |
| parent | 67e12a0f84eb16bab804a6dde88154d66da9dba3 (diff) | |
| parent | a599aeb2a8159c48eafbe066466ea5bc90d0c71c (diff) | |
Merge remote branch 'origin/v0.6'
Conflicts:
wscript
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 28 | ||||
| -rw-r--r-- | tools/msvs/msi/product.wxs | 9 |
2 files changed, 26 insertions, 11 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index e45372457be..d7a3b62dd53 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -33,13 +33,25 @@ <Name>WixUIExtension</Name> </WixExtension> </ItemGroup> + <UsingTask TaskName="GenerateProductId" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"> + <ParameterGroup> + <ProductId ParameterType="System.String" Output="true" /> + </ParameterGroup> + <Task> + <Code Type="Fragment" Language="cs"> + <![CDATA[ + this.ProductId = System.Guid.NewGuid().ToString().ToUpper(); + ]]> + </Code> + </Task> + </UsingTask> <Import Project="$(WixTargetsPath)" /> - <!-- - To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Wix.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> + <Target Name="BeforeBuild"> + <GenerateProductId> + <Output PropertyName="NodeProductId" TaskParameter="ProductId"/> + </GenerateProductId> + <CreateProperty Value="$(DefineConstants);ProductId=$(NodeProductId)"> + <Output TaskParameter="Value" PropertyName="DefineConstants" /> + </CreateProperty> + </Target> </Project> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index d924a4dfef5..bdf28a587ac 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"> @@ -111,8 +114,8 @@ </UI> <UIRef Id="WixUI_Common" /> - <WixVariable Id="WixUIBannerBmp" Value="..\..\..\doc\windows_banner_nodejs_installer_logo.jpg" /> - <WixVariable Id="WixUIDialogBmp" Value="..\..\..\doc\windows_dialog_nodejs_installer_logo.jpg" /> + <WixVariable Id="WixUIBannerBmp" Value="..\..\..\doc\thin-white-stripe.bmp" /> + <WixVariable Id="WixUIDialogBmp" Value="..\..\..\doc\full-white-stripe.bmp" /> </Product> </Wix> |