diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-01 03:53:50 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-01 03:53:50 (GMT) |
| commit | e4969f5df832eb8f626544d38ee11b75b52b4aee (patch) | |
| tree | 224c8c8914af9b5821b9ea344a15895632728bd4 /Tools/msi/msi.props | |
| parent | a473b9da152d4cdd10eccc6d8eafa2b519da121d (diff) | |
| download | cpython-e4969f5df832eb8f626544d38ee11b75b52b4aee.zip cpython-e4969f5df832eb8f626544d38ee11b75b52b4aee.tar.gz cpython-e4969f5df832eb8f626544d38ee11b75b52b4aee.tar.bz2 | |
Updates CRT installation for Windows installer.
Bundling versions of the CRT prior to 14.0 is no longer supported.
Diffstat (limited to 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 16839cc..cbaa6b1 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="ReleaseUri"> <PropertyGroup> + <TargetName>$(OutputName)</TargetName> <DefineSolutionProperties>false</DefineSolutionProperties> <TreatWarningsAsErrors>false</TreatWarningsAsErrors> <SuppressIces>$(SuppressIces);ICE03;ICE57;ICE61</SuppressIces> @@ -48,10 +49,8 @@ <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath> <OutDir>$(OutputPath)</OutDir> <ReuseCabinetCache>true</ReuseCabinetCache> - <CRTModule Condition="'$(VisualStudioVersion)' == '12.0'">$(CommonProgramFiles)\Merge Modules\Microsoft_VC120_CRT_$(Platform).msm</CRTModule> - <CRTModule Condition="'$(VisualStudioVersion)' == '14.0'">$(CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(Platform).msm</CRTModule> - <CRTRedist Condition="'$(VisualStudioVersion)' == '12.0'">$([System.IO.Path]::GetFullPath(`$(VS120COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC120.CRT`))</CRTRedist> - <CRTRedist Condition="'$(VisualStudioVersion)' == '14.0'">$([System.IO.Path]::GetFullPath(`$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT`))</CRTRedist> + <CRTRedist Condition="">$([System.IO.Path]::GetFullPath(`$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT`))</CRTRedist> + <CRTRedist Condition="'$(CRTRedist)' != '' and !Exists($(CRTRedist))">$(MSBuildThisFileDirectory)\redist\$(Platform)</CRTRedist> <CRTRedist Condition="'$(CRTRedist)' != '' and !Exists($(CRTRedist))"></CRTRedist> <RevisionNumber>$(ReleaseLevelNumber)</RevisionNumber> @@ -72,9 +71,6 @@ NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0; PyDebugExt=$(PyDebugExt); </DefineConstants> - <DefineConstants Condition="'$(CRTModule)' != '' and Exists($(CRTModule))"> - $(DefineConstants);CRTModule=$(CRTModule); - </DefineConstants> <DefineConstants Condition="'$(CRTRedist)' != ''"> $(DefineConstants);CRTRedist=$(CRTRedist); </DefineConstants> @@ -115,6 +111,9 @@ <LinkerBindInputPaths Include="$(CRTRedist)" Condition="'$(CRTRedist)' != ''"> <BindName>crt</BindName> </LinkerBindInputPaths> + <LinkerBindInputPaths Include="$(MSBuildThisFileDirectory)\redist"> + <BindName>redist</BindName> + </LinkerBindInputPaths> </ItemGroup> <Target Name="_ValidateMsiProps" BeforeTargets="PrepareForBuild"> |