diff options
| author | Bert Belder <bertbelder@gmail.com> | 2013-03-07 14:44:46 +0100 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2013-03-08 18:00:37 +0100 |
| commit | 2320ffbdff5a361f8ed3f14578b51ae741af897d (patch) | |
| tree | b31a8b2026a6193c005737be17a0468930a361b7 /tools/msvs | |
| parent | 5e832ac7b95f3a89708e9fadc617f0334e4fd049 (diff) | |
| download | node-new-2320ffbdff5a361f8ed3f14578b51ae741af897d.tar.gz | |
win/msi: make 'add to path' a separate feature
Diffstat (limited to 'tools/msvs')
| -rwxr-xr-x | tools/msvs/msi/product.wxs | 64 |
1 files changed, 51 insertions, 13 deletions
diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index 2597c000ba..ba9a0ad0d5 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -76,8 +76,26 @@ </Feature> </Feature> - <Directory Id="TARGETDIR" Name="SourceDir"> + <Feature Id="EnvironmentPath" + Level="1" + Title="Add to PATH" + Description="Add Node, NPM, and modules that were globally installed by NPM to the PATH environment variable."> + <Feature Id="EnvironmentPathNode" + Level="1" + Title="Node and NPM" + Description="Add Node and NPM (if installed) to the PATH environment variable."> + <ComponentRef Id="EnvironmentPathNode"/> + </Feature> + + <Feature Id="EnvironmentPathNpmModules" + Level="1" + Title="NPM modules" + Description="Add modules that are installed globablly by NPM to the PATH environment variable. This option works for the current user only; other users need to update their PATH manually."> + <ComponentRef Id="EnvironmentPathNpmModules"/> + </Feature> + </Feature> + <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramMenuFolder"> <Directory Id="ApplicationProgramsFolder" Name="Node.js ($(var.Platform))"/> </Directory> @@ -86,18 +104,6 @@ <Directory Id="INSTALLDIR" Name="nodejs"> <Component Id="nodeexe" Guid="AEC0F08E-89B3-4C35-A286-8DB8598597F2"> <File Id="filenodeexe" KeyPath="yes" Source="$(var.SourceDir)\node.exe" /> - <Environment Id="npm_env" - Action="set" - Name="PATH" - Part="last" - System="no" - Value="[AppDataFolder]npm\" /> - <Environment Id="node_env" - Action="set" - Name="PATH" - Part="last" - System="yes" - Value="[INSTALLDIR]" /> </Component> <Component Id="nodejsvars" Guid="*"> <File Id="filenodejsvars" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodejsvars.bat" /> @@ -148,6 +154,38 @@ </Directory> </DirectoryRef> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="EnvironmentPathNode"> + <RegistryValue Root="HKLM" + Key="$(var.RegistryKeyPath)\Components" + Name="EnvironmentPathNode" + Type="integer" + Value="1" + KeyPath="yes"/> + <Environment Id="EnvironmentPathNode" + Action="set" + Name="PATH" + Part="last" + System="yes" + Value="[INSTALLDIR]"/> + </Component> + + <Component Id="EnvironmentPathNpmModules"> + <RegistryValue Root="HKCU" + Key="$(var.RegistryKeyPath)\Components" + Name="EnvironmentPathNpmModules" + Type="integer" + Value="1" + KeyPath="yes"/> + <Environment Id="EnvironmentPathNpmModules" + Action="set" + Name="PATH" + Part="last" + System="no" + Value="[AppDataFolder]npm"/> + </Component> + </DirectoryRef> + <DirectoryRef Id="ApplicationProgramsFolder"> <Component Id="ApplicationShortcut" Guid="9b1ab94a-8f54-4f19-a5c4-b890de474162"> <Shortcut Id="ApplicationStartMenuShortcut" Name="Node.js" |