diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-25 04:25:16 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-25 04:25:16 (GMT) |
| commit | 102f72cf1a414f507951cf4988d51cffb8f4e2b4 (patch) | |
| tree | 4836b089a9dd96f91044ae82d76030b95e39c287 /Tools/msi/msi.props | |
| parent | fef9c1b368ce0a59772378798d203efc5f836413 (diff) | |
| download | cpython-102f72cf1a414f507951cf4988d51cffb8f4e2b4.zip cpython-102f72cf1a414f507951cf4988d51cffb8f4e2b4.tar.gz cpython-102f72cf1a414f507951cf4988d51cffb8f4e2b4.tar.bz2 | |
Adds pydoc shortcut, Edit with IDLE menu, moves redist folder into externals and fixes test script.
Diffstat (limited to 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 9fa80f3..6ca0332 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -49,9 +49,9 @@ <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath> <OutDir>$(OutputPath)</OutDir> <ReuseCabinetCache>true</ReuseCabinetCache> - <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> + <CRTRedist Condition="'$(CRTRedist)' == ''">$(ExternalsDir)\redist</CRTRedist> + <CRTRedist Condition="!Exists($(CRTRedist))"></CRTRedist> + <DocFilename>python$(MajorVersionNumber)$(MinorVersionNumber)$(MicroVersionNumber)$(ReleaseLevelName).chm</DocFilename> <RevisionNumber>$(ReleaseLevelNumber)</RevisionNumber> <RevisionNumber Condition="!$(BuildForRelease)">$([System.Math]::Floor($([System.DateTime]::Now.Subtract($([System.DateTime]::new(2001, 1, 1))).TotalDays)))</RevisionNumber> @@ -69,6 +69,7 @@ MinorVersionNumber=$(MinorVersionNumber); UpgradeMinimumVersion=$(MajorVersionNumber).$(MinorVersionNumber).0.0; NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0; + Bitness=$(Bitness); PyDebugExt=$(PyDebugExt); </DefineConstants> <DefineConstants Condition="'$(CRTRedist)' != ''"> @@ -109,11 +110,11 @@ <BindName>tcltk</BindName> </LinkerBindInputPaths> <LinkerBindInputPaths Include="$(CRTRedist)" Condition="'$(CRTRedist)' != ''"> - <BindName>crt</BindName> - </LinkerBindInputPaths> - <LinkerBindInputPaths Include="$(MSBuildThisFileDirectory)\redist"> <BindName>redist</BindName> </LinkerBindInputPaths> + <LinkerBindInputPaths Include="$(CRTRedist)\$(Platform)" Condition="'$(CRTRedist)' != ''"> + <BindName>crt</BindName> + </LinkerBindInputPaths> </ItemGroup> <Target Name="_ValidateMsiProps" BeforeTargets="PrepareForBuild"> |