From d5e34856ec5832e6b1aaf0a060690d21b724ea3b Mon Sep 17 00:00:00 2001
From: Hasso <hasso_pape@sil.org>
Date: Wed, 18 Mar 2026 16:53:05 -0500
Subject: [PATCH 1/2] Skip building FieldWorks from Installer.legacy.targets

This build is redundant to the build in build.ps1.
The new installer.targets already doesn't build FieldWorks.

Also remove two unused build targets.
---
 Build/Installer.legacy.targets | 28 ++--------------------------
 Build/mkall.targets            |  8 +++-----
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/Build/Installer.legacy.targets b/Build/Installer.legacy.targets
index 7532bdcce5..dad9ea8e2e 100644
--- a/Build/Installer.legacy.targets
+++ b/Build/Installer.legacy.targets
@@ -92,7 +92,7 @@
 		Name="BuildProductMain"
 		DependsOnTargets="MakeInstallBuildFolders;BuildProduct;Localize;CopyFilesToInstall;ValidateInstallerAddons"
 	/>
-	<Target Name="BuildProduct" DependsOnTargets="CleanInstaller;ProductCompile" />
+	<Target Name="BuildProduct" DependsOnTargets="CleanInstaller;BuildProcRunner;RescuePatching" />
 	<Target Name="RequirePlatform">
 		<!-- x64-only build (x86 is no longer supported) -->
 		<Error
@@ -123,37 +123,13 @@
 	<!-- ########################################################################################################## -->
 	<!-- ### Compile Targets                                                                                    ### -->
 	<!-- ########################################################################################################## -->
-	<Target Name="ProductCompile" DependsOnTargets="BuildFieldWorks;RescuePatching">
+	<Target Name="BuildProcRunner">
 		<MSBuild
 			Projects="$(InstallerDir)/CustomActions/CustomActions.sln"
 			Targets="CustomActions"
 			Properties="Configuration=Release;Platform=x86"
 		/>
 	</Target>
-	<!-- Modern traversal build for installer (replaces legacy remakefw) -->
-	<PropertyGroup>
-		<!--
-			Installer builds historically forced a full clean (CleanAll deletes Obj/ and Output/).
-			That guarantees correctness but destroys incremental rebuild performance for local iteration,
-			especially for native C++ projects.
-
-			Set InstallerCleanProductOutputs=true to restore the legacy behavior.
-		-->
-		<InstallerCleanProductOutputs Condition="'$(InstallerCleanProductOutputs)'==''">false</InstallerCleanProductOutputs>
-		<BuildFieldWorksDependsOn>Initialize;CopyDlls;setRegistryValues;GeneratePartsAndLayoutFiles</BuildFieldWorksDependsOn>
-		<BuildFieldWorksDependsOn Condition="'$(InstallerCleanProductOutputs)'=='true'">CleanAll;$(BuildFieldWorksDependsOn)</BuildFieldWorksDependsOn>
-	</PropertyGroup>
-	<Target
-		Name="BuildFieldWorks"
-		DependsOnTargets="$(BuildFieldWorksDependsOn)"
-	>
-		<Message Text="Building FieldWorks using MSBuild Traversal SDK..." Importance="High" />
-		<MSBuild
-			Projects="$(fwrt)/FieldWorks.proj"
-			Properties="Configuration=$(Configuration);Platform=$(Platform);action=$(action);desktopNotAvailable=$(desktopNotAvailable)"
-		/>
-		<Message Text="FieldWorks build complete." Importance="High" />
-	</Target>
 	<!-- Legacy cleanup target (external template repo no longer exists in this repo). -->
 	<Target Name="CleanInstaller">
 		<ItemGroup>
diff --git a/Build/mkall.targets b/Build/mkall.targets
index 7830cca508..4b77f4f212 100644
--- a/Build/mkall.targets
+++ b/Build/mkall.targets
@@ -12,7 +12,7 @@
 		  Targets: allCppNoTest (DebugProcs → GenericLib → FwKernel → Views)
 
 		Additional Responsibilities:
-		  - Code generation (CellarConstants, GeneratePartsAndLayoutFiles)
+		  - Code generation (CellarConstants)
 		  - Clean/utility targets (CleanAll, CleanDownloads)
 		  - Registry setup for dev/test environments (setRegistryValues)
 
@@ -222,10 +222,6 @@
 		<Original-BUILD4UX>$(BUILD4UX)</Original-BUILD4UX>
 		<Original-ANAL_TYPE>$(ANAL_TYPE)</Original-ANAL_TYPE>
 	</PropertyGroup>
-	<Target
-		Name="remakefw-internal"
-		DependsOnTargets="CleanAll;Initialize;CopyDlls;setRegistryValues;GeneratePartsAndLayoutFiles;mkall"
-	/>
 	<ItemGroup>
 		<GeneratedFiles Include="$(fwrt)/Src/**/Collection.cpp" />
 		<GeneratedFiles Include="$(fwrt)/Src/**/asserts.log" />
@@ -266,6 +262,8 @@
 	</PropertyGroup>
 	<!-- Package restoration, dependency downloads, and CopyDlls are in PackageRestore.targets -->
 	<Import Project="$(MSBuildThisFileDirectory)PackageRestore.targets" />
+	<!-- REVIEW (Hasso) 2026.03: the targets setRegistryValues and setKeysInHKCU appear unused by the recentnly-modernized build process,
+		but they may still be essential for developers wanting to run FieldWorks. TODO: test a new machine setup -->
 	<Target Name="setRegistryValues" DependsOnTargets="initWindows;setKeysInHKCU" />
 	<Target Name="setKeysInHKCU" Condition="'$(packaging)' != 'yes'">
 		<Message Text="Setting registry values for $(fwrt)." />

From 34c843278a9e005b48381e040bcdb688dfda2fd8 Mon Sep 17 00:00:00 2001
From: Hasso <hasso_pape@sil.org>
Date: Wed, 25 Mar 2026 14:27:59 -0500
Subject: [PATCH 2/2] Remove another unused target

---
 Build/SetupInclude.targets | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/Build/SetupInclude.targets b/Build/SetupInclude.targets
index 1f96fa3c86..31084cd120 100644
--- a/Build/SetupInclude.targets
+++ b/Build/SetupInclude.targets
@@ -364,24 +364,9 @@
 		/>
 		<Message Text="Updated CommonAssemblyInfo.cs, bldinc.h and GlobalInclude.properties (if needed)." />
 	</Target>
-	<Target Name="GeneratePartsAndLayoutFiles" DependsOnTargets="GenerateCellarConstants">
-		<XslTransformation
-			OutputPaths="$(fwrt)/DistFiles/Parts/GeneratedParts.xml"
-			XmlInputPaths="$(LcmModelArtifactsDir)/MasterLCModel.xml"
-			XslInputPath="$(fwrt)/Src/Common/Controls/DetailControls/PartGenerator/PartGenerate.xslt"
-		/>
-		<XslTransformation
-			OutputPaths="$(fwrt)/DistFiles/Parts/Generated.fwlayout"
-			XmlInputPaths="$(LcmModelArtifactsDir)/MasterLCModel.xml"
-			XslInputPath="$(fwrt)/Src/Common/Controls/DetailControls/PartGenerator/LayoutGenerate.xslt"
-		/>
-		<Message Text="Updated GeneratedParts.xml and Generated.fwlayout (if needed)." />
-	</Target>
 	<PropertyGroup>
 		<!-- Only compute fwrt if not already set (e.g., by NativeBuild.csproj) -->
-		<fwrt Condition="'$(fwrt)'==''"
-			>$([System.IO.Path]::GetFullPath("$(MSBuildProjectDirectory)/.."))</fwrt
-		>
+		<fwrt Condition="'$(fwrt)'==''">$([System.IO.Path]::GetFullPath("$(MSBuildProjectDirectory)/.."))</fwrt>
 		<BUILD_LEVEL Condition="'$(BUILD_LEVEL)'==''">9</BUILD_LEVEL>
 		<!-- action is one of the following: build test clean register unregister -->
 		<action Condition="'$(action)'==''">build</action>