Skip to content

Commit

Permalink
Merge pull request #9743 from keymanapp/chore/web/build-streamlining
Browse files Browse the repository at this point in the history
chore(web): web build streamlining
  • Loading branch information
jahorton authored Oct 12, 2023
2 parents c06b031 + ca26500 commit d283165
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 38 deletions.
5 changes: 3 additions & 2 deletions web/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ builder_run_child_actions build:app/ui
# Needs both app/browser and app/ui.
builder_run_child_actions build:samples

builder_run_child_actions build:test-pages

builder_run_child_actions build:tools

# Some test pages refer to KMW tools.
builder_run_child_actions build:test-pages

builder_run_child_actions test

if builder_start_action test; then
Expand Down
42 changes: 6 additions & 36 deletions web/src/tools/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,12 @@ builder_describe "Builds the Keyman Engine for Web's development & unit-testing

builder_parse "$@"

### CLEAN ACTIONS
builder_run_child_actions clean

if builder_start_action clean:bulk_rendering; then
testing/bulk_rendering/build.sh clean

builder_finish_action success clean:bulk_rendering
fi

if builder_start_action clean:recorder; then
testing/recorder/build.sh clean

builder_finish_action success clean:recorder
# Some of the web/src/test section uses this script as a dependency. We can skip
# the configure sections in such a case.
if ! builder_is_dep_build && ! builder_is_child_build; then
builder_run_child_actions configure
fi

if builder_start_action clean:sourcemap-root; then
building/sourcemap-root/build.sh clean

builder_finish_action success clean:sourcemap-root
fi

### BUILD ACTIONS

if builder_start_action build:bulk_rendering; then
testing/bulk_rendering/build.sh

builder_finish_action success build:bulk_rendering
fi

if builder_start_action build:recorder; then
testing/recorder/build.sh

builder_finish_action success build:recorder
fi

if builder_start_action build:sourcemap-root; then
building/sourcemap-root/build.sh

builder_finish_action success build:sourcemap-root
fi
builder_run_child_actions build

0 comments on commit d283165

Please sign in to comment.