diff options
| author | Bert Belder <bertbelder@gmail.com> | 2011-11-25 15:34:29 +0400 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2011-11-25 15:34:29 +0400 |
| commit | cffd0bb68d4b72601539b1f3cf2b7ff50def897c (patch) | |
| tree | 62539cdb6040f8ce1d3bdd85c2a0a83c9ade7371 /tools | |
| parent | 1db9a2adbe5e2509d9fea9299835fc120ad6ba2b (diff) | |
| parent | b159c6d62e5756d3f8847419d29c6959ea288b56 (diff) | |
Merge branch 'v0.6'
Conflicts:
Makefile
src/node_version.h
test/simple/test-http-response-no-headers.js
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 8 | ||||
| -rw-r--r-- | tools/msvs/msi/product.wxs | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index 8ac7a3e3a98..e45372457be 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -15,15 +16,16 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <OutputPath>..\..\..\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion)</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);NPMSourceDir=..\..\..\deps\npm\</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>..\..\..\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion)</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);NPMSourceDir=..\..\..\deps\npm\</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="product.wxs" /> + <Compile Include="..\..\..\npm.wxs" /> </ItemGroup> <ItemGroup> <WixExtension Include="WixUIExtension"> @@ -40,4 +42,4 @@ <Target Name="AfterBuild"> </Target> --> -</Project>
\ No newline at end of file +</Project> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index e3fa2ecd420..4071b79da67 100644 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -17,6 +17,7 @@ <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFilesFolder"> <Directory Id="NodeRoot" Name="nodejs"> + <Directory Id="NodeModulesFolder" Name="node_modules" /> <Component Id="nodeexe" Guid="AEC0F08E-89B3-4C35-A286-8DB8598597F2"> <File Id="filenodeexe" KeyPath="yes" Source="$(var.sourcedir)\node.exe" /> <Environment Id="Environment" @@ -26,6 +27,9 @@ System="yes" Value="[NodeRoot]" /> </Component> + <Component Id="npmcmd" Guid="31e9986d-74cd-44e1-878c-194d3e997d32"> + <File Id="filenpmcmd" KeyPath="yes" Source="$(var.NPMSourceDir)\bin\npm.cmd" /> + </Component> <?if $(var.Configuration) = Debug ?> <Component Id="nodepdb" Guid="BEC0F08E-89B3-4C35-A286-8DB8598597F2"> <File Id="filenodepdb" KeyPath="yes" Source="$(var.sourcedir)\node.pdb" /> @@ -37,6 +41,8 @@ <ComponentGroup Id="allfiles"> <ComponentRef Id="nodeexe"/> + <ComponentRef Id="npmcmd"/> + <ComponentGroupRef Id="NPMFiles" /> <?if $(var.Configuration) = Debug ?> <ComponentRef Id="nodepdb"/> <?endif?> @@ -75,9 +81,12 @@ <Property Id="ARPNOMODIFY" Value="1" /> <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Node.js has been succesfully installed. To run Node.js open command prompt (cmd.exe), and run 'node'. See http://nodejs.org for information about the license." /> + </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" /> </Product> </Wix> |