bpo-31944: Fixes build and Modify button (#4278) · python/cpython@0d2a908 (original) (raw)

5 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +Fixes Modify button in Apps and Features dialog.
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
7 7 <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>
8 8 <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_IntDir>
9 9 <IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
10 + <IntDir>$(IntDir.Replace(`\\`, `\`))</IntDir>
10 11 <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>
11 12 <TargetName>$(TargetName)$(PyDebugExt)</TargetName>
12 13 <GenerateManifest>false</GenerateManifest>
Original file line number Diff line number Diff line change
@@ -73,8 +73,8 @@
73 73 possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really
74 74 matter which WinSDK version we use.
75 75 -->
76 - <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
77 - <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
76 + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
77 + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
78 78 <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
79 79 <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
80 80 <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
Original file line number Diff line number Diff line change
@@ -26,12 +26,14 @@
26 26 <ProjectGuid>{7A09B132-B3EE-499B-A700-A4B2157FEA3D}</ProjectGuid>
27 27 <TargetName>PythonBA</TargetName>
28 28 </PropertyGroup>
29 - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30 29 <Import Project="..\..\wix.props" />
30 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
31 31 <PropertyGroup Label="Configuration">
32 32 <ConfigurationType>DynamicLibrary</ConfigurationType>
33 33 <CharacterSet>Unicode</CharacterSet>
34 - <IntDir>$(Py_IntDir)\$(Configuration)_$(Platform)_Setup\Bootstrap\</IntDir>
34 + <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(PySourcePath)PCbuild\obj\</Py_IntDir>
35 + <IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\msi_$(ProjectName)\</IntDir>
36 + <IntDir>$(IntDir.Replace(`\\`, `\`))</IntDir>
35 37 <OutDir>$(IntDir)</OutDir>
36 38 </PropertyGroup>
37 39 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@
8 8 IconSourceFile="..\..\..\PC\icons\setup.ico"
9 9 Manufacturer="!(loc.Manufacturer)"
10 10 AboutUrl="http://www.python.org/"
11 -DisableModify="button"
12 11 Compressed="no"
13 12 dep:ProviderKey="CPython-$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)">
14 13 <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)">