1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win/msi: make 'add to path' a separate feature

Browse Source
This commit is contained in:
Bert Belder 2013-03-07 14:44:46 +01:00
parent 5e832ac7b9
commit 2320ffbdff
1 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/msvs/msi/product.wxs
View File

@ -76,8 +76,26 @@
</Feature> </Feature>
</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="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="Node.js ($(var.Platform))"/> <Directory Id="ApplicationProgramsFolder" Name="Node.js ($(var.Platform))"/>
</Directory> </Directory>
@ -86,18 +104,6 @@
<Directory Id="INSTALLDIR" Name="nodejs"> <Directory Id="INSTALLDIR" Name="nodejs">
<Component Id="nodeexe" Guid="AEC0F08E-89B3-4C35-A286-8DB8598597F2"> <Component Id="nodeexe" Guid="AEC0F08E-89B3-4C35-A286-8DB8598597F2">
<File Id="filenodeexe" KeyPath="yes" Source="$(var.SourceDir)\node.exe" /> <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>
<Component Id="nodejsvars" Guid="*"> <Component Id="nodejsvars" Guid="*">
<File Id="filenodejsvars" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodejsvars.bat" /> <File Id="filenodejsvars" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodejsvars.bat" />
@ -148,6 +154,38 @@
</Directory> </Directory>
</DirectoryRef> </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"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="9b1ab94a-8f54-4f19-a5c4-b890de474162"> <Component Id="ApplicationShortcut" Guid="9b1ab94a-8f54-4f19-a5c4-b890de474162">
<Shortcut Id="ApplicationStartMenuShortcut" Name="Node.js" <Shortcut Id="ApplicationStartMenuShortcut" Name="Node.js"