Merge pull request #9993 from keymanapp/chore/common/keymanweb-osk-ttf

chore(web,developer): Move keymanweb-osk.ttf to common/resources
keymanapp · Nov 15, 2023 · 284ec09 · 284ec09
2 parents 0f5b88d + 9af4ce3
commit 284ec09
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 2 deletions.
diff --git a/.../tike/xml/layoutbuilder/keymanweb-osk.ttf → common/resources/fonts/keymanweb-osk.ttf b/.../tike/xml/layoutbuilder/keymanweb-osk.ttf → common/resources/fonts/keymanweb-osk.ttf
diff --git a/developer/build.sh b/developer/build.sh
@@ -40,4 +40,9 @@ builder_describe \
 
 builder_parse "$@"
 
+builder_describe_outputs \
+  configure  /developer/src/tike/xml/layoutbuilder/keymanweb-osk.ttf
+
+builder_run_action configure cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/developer/src/tike/xml/layoutbuilder/"
+
 builder_run_child_actions clean configure build test
diff --git a/developer/src/tike/Makefile b/developer/src/tike/Makefile
@@ -6,6 +6,7 @@
 
 build: version.res manifest.res icons dirs xml xsd pull-core
     cd $(DEVELOPER_ROOT)\src\tike
+		$(COPY) $(KEYMAN_ROOT)\common\resources\fonts\keymanweb-osk.ttf $(DEVELOPER_ROOT)\src\tike\xml\layoutbuilder\keymanweb-osk.ttf
     $(DELPHI_MSBUILD) tike.dproj "/p:Platform=Win32"
     $(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\tike.exe -dpr tike.dpr
     $(TDS2DBG) $(WIN32_TARGET_PATH)\tike.exe

diff --git a/developer/src/tike/xml/layoutbuilder/.gitignore b/developer/src/tike/xml/layoutbuilder/.gitignore
@@ -0,0 +1,2 @@
+# Copied from configure
+keymanweb-osk.ttf
diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh
@@ -29,14 +29,19 @@ builder_describe "Builds the Keyman Engine for Web's On-Screen Keyboard package
 # "upload-symbols   Uploads build product to Sentry for error report symbolification.  Only defined for $DOC_BUILD_EMBED_WEB" \
 
 builder_describe_outputs \
-  configure   /node_modules \
+  configure   /web/src/resources/osk/keymanweb-osk.ttf \
   build       /web/build/$SUBPROJECT_NAME/lib/index.mjs
 
 builder_parse "$@"
 
 #### Build action definitions ####
 
-builder_run_action configure verify_npm_setup
+if builder_start_action configure; then
+  verify_npm_setup
+  cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/web/src/resources/osk/"
+  builder_finish_action success configure
+fi
+
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build compile $SUBPROJECT_NAME
 builder_run_action test test-headless osk
diff --git a/web/src/resources/.gitignore b/web/src/resources/.gitignore
@@ -0,0 +1,2 @@
+# Copied from configure
+keymanweb-osk.ttf
diff --git a/web/src/resources/osk/keymanweb-osk.ttf b/web/src/resources/osk/keymanweb-osk.ttf