summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-05 15:39:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-07-05 15:39:13 (GMT)
commit95f9dd5e72d6a72db0ad7438b65990cba30cf36b (patch)
tree38b113eeaf7a49a906bb11f471c28c58b35d3bcd
parentd5d77aac60453694445d1509b51d7514871dbff8 (diff)
parentd423396394c49a339b78f2026a1fdab42a1cffb0 (diff)
downloadcpython-95f9dd5e72d6a72db0ad7438b65990cba30cf36b.zip
cpython-95f9dd5e72d6a72db0ad7438b65990cba30cf36b.tar.gz
cpython-95f9dd5e72d6a72db0ad7438b65990cba30cf36b.tar.bz2
merge heads
-rw-r--r--Tools/msi/msi.targets2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/msi/msi.targets b/Tools/msi/msi.targets
index 34b8747..2431dc2 100644
--- 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>