diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-09 03:18:44 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-09 03:18:44 (GMT) |
| commit | 494374922c909bfb7c833032a686cc173762d988 (patch) | |
| tree | 4824dbeaca517af7abab41a9c1714be71b23d975 /Tools/msi/msi.props | |
| parent | 9e7a0468ef12dc68a7efc397511ef06407aa835c (diff) | |
| download | cpython-494374922c909bfb7c833032a686cc173762d988.zip cpython-494374922c909bfb7c833032a686cc173762d988.tar.gz cpython-494374922c909bfb7c833032a686cc173762d988.tar.bz2 | |
Issue #24585: Enables build-to-build upgrades that preserve settings.
Rather than using Burn "Persisted" variables we now add registry keys for each added feature. These can be detected by the installer regardless of which version installed them, and we use this for Modify and Upgrade. In particular, Upgrades can't access the Persisted variables, but can find well-known registry keys.
There are also some changes to the bootstrap app to properly handle upgrades.
Finally, a few minor improvements to the Windows build to keep things tidier.
Diffstat (limited to 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index bd22345..1d9f0f0 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -43,7 +43,7 @@ </ItemGroup> <PropertyGroup> - <IntermediateOutputPath>$(MSBuildThisFileDirectory)\obj\$(Configuration)_$(Platform)\$(OutputName)</IntermediateOutputPath> + <IntermediateOutputPath>$(PySourcePath)PCBuild\obj\$(Configuration)_$(Platform)_Setup\$(OutputName)</IntermediateOutputPath> <IntermediateOutputPath Condition="'$(OutputSuffix)' != ''">$(IntermediateOutputPath)_$(OutputSuffix)</IntermediateOutputPath> <OutputPath Condition="'$(OutputPath)' == ''">$(BuildPath)</OutputPath> <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath> @@ -71,6 +71,7 @@ NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0; Bitness=$(Bitness); PyDebugExt=$(PyDebugExt); + OptionalFeatureName=$(OutputName); </DefineConstants> <DefineConstants Condition="'$(CRTRedist)' != ''"> $(DefineConstants);CRTRedist=$(CRTRedist); @@ -112,9 +113,6 @@ <LinkerBindInputPaths Include="$(CRTRedist)" Condition="'$(CRTRedist)' != ''"> <BindName>redist</BindName> </LinkerBindInputPaths> - <LinkerBindInputPaths Include="$(CRTRedist)\$(Platform)" Condition="'$(CRTRedist)' != ''"> - <BindName>crt</BindName> - </LinkerBindInputPaths> </ItemGroup> <Target Name="_ValidateMsiProps" BeforeTargets="PrepareForBuild"> |