diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-11-05 00:07:31 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-11-05 00:07:31 (GMT) |
| commit | 40708cc7d2361518a2784afedf495eafcc099de5 (patch) | |
| tree | d847d0816f55b8acbd13b4c8b1670d8012fd59ea /Tools | |
| parent | 5c0100aec014b9e0a66884468cbfa3ac01e4bfbb (diff) | |
| download | cpython-40708cc7d2361518a2784afedf495eafcc099de5.zip cpython-40708cc7d2361518a2784afedf495eafcc099de5.tar.gz cpython-40708cc7d2361518a2784afedf495eafcc099de5.tar.bz2 | |
bpo-31944: Fixes build and Modify button (GH-4278) (#4284)
(cherry picked from commit 0d2a9088d16826343344b04461c8be44b4008710)
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/pythonba.vcxproj | 6 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Tools/msi/bundle/bootstrap/pythonba.vcxproj b/Tools/msi/bundle/bootstrap/pythonba.vcxproj index bcd3951..75aad44 100644 --- a/Tools/msi/bundle/bootstrap/pythonba.vcxproj +++ b/Tools/msi/bundle/bootstrap/pythonba.vcxproj @@ -26,12 +26,14 @@ <ProjectGuid>{7A09B132-B3EE-499B-A700-A4B2157FEA3D}</ProjectGuid> <TargetName>PythonBA</TargetName> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="..\..\wix.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <IntDir>$(Py_IntDir)\$(Configuration)_$(Platform)_Setup\Bootstrap\</IntDir> + <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(PySourcePath)PCbuild\obj\</Py_IntDir> + <IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\msi_$(ProjectName)\</IntDir> + <IntDir>$(IntDir.Replace(`\\`, `\`))</IntDir> <OutDir>$(IntDir)</OutDir> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index 02a456b..f6cff6f 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -8,7 +8,6 @@ IconSourceFile="..\..\..\PC\icons\setup.ico" Manufacturer="!(loc.Manufacturer)" AboutUrl="http://www.python.org/" - DisableModify="button" Compressed="no" dep:ProviderKey="CPython-$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)"> |