diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-31 19:17:11 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-31 19:17:11 (GMT) |
| commit | 940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8 (patch) | |
| tree | a75f4cc54fd92dac49b0e9a127d956f7f4e41a3b /Tools/msi/common.wxs | |
| parent | f97edf1aa630d507a69885e5a3e9ff8edbe3ea02 (diff) | |
| download | cpython-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.zip cpython-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.tar.gz cpython-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.tar.bz2 | |
Improves handling of test markers for building Python without intefering with actual installs.
Diffstat (limited to 'Tools/msi/common.wxs')
| -rw-r--r-- | Tools/msi/common.wxs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs index 100a013..b907872 100644 --- a/Tools/msi/common.wxs +++ b/Tools/msi/common.wxs @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> - <Property Id="REGISTRYKEY" Value="Software\$(var.TestPrefix)Python\PythonCore\$(var.ShortVersion)$(var.Suffix32)" /> + <Property Id="REGISTRYKEY" Value="Software\Python\PythonCore\$(var.ShortVersion)$(var.PyArchExt)$(var.PyTestExt)" /> </Fragment> <Fragment> @@ -105,7 +105,7 @@ <Fragment> <DirectoryRef Id="TARGETDIR"> <Directory Id="ProgramMenuFolder"> - <Directory Id="MenuDir" Name="$(var.TestPrefix)!(loc.ProductName)" /> + <Directory Id="MenuDir" Name="!(loc.ProductName)" /> </Directory> </DirectoryRef> </Fragment> |