From: Steve Dower <steve.dower@python.org>
Date: Wed, 7 Jul 2021 17:21:54 +0000 (+0100)
Subject: bpo-44479: Simplified LICENSE.txt regeneration in Windows build (GH-27056)
X-Git-Tag: v3.11.0a1~718
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d3027c5fcc683c14ee55ad231d79971ba12b24d;p=thirdparty%2FPython%2Fcpython.git

bpo-44479: Simplified LICENSE.txt regeneration in Windows build (GH-27056)
---

diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets
index 22667d02aaa2..38f82d1b31a7 100644
--- a/PCbuild/regen.targets
+++ b/PCbuild/regen.targets
@@ -96,7 +96,6 @@
     <_LicenseSources Include="$(tcltkDir)tcllicense.terms;
                               $(tcltkDir)tklicense.terms;
                               $(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" />
-    <_LicenseOutputs Include="$(OutDir)LICENSE.txt" />
   </ItemGroup>
 
   <Target Name="_RegenTestFrozenmain" Inputs="@(_TestFrozenSources)" Outputs="@(_TestFrozenOutputs)"
@@ -106,18 +105,19 @@
           WorkingDirectory="$(PySourcePath)" />
   </Target>
 
-  <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="_RegenTestFrozenmain;_RegenLicense">
-    <Message Text="Other generated files are up to date" Importance="high" />
-  </Target>
+  <Target Name="PostBuildRegen" DependsOnTargets="_RegenTestFrozenmain;_RegenLicense" />
 </Project>