From 3d43959cd747f3d8d5ef24b12571c143063dde4a Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 24 May 2024 09:16:02 +0700
Subject: [PATCH] fix(windows): add FV build to Windows release build

Relates to #11461.

The FV build is now a part of the Windows publish build. At the same
time, addresses a number of typos in the build script, which had not
been tested because it was not linked to the Windows build.
---
 oem/firstvoices/windows/src/inst/build.sh | 17 ++++++++++++++---
 windows/src/.gitignore                    |  3 +++
 windows/src/build.sh                      |  3 ++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/oem/firstvoices/windows/src/inst/build.sh b/oem/firstvoices/windows/src/inst/build.sh
index b0c7b50a806..bf33b4046c0 100755
--- a/oem/firstvoices/windows/src/inst/build.sh
+++ b/oem/firstvoices/windows/src/inst/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../..../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
 builder_describe "Installation files for FirstVoices Keyboards" \
   @/common/windows/data \
@@ -63,7 +64,17 @@ function do_publish() {
      -dVERSION=$VERSION_WIN -dRELEASE=$VERSION_RELEASE \
      -dPRODUCTID=$GUID1 -dDESKTOPUISOURCE=../xml \
      firstvoices.wxs desktopui.wxs
-  "$WIXLIGHT" -dWixUILicenseRtf=License.rtf -out firstvoices.msi -ext WixUIExtension firstvoices.wixobj desktopui.wixobj
+
+  # ICE82: we suppress because it reports spurious errors with merge module
+  #        keymanengine to do with duplicate sequence numbers.  Safely ignored.
+  # ICE80: we suppress because it reports x64 components without targeting x64.
+  #        Safely ignored.
+
+  "$WIXLIGHT" \
+    -sice:ICE82 -sice:ICE80 \
+    -dWixUILicenseRtf=License.rtf \
+    -out firstvoices.msi \
+    -ext WixUIExtension firstvoices.wixobj desktopui.wixobj
 
   #
   # Sign the installation archive
@@ -107,7 +118,7 @@ function create-setup-inf() {
   builder_heading create-setup-inf
 
   echo "[Setup]" > setup.inf
-  echo "Version=$VersionWin" >> setup.inf
+  echo "Version=$VERSION_WIN" >> setup.inf
   echo "MSIFileName=firstvoices.msi" >> setup.inf
   echo "MSIOptions=" >> setup.inf
   echo "AppName=FirstVoices Keyboards" >> setup.inf
diff --git a/windows/src/.gitignore b/windows/src/.gitignore
index 54037b8c4ae..3ac3da4ea59 100644
--- a/windows/src/.gitignore
+++ b/windows/src/.gitignore
@@ -31,3 +31,6 @@ global/delphi/cust/MessageIdentifierConsts.pas
 # Coverity intermediate folder and files
 cov-int/
 keyman-windows-coverity.tgz
+
+# This file is still generated by devtools. TODO: eliminate in future
+PathDefines.mak
diff --git a/windows/src/build.sh b/windows/src/build.sh
index 02ab4fbcac1..a1fc4d0e1a5 100755
--- a/windows/src/build.sh
+++ b/windows/src/build.sh
@@ -18,7 +18,8 @@ builder_describe \
   ":engine                 Keyman Engine for Windows" \
   ":desktop                Keyman for Windows" \
   ":components=global/delphi   Delphi components" \
-  ":test=test/unit-tests   Shared unit tests"
+  ":test=test/unit-tests   Shared unit tests" \
+  ":fv=../../oem/firstvoices/windows/src/inst           OEM FirstVoices for Windows app"
 
 builder_parse "$@"