From 21f6ef71619bb48ccdafd3db50bc0547b48ca39a Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 25 Sep 2026 13:27:03 +0200
Subject: [PATCH] chore(developer): cleanup tike build.sh for
 touch-layout-editor

And add another TODO comment for #16646.

Relates-to: #16646
Test-bot: skip
---
 developer/src/tike/build.sh                   | 22 ++++++++++---------
 .../src/tike/xml/layoutbuilder/src/builder.ts |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/developer/src/tike/build.sh b/developer/src/tike/build.sh
index 45e7e51ffa..d95d9cc606 100755
--- a/developer/src/tike/build.sh
+++ b/developer/src/tike/build.sh
@@ -18,16 +18,23 @@ builder_parse "$@"
 
 source "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
 WIN32_TARGET="$WIN32_TARGET_PATH/tike.exe"
+KEYMANCORE_DLL=keymancore-2.dll
+KEYMANCORE_PDB=keymancore-2.pdb
+
+builder_describe_internal_dependency \
+  build:project  build:touch-layout-editor
 
 builder_describe_outputs \
   configure:project    /developer/src/tike/icons.res \
-  build:project        /developer/src/tike/$WIN32_TARGET
+  build:project        /developer/src/tike/$WIN32_TARGET \
+  build:touch-layout-editor /developer/src/tike/xml/layoutbuilder/build/src/builder.js
 
 #-------------------------------------------------------------------------------------------------------------------
 
 function do_configure() {
   configure_windows_build_environment
   do_monaco_copy
+  do_configure_touch_layout_editor
 
   mkdir -p "$DEVELOPER_PROGRAM"
   cp "$KEYMAN_ROOT/common/schemas/kps/kps.xsd" "$DEVELOPER_PROGRAM"
@@ -55,13 +62,11 @@ function do_monaco_copy() {
   popd
 }
 
-KEYMANCORE_DLL=keymancore-2.dll
-KEYMANCORE_PDB=keymancore-2.pdb
+function do_configure_touch_layout_editor() {
+  cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$DEVELOPER_ROOT/src/tike/xml/layoutbuilder/src/assets/fonts/keymanweb-osk.ttf"
+}
 
 function do_build_touch_layout_editor() {
-  # TODO: this could be a configure step but leaving it here while changes are in flux
-  cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$DEVELOPER_ROOT/src/tike/xml/layoutbuilder/src/assets/fonts/keymanweb-osk.ttf"
-  # TODO: do_configure_touch_layout_editor
   rm -rf xml/layoutbuilder/build/assets/
   rm -rf xml/layoutbuilder/build/ext/
   mkdir -p xml/layoutbuilder/build/assets/
@@ -76,9 +81,6 @@ function do_build() {
   build_version.res
   build_manifest.res
 
-  # todo: make this an internal dependency
-  do_build_touch_layout_editor
-
   rm -rf "$DEVELOPER_PROGRAM/xml"
   mkdir -p "$DEVELOPER_PROGRAM/xml"
   cp -R "$DEVELOPER_ROOT/src/tike/xml/"* "$DEVELOPER_PROGRAM/xml/"
@@ -122,8 +124,8 @@ function do_install() {
 
 builder_run_action clean:project               clean_windows_project_files
 builder_run_action configure:project           do_configure
-builder_run_action build:project               do_build
 builder_run_action build:touch-layout-editor   do_build_touch_layout_editor
+builder_run_action build:project               do_build
 # builder_run_action test:project              do_test
 builder_run_action publish:project             do_publish
 builder_run_action install:project             do_install
diff --git a/developer/src/tike/xml/layoutbuilder/src/builder.ts b/developer/src/tike/xml/layoutbuilder/src/builder.ts
index bf138e32e0..d6cbf275da 100644
--- a/developer/src/tike/xml/layoutbuilder/src/builder.ts
+++ b/developer/src/tike/xml/layoutbuilder/src/builder.ts
@@ -3,7 +3,7 @@
 
 import { builderConstants } from "./constants.js";
 
-// temporary interface to streamline transform to Typescript
+// TODO: temporary interface to streamline transform to Typescript
 interface Builder {
   [key: string]: any;
 };