Skip to content

Commit 0a8fc9a

Browse files
authored
Skip building FieldWorks from Installer.legacy.targets (#784)
This build is redundant to the build in build.ps1. The new installer.targets already doesn't build FieldWorks. Also remove three unused build targets.
1 parent c450a55 commit 0a8fc9a

3 files changed

Lines changed: 6 additions & 47 deletions

File tree

Build/Installer.legacy.targets

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
Name="BuildProductMain"
9393
DependsOnTargets="MakeInstallBuildFolders;BuildProduct;Localize;CopyFilesToInstall;ValidateInstallerAddons"
9494
/>
95-
<Target Name="BuildProduct" DependsOnTargets="CleanInstaller;ProductCompile" />
95+
<Target Name="BuildProduct" DependsOnTargets="CleanInstaller;BuildProcRunner;RescuePatching" />
9696
<Target Name="RequirePlatform">
9797
<!-- x64-only build (x86 is no longer supported) -->
9898
<Error
@@ -123,37 +123,13 @@
123123
<!-- ########################################################################################################## -->
124124
<!-- ### Compile Targets ### -->
125125
<!-- ########################################################################################################## -->
126-
<Target Name="ProductCompile" DependsOnTargets="BuildFieldWorks;RescuePatching">
126+
<Target Name="BuildProcRunner">
127127
<MSBuild
128128
Projects="$(InstallerDir)/CustomActions/CustomActions.sln"
129129
Targets="CustomActions"
130130
Properties="Configuration=Release;Platform=x86"
131131
/>
132132
</Target>
133-
<!-- Modern traversal build for installer (replaces legacy remakefw) -->
134-
<PropertyGroup>
135-
<!--
136-
Installer builds historically forced a full clean (CleanAll deletes Obj/ and Output/).
137-
That guarantees correctness but destroys incremental rebuild performance for local iteration,
138-
especially for native C++ projects.
139-
140-
Set InstallerCleanProductOutputs=true to restore the legacy behavior.
141-
-->
142-
<InstallerCleanProductOutputs Condition="'$(InstallerCleanProductOutputs)'==''">false</InstallerCleanProductOutputs>
143-
<BuildFieldWorksDependsOn>Initialize;CopyDlls;setRegistryValues;GeneratePartsAndLayoutFiles</BuildFieldWorksDependsOn>
144-
<BuildFieldWorksDependsOn Condition="'$(InstallerCleanProductOutputs)'=='true'">CleanAll;$(BuildFieldWorksDependsOn)</BuildFieldWorksDependsOn>
145-
</PropertyGroup>
146-
<Target
147-
Name="BuildFieldWorks"
148-
DependsOnTargets="$(BuildFieldWorksDependsOn)"
149-
>
150-
<Message Text="Building FieldWorks using MSBuild Traversal SDK..." Importance="High" />
151-
<MSBuild
152-
Projects="$(fwrt)/FieldWorks.proj"
153-
Properties="Configuration=$(Configuration);Platform=$(Platform);action=$(action);desktopNotAvailable=$(desktopNotAvailable)"
154-
/>
155-
<Message Text="FieldWorks build complete." Importance="High" />
156-
</Target>
157133
<!-- Legacy cleanup target (external template repo no longer exists in this repo). -->
158134
<Target Name="CleanInstaller">
159135
<ItemGroup>

Build/SetupInclude.targets

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -364,24 +364,9 @@
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>
380367
<PropertyGroup>
381368
<!-- Only compute fwrt if not already set (e.g., by NativeBuild.csproj) -->
382-
<fwrt Condition="'$(fwrt)'==''"
383-
>$([System.IO.Path]::GetFullPath("$(MSBuildProjectDirectory)/.."))</fwrt
384-
>
369+
<fwrt Condition="'$(fwrt)'==''">$([System.IO.Path]::GetFullPath("$(MSBuildProjectDirectory)/.."))</fwrt>
385370
<BUILD_LEVEL Condition="'$(BUILD_LEVEL)'==''">9</BUILD_LEVEL>
386371
<!-- action is one of the following: build test clean register unregister -->
387372
<action Condition="'$(action)'==''">build</action>

Build/mkall.targets

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Targets: allCppNoTest (DebugProcs → GenericLib → FwKernel → Views)
1313
1414
Additional Responsibilities:
15-
- Code generation (CellarConstants, GeneratePartsAndLayoutFiles)
15+
- Code generation (CellarConstants)
1616
- Clean/utility targets (CleanAll, CleanDownloads)
1717
- Registry setup for dev/test environments (setRegistryValues)
1818
@@ -222,10 +222,6 @@
222222
<Original-BUILD4UX>$(BUILD4UX)</Original-BUILD4UX>
223223
<Original-ANAL_TYPE>$(ANAL_TYPE)</Original-ANAL_TYPE>
224224
</PropertyGroup>
225-
<Target
226-
Name="remakefw-internal"
227-
DependsOnTargets="CleanAll;Initialize;CopyDlls;setRegistryValues;GeneratePartsAndLayoutFiles;mkall"
228-
/>
229225
<ItemGroup>
230226
<GeneratedFiles Include="$(fwrt)/Src/**/Collection.cpp" />
231227
<GeneratedFiles Include="$(fwrt)/Src/**/asserts.log" />
@@ -266,6 +262,8 @@
266262
</PropertyGroup>
267263
<!-- Package restoration, dependency downloads, and CopyDlls are in PackageRestore.targets -->
268264
<Import Project="$(MSBuildThisFileDirectory)PackageRestore.targets" />
265+
<!-- REVIEW (Hasso) 2026.03: the targets setRegistryValues and setKeysInHKCU appear unused by the recentnly-modernized build process,
266+
but they may still be essential for developers wanting to run FieldWorks. TODO: test a new machine setup -->
269267
<Target Name="setRegistryValues" DependsOnTargets="initWindows;setKeysInHKCU" />
270268
<Target Name="setKeysInHKCU" Condition="'$(packaging)' != 'yes'">
271269
<Message Text="Setting registry values for $(fwrt)." />

0 commit comments

Comments
 (0)