diff options
| author | isaacs <i@izs.me> | 2012-02-06 15:43:21 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-02-06 15:43:21 -0800 |
| commit | 116835561d118a19ab5b65644d83b7a054797ca9 (patch) | |
| tree | a92e5e29bf271d43612389b004978f44ae2bd4ad /tools | |
| parent | e5db01ee29e8b25545c6558b8c1b8f8b8461294c (diff) | |
| parent | 7543c38dca2b4c64711f5667b82d80ffab3fd6a2 (diff) | |
| download | android-node-v8-116835561d118a19ab5b65644d83b7a054797ca9.tar.gz android-node-v8-116835561d118a19ab5b65644d83b7a054797ca9.tar.bz2 android-node-v8-116835561d118a19ab5b65644d83b7a054797ca9.zip | |
Merge remote-tracking branch 'ry/v0.6'
Conflicts:
ChangeLog
deps/v8/src/version.cc
deps/v8/tools/gyp/v8.gyp
doc/about/index.html
doc/community/index.html
doc/index.html
doc/logos/index.html
doc/template.html
lib/path.js
lib/querystring.js
src/node_version.h
Diffstat (limited to 'tools')
| -rwxr-xr-x[-rw-r--r--] | tools/msvs/msi/product.wxs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index 1d445d272a..889fd37f1d 100644..100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -46,6 +46,9 @@ <Component Id="npmcmd" Guid="31e9986d-74cd-44e1-878c-194d3e997d32"> <File Id="filenpmcmd" KeyPath="yes" Source="$(var.NPMSourceDir)\bin\npm.cmd" /> </Component> + <Component Id="npmsh" Guid="57754e12-9269-4198-a38c-2c098bf5276e"> + <File Id="filenpmsh" KeyPath="yes" Source="$(var.NPMSourceDir)\bin\npm" /> + </Component> <?if $(var.Configuration) = Debug ?> <Component Id="nodepdb" Guid="BEC0F08E-89B3-4C35-A286-8DB8598597F2"> <File Id="filenodepdb" KeyPath="yes" Source="$(var.sourcedir)\node.pdb" /> @@ -69,6 +72,7 @@ <ComponentGroup Id="allfiles"> <ComponentRef Id="nodeexe"/> <ComponentRef Id="npmcmd"/> + <ComponentRef Id="npmsh"/> <ComponentRef Id="npmrc" /> <ComponentRef Id="npmappdata_folder" /> <ComponentGroupRef Id="NPMFiles" /> |