bpo-44479: Simplified LICENSE.txt regeneration in Windows build (pyth…

…onGH-27056)
michael-o · Jul 7, 2021 · 3d3027c · 3d3027c
1 parent 6bd3ecf
commit 3d3027c
Showing 1 changed file with 9 additions and 9 deletions.
diff --git 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>