diff options
| author | Jeroen Janssen <jeroen.janssen@gmail.com> | 2012-06-02 18:36:20 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-06-02 18:39:41 +0200 |
| commit | e2126e05e7a5a4a7f2cb97173ad3b8b4c11807d5 (patch) | |
| tree | 7faba295d01044f113159a9b063768ebcd769aa7 /tools/msvs | |
| parent | 3b6a00b664afdc7695ddddefc637b1fbebf94fc6 (diff) | |
| download | nodejs-e2126e05e7a5a4a7f2cb97173ad3b8b4c11807d5.tar.gz nodejs-e2126e05e7a5a4a7f2cb97173ad3b8b4c11807d5.tar.bz2 nodejs-e2126e05e7a5a4a7f2cb97173ad3b8b4c11807d5.zip | |
windows/msi: cleanup WiX project files
The current WiX project files do some manual processing and generation
which WiX supports doing out of the box. This patch will use the
HeatDirectory task to generate the npm.wxs file and use the auto GUID
generation. I also changed the msi filename generation to include the
version number to match the currently used name for released msi files.
Closes #3360
Diffstat (limited to 'tools/msvs')
| -rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 24 | ||||
| -rwxr-xr-x | tools/msvs/msi/product.wxs | 2 |
2 files changed, 5 insertions, 21 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index 50411aaa0..37abc04ca 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> @@ -7,7 +7,7 @@ <ProductVersion>3.5</ProductVersion> <ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid> <SchemaVersion>2.0</SchemaVersion> - <OutputName>node</OutputName> + <OutputName>node-v$(NodeVersion)-$(Platform)</OutputName> <OutputType>Package</OutputType> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> @@ -43,25 +43,9 @@ <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)" /> <Target Name="BeforeBuild"> - <GenerateProductId> - <Output PropertyName="NodeProductId" TaskParameter="ProductId"/> - </GenerateProductId> - <CreateProperty Value="$(DefineConstants);ProductId=$(NodeProductId)"> - <Output TaskParameter="Value" PropertyName="DefineConstants" /> - </CreateProperty> + <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\deps\npm" PreprocessorVariable="var.NPMSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NPMFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\npm.wxs"> + </HeatDirectory> </Target> </Project> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index d21ca4644..8a3fe4f31 100755 --- 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="$(var.ProductId)" + <Product Id="*" Name="node.js" Language="1033" Version="$(var.ProductVersion)" |