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/tcltk | |
| 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/tcltk')
| -rw-r--r-- | Tools/msi/tcltk/tcltk_reg.wxs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Tools/msi/tcltk/tcltk_reg.wxs b/Tools/msi/tcltk/tcltk_reg.wxs index e098927..2778bcc 100644 --- a/Tools/msi/tcltk/tcltk_reg.wxs +++ b/Tools/msi/tcltk/tcltk_reg.wxs @@ -5,25 +5,25 @@ <!-- We fix the guid of the Subcommands key so that it is correctly reference counted --> <Component Id="assoc_subcommands" Directory="InstallDirectory" Guid="{57D47B4C-96E6-40A0-A958-57083D74423F}"> <Condition>VersionNT > 600</Condition> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" /> + <RegistryValue Root="HKCR" Key="Python.File\Shell\editwithidle$(var.PyTestExt)" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> + <RegistryValue Root="HKCR" Key="Python.File\Shell\editwithidle$(var.PyTestExt)" Name="Subcommands" Value="" Type="string" KeyPath="no" /> </Component> <Component Id="assoc_subcommands_nocon" Directory="InstallDirectory" Guid="{07061D85-9151-4FC4-BB78-13628020D026}"> <Condition>VersionNT > 600</Condition> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" /> + <RegistryValue Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.PyTestExt)" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> + <RegistryValue Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.PyTestExt)" Name="Subcommands" Value="" Type="string" KeyPath="no" /> </Component> <Component Id="assoc_editwithidle" Directory="InstallDirectory"> <Condition>VersionNT > 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> </Component> <Component Id="assoc_editwithidle_nocon" Directory="InstallDirectory"> <Condition>VersionNT > 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> @@ -31,14 +31,14 @@ <Component Id="assoc_editwithidle_vista" Directory="InstallDirectory"> <Condition>VersionNT = 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> </Component> <Component Id="assoc_editwithidle_nocon_vista" Directory="InstallDirectory"> <Condition>VersionNT = 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> |