diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-05-18 22:54:05 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-05-18 22:54:05 (GMT) |
| commit | 4962141804676b34c372c8d6941eaf8edab3bfce (patch) | |
| tree | 5bc3250ab83ff8716fc55bb8b5cfbb2f61c92eb9 /Tools/msi/msi.targets | |
| parent | 1cea70f08c0b6aa3fccb246416b367e9afc1932a (diff) | |
| download | cpython-4962141804676b34c372c8d6941eaf8edab3bfce.zip cpython-4962141804676b34c372c8d6941eaf8edab3bfce.tar.gz cpython-4962141804676b34c372c8d6941eaf8edab3bfce.tar.bz2 | |
Removes versioning from py.exe launcher installer and ensures that old launchers are replaced by newer ones.
Diffstat (limited to 'Tools/msi/msi.targets')
| -rw-r--r-- | Tools/msi/msi.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/msi.targets b/Tools/msi/msi.targets index a40d9c4..86be35b 100644 --- a/Tools/msi/msi.targets +++ b/Tools/msi/msi.targets @@ -25,7 +25,7 @@ </Target> <Target Name="_TransformWxlTemplates" AfterTargets="PrepareForBuild" Inputs="@(WxlTemplate);$(PySourcePath)include\patchlevel.h" Outputs="$(IntermediateOutputPath)%(Filename).wxl"> - <PropertyGroup> + <PropertyGroup Condition="'@(WxlTemplate)' != ''"> <_Content>$([System.IO.File]::ReadAllText(%(WxlTemplate.FullPath)).Replace(`{{ShortVersion}}`, `$(MajorVersionNumber).$(MinorVersionNumber)$(PyTestExt)`).Replace(`{{LongVersion}}`, `$(PythonVersion)$(PyTestExt)`).Replace(`{{Bitness}}`, `$(Bitness)`))</_Content> <_ExistingContent Condition="Exists('$(IntermediateOutputPath)%(WxlTemplate.Filename).wxl')">$([System.IO.File]::ReadAllText($(IntermediateOutputPath)%(WxlTemplate.Filename).wxl))</_ExistingContent> </PropertyGroup> @@ -35,7 +35,7 @@ Overwrite="true" Condition="$(_Content) != $(_ExistingContent)" /> - <ItemGroup> + <ItemGroup Condition="'@(WxlTemplate)' != ''"> <EmbeddedResource Include="$(IntermediateOutputPath)%(WxlTemplate.Filename).wxl" /> <FileWrites Include="$(IntermediateOutputPath)%(WxlTemplate.Filename).wxl" /> </ItemGroup> |