Skip to content

Commit 3d3027c

Browse files
authored
bpo-44479: Simplified LICENSE.txt regeneration in Windows build (GH-27056)
1 parent 6bd3ecf commit 3d3027c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

PCbuild/regen.targets

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<_LicenseSources Include="$(tcltkDir)tcllicense.terms;
9797
$(tcltkDir)tklicense.terms;
9898
$(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" />
99-
<_LicenseOutputs Include="$(OutDir)LICENSE.txt" />
10099
</ItemGroup>
101100

102101
<Target Name="_RegenTestFrozenmain" Inputs="@(_TestFrozenSources)" Outputs="@(_TestFrozenOutputs)"
@@ -106,18 +105,19 @@
106105
WorkingDirectory="$(PySourcePath)" />
107106
</Target>
108107

109-
<Target Name="_RegenLicense" Inputs="@(_LicenseSources)" Outputs="@(_LicenseOutputs)">
110-
<Message Text="Regenerate @(_LicenseOutputs->'%(Filename)%(Extension)', ' ')" Importance="high" />
108+
<Target Name="_RegenLicense">
111109
<ItemGroup>
112-
<_Text Include="@(_LicenseFiles)">
110+
<_Text1 Include="@(_LicenseSources)">
113111
<Content Condition="Exists(%(FullPath))">$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
114-
</_Text>
112+
</_Text1>
113+
<_Text Include="@(_Text1->'%(Content)')" />
115114
</ItemGroup>
116115

117-
<WriteLinesToFile File="@(_LicenseOutputs)" Overwrite="true" Lines="@(_Text->'%(Content)')" />
116+
<WriteLinesToFile File="$(OutDir)LICENSE.txt" Overwrite="true" Lines="@(_Text)" />
117+
<Warning Text="License file %(_LicenseSources.FullPath) is missing"
118+
Condition="!Exists(@(_LicenseSources))" />
119+
<Message Text="Wrote $(OutDir)LICENSE.txt" Importance="high" />
118120
</Target>
119121

120-
<Target Name="PostBuildRegen" DependsOnTargets="_RegenTestFrozenmain;_RegenLicense">
121-
<Message Text="Other generated files are up to date" Importance="high" />
122-
</Target>
122+
<Target Name="PostBuildRegen" DependsOnTargets="_RegenTestFrozenmain;_RegenLicense" />
123123
</Project>

0 commit comments

Comments
 (0)