[Python-checkins] bpo-44479: Simplified LICENSE.txt regeneration in Windows build (GH-27056)
zooba
webhook-mailer at python.org
Wed Jul 7 14:36:00 EDT 2021
https://github.com/python/cpython/commit/f2491c647937fc0871a473c19e3d5cb5392cfca0
commit: f2491c647937fc0871a473c19e3d5cb5392cfca0
branch: 3.10
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2021-07-07T19:35:51+01:00
summary:
bpo-44479: Simplified LICENSE.txt regeneration in Windows build (GH-27056)
files:
M PCbuild/regen.targets
diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets
index 7c956c4bc58d2..a1de340ab544c 100644
--- a/PCbuild/regen.targets
+++ b/PCbuild/regen.targets
@@ -96,21 +96,21 @@
<_LicenseSources Include="$(tcltkDir)tcllicense.terms;
$(tcltkDir)tklicense.terms;
$(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" />
- <_LicenseOutputs Include="$(OutDir)LICENSE.txt" />
</ItemGroup>
- <Target Name="_RegenLicense" Inputs="@(_LicenseSources)" Outputs="@(_LicenseOutputs)">
- <Message Text="Regenerate @(_LicenseOutputs->'%(Filename)%(Extension)', ' ')" Importance="high" />
+ <Target Name="_RegenLicense">
<ItemGroup>
- <_Text Include="@(_LicenseFiles)">
+ <_Text1 Include="@(_LicenseSources)">
<Content Condition="Exists(%(FullPath))">$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
- </_Text>
+ </_Text1>
+ <_Text Include="@(_Text1->'%(Content)')" />
</ItemGroup>
- <WriteLinesToFile File="@(_LicenseOutputs)" Overwrite="true" Lines="@(_Text->'%(Content)')" />
+ <WriteLinesToFile File="$(OutDir)LICENSE.txt" Overwrite="true" Lines="@(_Text)" />
+ <Warning Text="License file %(_LicenseSources.FullPath) is missing"
+ Condition="!Exists(@(_LicenseSources))" />
+ <Message Text="Wrote $(OutDir)LICENSE.txt" Importance="high" />
</Target>
- <Target Name="PostBuildRegen" DependsOnTargets="_RegenLicense">
- <Message Text="Other generated files are up to date" Importance="high" />
- </Target>
+ <Target Name="PostBuildRegen" DependsOnTargets="_RegenLicense" />
</Project>
More information about the Python-checkins
mailing list