diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-06 22:55:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 22:55:25 (GMT) |
| commit | fd645ec6f5696e841e6d49075f9fd81e54e74d91 (patch) | |
| tree | 49f212a31351124313c9c06d13c553e8ec6ffbf8 /Tools/msi | |
| parent | 34c67614c170a79bbe168ed2f3df5556c34f162b (diff) | |
| download | cpython-fd645ec6f5696e841e6d49075f9fd81e54e74d91.zip cpython-fd645ec6f5696e841e6d49075f9fd81e54e74d91.tar.gz cpython-fd645ec6f5696e841e6d49075f9fd81e54e74d91.tar.bz2 | |
[3.6] bpo-31340: Change to building with MSVC v141 (included with Visual Studio 2017) (GH-3311) (#3386)
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/exe/exe.wixproj | 24 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_files.wxs | 2 |
2 files changed, 24 insertions, 2 deletions
diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index 24df0f5..16ef6ac 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -39,6 +39,28 @@ Overwrite="true" Lines="@(_LicenseFiles->'%(Content)')" /> </Target> - + + <Target Name="_CopyMiscNews" AfterTargets="PrepareForBuild" Condition="Exists('$(PySourcePath)Misc\NEWS')"> + <Copy SourceFiles="$(PySourcePath)Misc\NEWS" DestinationFiles="$(BuildPath)NEWS.txt" /> + </Target> + + <Target Name="_MergeMiscNewsWithBlurb" AfterTargets="PrepareForBuild" Condition="$(Blurb) != '' and !Exists('$(PySourcePath)Misc\NEWS')"> + <Exec Command="$(Blurb) merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCBuild)" /> + </Target> + + <Target Name="_MergeMiscNewsWithPython" AfterTargets="PrepareForBuild" Condition="$(Blurb) == '' and !Exists('$(PySourcePath)Misc\NEWS')"> + <ItemGroup> + <HostPython Include="$(ExternalsDir)python*\tools\python.exe" /> + <HostPython Include="@(HostPython)" Condition="Exists(%(FullPath))" /> + <HostPython Include="py" Condition="@(HostPython) == ''" /> + </ItemGroup> + <PropertyGroup> + <HostPython>@(HostPython)</HostPython> + <HostPython Condition="$(HostPython.Contains(';'))">$(HostPython.Remove($(HostPython.IndexOf(';'))))</HostPython> + </PropertyGroup> + <Exec Command=""$(HostPython)" -m pip install -U blurb" WorkingDirectory="$(PCBuild)" /> + <Exec Command=""$(HostPython)" -m blurb merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCBuild)" /> + </Target> + <Import Project="..\msi.targets" /> </Project>
\ No newline at end of file diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index e675c21..394b4de 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -6,7 +6,7 @@ <File Name="LICENSE.txt" Source="LICENSE" KeyPath="yes" /> </Component> <Component Id="NEWS.txt" Directory="InstallDirectory" Guid="*"> - <File Name="NEWS.txt" Source="!(bindpath.src)Misc\NEWS" KeyPath="yes" /> + <File Name="NEWS.txt" KeyPath="yes" /> </Component> </ComponentGroup> </Fragment> |