[Python-checkins] cpython (merge 3.5 -> 3.5): merge heads

[benjamin.peterson]

https://hg.python.org/cpython/rev/4623c0edc5e6
changeset:   96825:4623c0edc5e6
branch:      3.5
parent:      96823:a4df0fe62b46
parent:      96820:60b84c6751d3
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jul 05 10:39:13 2015 -0500
summary:
  merge heads

files:
  Tools/msi/msi.targets |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Tools/msi/msi.targets b/Tools/msi/msi.targets
--- a/Tools/msi/msi.targets
+++ b/Tools/msi/msi.targets
@@ -24,7 +24,7 @@
         </ItemGroup>
     </Target>
 
-    <Target Name="_TransformWxlTemplates" AfterTargets="PrepareForBuild">
+    <Target Name="_TransformWxlTemplates" AfterTargets="PrepareForBuild" Inputs="@(WxlTemplate);$(PySourcePath)include\patchlevel.h" Outputs="$(IntermediateOutputPath)%(Filename).wxl">
         <PropertyGroup>
             <_Content>$([System.IO.File]::ReadAllText(%(WxlTemplate.FullPath)).Replace(`{{ShortVersion}}`, `$(MajorVersionNumber).$(MinorVersionNumber)`).Replace(`{{LongVersion}}`, `$(PythonVersion)`).Replace(`{{Bitness}}`, `$(Bitness)`))</_Content>
             <_ExistingContent Condition="Exists('$(IntermediateOutputPath)%(WxlTemplate.Filename).wxl')">$([System.IO.File]::ReadAllText($(IntermediateOutputPath)%(WxlTemplate.Filename).wxl))</_ExistingContent>

-- 
Repository URL: https://hg.python.org/cpython