From 6ff0cd202db4741e37bbe3ba9c1b59a7786ce245 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 13 Nov 2023 15:44:46 +0700 Subject: [PATCH 01/11] chore(common): Move keymanweb-osk.ttf to common/ --- .../resources/fonts}/keymanweb-osk.ttf | Bin web/src/resources/osk/keymanweb-osk.ttf | Bin 35164 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename {developer/src/tike/xml/layoutbuilder => common/resources/fonts}/keymanweb-osk.ttf (100%) delete mode 100644 web/src/resources/osk/keymanweb-osk.ttf 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/web/src/resources/osk/keymanweb-osk.ttf b/web/src/resources/osk/keymanweb-osk.ttf deleted file mode 100644 index e0651b14d4f770d2a9b15e8850203c05112a23d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35164 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 Date: Mon, 13 Nov 2023 15:57:36 +0700 Subject: [PATCH 02/11] chore(developer): Add configure step to copy font --- developer/build.sh | 2 ++ developer/src/tike/xml/layoutbuilder/.gitignore | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 developer/src/tike/xml/layoutbuilder/.gitignore diff --git a/developer/build.sh b/developer/build.sh index 47cc05f533b..564a212d0c1 100755 --- a/developer/build.sh +++ b/developer/build.sh @@ -40,4 +40,6 @@ builder_describe \ builder_parse "$@" +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/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 From f372936c340cccbfd02fc47e80d06ec287c4ba1a Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 13 Nov 2023 20:43:03 +0700 Subject: [PATCH 03/11] chore(web): Add configure step to copy font --- web/src/engine/osk/build.sh | 7 ++++++- web/src/resources/.gitignore | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 web/src/resources/.gitignore diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh index 542b1f21bc7..4f1b6ff9a1d 100755 --- a/web/src/engine/osk/build.sh +++ b/web/src/engine/osk/build.sh @@ -36,7 +36,12 @@ 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 From 50e37cea93319af21ee793d5e663a6ee9292daad Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 14 Nov 2023 06:24:32 +0700 Subject: [PATCH 04/11] fix(web): Update configure outputs --- web/src/engine/osk/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh index 4f1b6ff9a1d..a56ff10402b 100755 --- a/web/src/engine/osk/build.sh +++ b/web/src/engine/osk/build.sh @@ -30,6 +30,7 @@ builder_describe "Builds the Keyman Engine for Web's On-Screen Keyboard package builder_describe_outputs \ configure /node_modules \ + /web/src/resources/osk/keymanweb-osk.ttf \ build /web/build/$SUBPROJECT_NAME/lib/index.mjs builder_parse "$@" From 4b3d3597550595f6c418ead12825ca68cbd9855b Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 14 Nov 2023 06:24:49 +0700 Subject: [PATCH 05/11] fix(android): Update keymanweb-osk.ttf --- android/KMEA/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh index ff78403c03e..a27030801b0 100755 --- a/android/KMEA/build.sh +++ b/android/KMEA/build.sh @@ -87,7 +87,7 @@ if builder_start_action build:engine; then cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/ajax-loader.gif" "$ENGINE_ASSETS/ajax-loader.gif" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/kmwosk.css" "$ENGINE_ASSETS/kmwosk.css" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/globe-hint.css" "$ENGINE_ASSETS/globe-hint.css" - cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf" + cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf" cp "$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" "$ENGINE_ASSETS/sentry.min.js" cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js" From f1a17b5c99bf409c92f8e595ba63c2ecc79bf282 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 14 Nov 2023 06:55:38 +0700 Subject: [PATCH 06/11] fix(web): configure output --- web/src/engine/osk/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh index a56ff10402b..e423a2bb107 100755 --- a/web/src/engine/osk/build.sh +++ b/web/src/engine/osk/build.sh @@ -30,7 +30,7 @@ builder_describe "Builds the Keyman Engine for Web's On-Screen Keyboard package builder_describe_outputs \ configure /node_modules \ - /web/src/resources/osk/keymanweb-osk.ttf \ + configure /web/src/resources/osk/keymanweb-osk.ttf \ build /web/build/$SUBPROJECT_NAME/lib/index.mjs builder_parse "$@" From 2f9bb5be7f1d0f2e7cd4b346b8a3af834daa92d8 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 14 Nov 2023 08:32:18 +0700 Subject: [PATCH 07/11] fix(developer): Add configure output for font --- developer/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/developer/build.sh b/developer/build.sh index 564a212d0c1..f0b1373dff6 100755 --- a/developer/build.sh +++ b/developer/build.sh @@ -40,6 +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 From c6a946059c62030c08e842f4092da4d6b4268f67 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 14 Nov 2023 14:18:06 +0700 Subject: [PATCH 08/11] Update web/src/engine/osk/build.sh Co-authored-by: Marc Durdin --- web/src/engine/osk/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh index e423a2bb107..9aa0b128a8e 100755 --- a/web/src/engine/osk/build.sh +++ b/web/src/engine/osk/build.sh @@ -29,7 +29,6 @@ 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 From dfb5cbf77957933167c842f1df88983a8cac08b0 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 15 Nov 2023 06:30:36 +0700 Subject: [PATCH 09/11] chore(android/engine): Revert build.sh --- android/KMEA/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh index a27030801b0..ff78403c03e 100755 --- a/android/KMEA/build.sh +++ b/android/KMEA/build.sh @@ -87,7 +87,7 @@ if builder_start_action build:engine; then cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/ajax-loader.gif" "$ENGINE_ASSETS/ajax-loader.gif" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/kmwosk.css" "$ENGINE_ASSETS/kmwosk.css" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/globe-hint.css" "$ENGINE_ASSETS/globe-hint.css" - cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf" + cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf" cp "$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" "$ENGINE_ASSETS/sentry.min.js" cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js" From 71ea3c3fd1b51e03ce7bac52db5045a619c31022 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 15 Nov 2023 06:41:13 +0700 Subject: [PATCH 10/11] fix(developer): Update Makefile to copy keymanweb-osk.ttf --- developer/src/tike/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/developer/src/tike/Makefile b/developer/src/tike/Makefile index c442ddd9329..d4883172076 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\ $(DELPHI_MSBUILD) tike.dproj "/p:Platform=Win32" $(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\tike.exe -dpr tike.dpr $(TDS2DBG) $(WIN32_TARGET_PATH)\tike.exe From 9af4ce3f5390f8f3cd6491295e892538bbf1f993 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 15 Nov 2023 09:07:04 +0700 Subject: [PATCH 11/11] fix(developer): Attempt 2 to copy font --- developer/src/tike/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developer/src/tike/Makefile b/developer/src/tike/Makefile index d4883172076..c8b0cff87e0 100644 --- a/developer/src/tike/Makefile +++ b/developer/src/tike/Makefile @@ -6,7 +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\ + $(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