From c82326f59575b478d0401335ff1621a3f0d3b8c2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 9 Sep 2022 09:29:08 +1000
Subject: [PATCH 1/2] chore(developer): kmc - use local reference for json
 schema

Fixes #7221.
---
 developer/src/kmc/build.sh              | 21 ++++++++++++---------
 developer/src/kmc/test/helpers/index.ts |  4 +---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index 7e96408cf6..165bad15e7 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -31,13 +31,6 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
-if builder_has_action configure; then
-  verify_npm_setup
-  builder_report success configure
-fi
-
-#-------------------------------------------------------------------------------------------------------------------
-
 if builder_has_action clean; then
   rm -rf ./build/ ./tsconfig.tsbuildinfo
   builder_report success clean
@@ -45,10 +38,20 @@ fi
 
 #-------------------------------------------------------------------------------------------------------------------
 
+if builder_has_action configure; then
+  verify_npm_setup
+
+  # We need the schema file at runtime and bundled
+  mkdir -p "$THIS_SCRIPT_PATH/build/src/"
+  cp "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json" "$THIS_SCRIPT_PATH/build/src/"
+
+  builder_report success configure
+fi
+
+#-------------------------------------------------------------------------------------------------------------------
+
 if builder_has_action build; then
   npm run build
-  # We need the schema file at runtime and bundled
-  cp "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json" "$THIS_SCRIPT_PATH/build/src/"
   builder_report success build
 fi
 
diff --git a/developer/src/kmc/test/helpers/index.ts b/developer/src/kmc/test/helpers/index.ts
index 8d698af76a..872d89a556 100644
--- a/developer/src/kmc/test/helpers/index.ts
+++ b/developer/src/kmc/test/helpers/index.ts
@@ -30,9 +30,7 @@ export class CompilerCallbacks {
     this.messages.push(event);
   }
   loadLdmlKeyboardSchema(): Buffer {
-    // Relative paths phooey!
-    return fs.readFileSync(path.join(__dirname, '..', '..', '..', '..', '..', '..',
-      'resources', 'standards-data', 'ldml-keyboards', 'techpreview', 'ldml-keyboard.schema.json'));
+    return fs.readFileSync(path.join(__dirname, '..', '..', 'src', 'ldml-keyboard.schema.json'));
   }
 }
 

From ac27082e6d5094417a213f94bdfd452e8999f2a8 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 9 Sep 2022 12:14:01 +1000
Subject: [PATCH 2/2] chore(developer): configure before build for kmc

---
 core/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.sh b/core/build.sh
index 374dd37646..a37e77c5d7 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -294,7 +294,7 @@ if $CONFIGURE; then
     echo "Note: Found node, checking and building kmc dependency if needed"
     if [[ ! -f "$KEYMAN_ROOT/developer/src/kmc/build/kmc.js" ]]; then
       "$KEYMAN_ROOT/common/web/keyman-version/build.sh" configure build
-      "$KEYMAN_ROOT/developer/src/kmc/build.sh" build
+      "$KEYMAN_ROOT/developer/src/kmc/build.sh" configure build
       "$KEYMAN_ROOT/common/tools/hextobin/build.sh" build
     fi
   else