Skip to content

Commit 5ab1338

Browse files
authored
Restore a build target (#788)
* Restore a build target GeneratePartsAndLayoutFiles was mistakenly deleted. This partially reverts commit 0a8fc9a Also * Generate Parts and Layout files * Centralize the Chorus L10ns version * Remove a mistakenly added file
1 parent 90bbc7a commit 5ab1338

4 files changed

Lines changed: 17 additions & 7295 deletions

File tree

Build/SetupInclude.targets

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,19 @@
364364
/>
365365
<Message Text="Updated CommonAssemblyInfo.cs, bldinc.h and GlobalInclude.properties (if needed)." />
366366
</Target>
367+
<Target Name="GeneratePartsAndLayoutFiles" DependsOnTargets="GenerateCellarConstants">
368+
<XslTransformation
369+
OutputPaths="$(fwrt)/DistFiles/Parts/GeneratedParts.xml"
370+
XmlInputPaths="$(LcmModelArtifactsDir)/MasterLCModel.xml"
371+
XslInputPath="$(fwrt)/Src/Common/Controls/DetailControls/PartGenerator/PartGenerate.xslt"
372+
/>
373+
<XslTransformation
374+
OutputPaths="$(fwrt)/DistFiles/Parts/Generated.fwlayout"
375+
XmlInputPaths="$(LcmModelArtifactsDir)/MasterLCModel.xml"
376+
XslInputPath="$(fwrt)/Src/Common/Controls/DetailControls/PartGenerator/LayoutGenerate.xslt"
377+
/>
378+
<Message Text="Updated GeneratedParts.xml and Generated.fwlayout (if needed)." />
379+
</Target>
367380
<PropertyGroup>
368381
<!-- Only compute fwrt if not already set (e.g., by NativeBuild.csproj) -->
369382
<fwrt Condition="'$(fwrt)'==''">$([System.IO.Path]::GetFullPath("$(MSBuildProjectDirectory)/.."))</fwrt>

Build/SilVersions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<SilLcmVersion>11.0.0-beta0159</SilLcmVersion>
1616
<SilLibPalasoVersion>17.0.0</SilLibPalasoVersion>
1717
<SilChorusVersion>6.0.0-beta0063</SilChorusVersion>
18+
<SilChorusL10nsVersion>3.0.1</SilChorusL10nsVersion>
1819
<SilMachineVersion>3.7.13</SilMachineVersion>
1920
<SilIPCFrameworkVersion>1.1.1-beta0001</SilIPCFrameworkVersion>
2021
<IcuNugetVersion>70.1.152</IcuNugetVersion>

Build/Src/NativeBuild/NativeBuild.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
They must be explicitly referenced here because NativeBuild.csproj is a traditional
5454
MSBuild project, not an SDK-style project, so it doesn't inherit from Directory.Build.props.
5555
-->
56-
<PackageReference Include="SIL.Chorus.L10ns" Version="3.0.1">
56+
<PackageReference Include="SIL.Chorus.L10ns" Version="$(SilChorusL10nsVersion)">
5757
<IncludeAssets>none</IncludeAssets>
5858
<PrivateAssets>all</PrivateAssets>
5959
</PackageReference>
@@ -67,11 +67,8 @@
6767
<PrivateAssets>all</PrivateAssets>
6868
</PackageReference>
6969
</ItemGroup>
70-
<!-- Override the Build target to call native build instead -->
71-
<Target
72-
Name="Build"
73-
DependsOnTargets="allCppNoTest"
74-
>
70+
<!-- Override the Build target to call native build instead. Also generate Parts and Layout files. -->
71+
<Target Name="Build" DependsOnTargets="allCppNoTest;GeneratePartsAndLayoutFiles">
7572
<Message Text="Native C++ components built successfully" Importance="high" />
7673
</Target>
7774
<!-- Ensure Clean works -->

0 commit comments

Comments
 (0)