Home Original page

bpo-31944: Fixes build and Modify button (GH-4278) (#4284) · python/cpython@40708cc

5 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -0,0 +1 @@

1+

Fixes Modify button in Apps and Features dialog.

Original file line numberDiff line numberDiff line change

@@ -7,6 +7,7 @@

77

<OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>

88

<Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_IntDir>

99

<IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>

10+

<IntDir>$(IntDir.Replace(`\\`, `\`))</IntDir>

1011

<TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>

1112

<TargetName>$(TargetName)$(PyDebugExt)</TargetName>

1213

<GenerateManifest>false</GenerateManifest>

Original file line numberDiff line numberDiff line change

@@ -72,8 +72,8 @@

7272

possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really

7373

matter which WinSDK version we use.

7474

-->

75-

<DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>

76-

<DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>

75+

<DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>

76+

<DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>

7777

<DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>

7878

<DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>

7979

<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 numberDiff line numberDiff line change

@@ -26,12 +26,14 @@

2626

<ProjectGuid>{7A09B132-B3EE-499B-A700-A4B2157FEA3D}</ProjectGuid>

2727

<TargetName>PythonBA</TargetName>

2828

</PropertyGroup>

29-

<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

3029

<Import Project="..\..\wix.props" />

30+

<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

3131

<PropertyGroup Label="Configuration">

3232

<ConfigurationType>DynamicLibrary</ConfigurationType>

3333

<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>

3537

<OutDir>$(IntDir)</OutDir>

3638

</PropertyGroup>

3739

<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Original file line numberDiff line numberDiff line change

@@ -8,7 +8,6 @@

88

IconSourceFile="..\..\..\PC\icons\setup.ico"

99

Manufacturer="!(loc.Manufacturer)"

1010

AboutUrl="http://www.python.org/"

11-

DisableModify="button"

1211

Compressed="no"

1312

dep:ProviderKey="CPython-$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)">

1413

<BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)">