diff --git a/developer/src/tike/xml/layoutbuilder/keymanweb-osk.ttf b/common/resources/fonts/keymanweb-osk.ttf similarity index 100% rename from developer/src/tike/xml/layoutbuilder/keymanweb-osk.ttf rename to common/resources/fonts/keymanweb-osk.ttf diff --git a/developer/build.sh b/developer/build.sh index 47cc05f533b..f0b1373dff6 100755 --- 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 index c442ddd9329..c8b0cff87e0 100644 --- 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 new file mode 100644 index 00000000000..ede6194347b --- /dev/null +++ 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 index 542b1f21bc7..9aa0b128a8e 100755 --- 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 \ No newline at end of file diff --git a/web/src/resources/.gitignore b/web/src/resources/.gitignore new file mode 100644 index 00000000000..ede6194347b --- /dev/null +++ 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 deleted file mode 100644 index e0651b14d4f..00000000000 Binary files a/web/src/resources/osk/keymanweb-osk.ttf and /dev/null differ