diff options
| author | Bert Belder <bertbelder@gmail.com> | 2013-03-07 11:37:07 +0100 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2013-03-08 18:00:36 +0100 |
| commit | 4348241bcc61b9956d9c0697b344d6234a2a240f (patch) | |
| tree | 24d5d7ca1a7c0c9e97a52d6cc4b9da69130a4f43 /tools/msvs/msi | |
| parent | 0604d9ab93311212b3f8bc3526c3c711ee7dc165 (diff) | |
| download | android-node-v8-4348241bcc61b9956d9c0697b344d6234a2a240f.tar.gz android-node-v8-4348241bcc61b9956d9c0697b344d6234a2a240f.tar.bz2 android-node-v8-4348241bcc61b9956d9c0697b344d6234a2a240f.zip | |
win/msi: use consistent registry key paths
Diffstat (limited to 'tools/msvs/msi')
| -rwxr-xr-x | tools/msvs/msi/product.wxs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index 905b506d9f..891bc44055 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -6,6 +6,8 @@ <?define ProductDescription = "Node.js" ?> <?define ProductAuthor = "Joyent, Inc. and other Node contributors" ?> + <?define RegistryKeyPath = "SOFTWARE\Node.js" ?> + <?define RepoDir="$(var.ProjectDir)..\..\..\" ?> <?define SourceDir="$(var.RepoDir)\$(var.Configuration)\" ?> @@ -29,8 +31,11 @@ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" /> <Property Id="INSTALLDIR"> - <RegistrySearch Id='InstallPathRegistry' Type='raw' - Root='HKCU' Key='SOFTWARE\Joyent\Node.js\Installer' Name='PreviousPath' /> + <RegistrySearch Id="InstallPathRegistry" + Type="raw" + Root="HKCU" + Key="$(var.RegistryKeyPath)" + Name="InstallPath"/> </Property> <Feature Id="nodejs" Title="node.js engine" Level="1" Description="$(var.ProductDescription)" Absent="disallow"> @@ -97,14 +102,9 @@ <File Id="filenodejsvars" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodejsvars.bat" /> </Component> <Component Id="noderegistry" Guid="*" > - <RegistryKey Root="HKCU" Key="Software"> - <RegistryKey Key="Joyent"> - <RegistryKey Key="Node.js"> - <RegistryKey Key="Installer"> - <RegistryValue Name="PreviousPath" Type="string" Value="[INSTALLDIR]" KeyPath="yes" /> - </RegistryKey> - </RegistryKey> - </RegistryKey> + <RegistryKey Root="HKCU" Key="$(var.RegistryKeyPath)"> + <RegistryValue Name="InstallPath" Type="string" Value="[INSTALLDIR]" KeyPath="yes" /> + <RegistryValue Name="Version" Type="string" Value="$(var.ProductVersion)" /> </RegistryKey> </Component> </Directory> @@ -127,7 +127,7 @@ Arguments="/x [ProductCode]" Description="Uninstalls $(var.ProductName)" /> <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/> - <RegistryValue Root="HKCU" Key="Software\Joyent\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/> + <RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)" Name="installed" Type="integer" Value="1" KeyPath="yes"/> </Component> <Component Id="InternetShortcuts" Guid="3351B877-49BA-4BC0-BF5E-21BA623FD07C"> <util:InternetShortcut Id="OnlineWebsiteShortcut" @@ -138,7 +138,7 @@ Name="Node.js documentation" Target="http://nodejs.org/dist/v$(var.ProductVersion)/docs/api/" Type="url"/> - <RegistryValue Root="HKCU" Key="Software\Joyent\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/> + <RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)" Name="installed" Type="integer" Value="1" KeyPath="yes"/> </Component> </DirectoryRef> |