mirror of
https://github.com/keymanapp/keyman.git
synced 2026-09-22 15:47:41 +00:00
chore(common/models): lmlayer build.sh now builder-based
This commit is contained in:
Joshua A. Horton
parent
a2c9e7e514
commit
dd9d773720
4 changed files with 139 additions and 89 deletions
|
|
@ -20,92 +20,142 @@ THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BA
|
|||
# This script runs from its own folder
|
||||
cd "$(dirname "$THIS_SCRIPT")"
|
||||
|
||||
# Exit status on invalid usage.
|
||||
EX_USAGE=64
|
||||
|
||||
LMLAYER_OUTPUT=build
|
||||
|
||||
# Builds the top-level JavaScript file for use in browsers (the second stage of compilation)
|
||||
build-browser () {
|
||||
npm run tsc -- -b ./browser.tsconfig.json || fail "Could not build top-level browser-targeted JavaScript file."
|
||||
}
|
||||
|
||||
# Builds the top-level JavaScript file for use on Node (the second stage of compilation)
|
||||
build-headless () {
|
||||
npm run tsc -- -b ./tsconfig.json || fail "Could not build top-level node-targeted JavaScript file."
|
||||
}
|
||||
|
||||
# A nice, extensible method for -clean operations. Add to this as necessary.
|
||||
clean ( ) {
|
||||
if [ -d $LMLAYER_OUTPUT ]; then
|
||||
rm -rf "$LMLAYER_OUTPUT" || fail "Failed to erase the prior build."
|
||||
fi
|
||||
}
|
||||
|
||||
display_usage ( ) {
|
||||
echo "Usage: $0 [-clean] [-skip-package-install | -S] [-test | -tdd]"
|
||||
echo " $0 -help"
|
||||
echo
|
||||
echo " -clean to erase pre-existing build products before a re-build"
|
||||
echo " -help displays this screen and exits"
|
||||
echo " -skip-package-install (or -S) skips dependency updates"
|
||||
echo " -tdd skips dependency updates, builds, then runs unit tests only"
|
||||
echo " -test runs unit and integration tests after building"
|
||||
}
|
||||
|
||||
################################ Main script ################################
|
||||
|
||||
run_tests=0
|
||||
fetch_deps=true
|
||||
unit_tests_only=0
|
||||
builder_check_color "$@"
|
||||
|
||||
# Process command-line arguments
|
||||
while [[ $# -gt 0 ]] ; do
|
||||
key="$1"
|
||||
case $key in
|
||||
-clean)
|
||||
clean
|
||||
;;
|
||||
-help|-h)
|
||||
display_usage
|
||||
exit
|
||||
;;
|
||||
-skip-package-install|-S)
|
||||
fetch_deps=false
|
||||
;;
|
||||
-test)
|
||||
run_tests=1
|
||||
;;
|
||||
-tdd)
|
||||
run_tests=1
|
||||
fetch_deps=false
|
||||
unit_tests_only=1
|
||||
;;
|
||||
*)
|
||||
echo "$0: invalid option: $key"
|
||||
display_usage
|
||||
exit $EX_USAGE
|
||||
esac
|
||||
shift # past the processed argument
|
||||
done
|
||||
builder_describe "Runs all tests for the gesture-recognizer module" \
|
||||
"clean" \
|
||||
"configure" \
|
||||
"build" \
|
||||
"test" \
|
||||
":libraries Targets all in-repo libraries that this module is dependent upon" \
|
||||
":headless A headless, Node-oriented version of the module useful for unit tests" \
|
||||
":browser The standard version of the module for in-browser use" \
|
||||
"--ci Sets ${BUILDER_TERM_START}test${BUILDER_TERM_END} action to use CI-based test configurations & reporting"
|
||||
|
||||
# Check if Node.JS/npm is installed.
|
||||
verify_npm_setup $fetch_deps
|
||||
builder_parse "$@"
|
||||
|
||||
if $fetch_deps; then
|
||||
# We need to build keyman-version and lm-worker with a script for now
|
||||
"$KEYMAN_ROOT/common/web/keyman-version/build.sh" || fail "Could not build keyman-version"
|
||||
"$KEYMAN_ROOT/common/web/lm-worker/build.sh" || fail "Could not build lm-worker"
|
||||
# Exit status on invalid usage.
|
||||
EX_USAGE=64
|
||||
LMLAYER_OUTPUT=build
|
||||
|
||||
### CONFIGURE ACTIONS
|
||||
|
||||
do_configure() {
|
||||
# Check if Node.JS/npm is installed.
|
||||
verify_npm_setup
|
||||
}
|
||||
|
||||
CONFIGURED=
|
||||
if builder_start_action configure :libraries; then
|
||||
do_configure
|
||||
CONFIGURED=configure:libraries
|
||||
|
||||
builder_finish_action success configure :libraries
|
||||
fi
|
||||
|
||||
build-browser || fail "Browser-oriented compilation failed."
|
||||
build-headless || fail "Headless compilation failed."
|
||||
echo "Typescript compilation successful."
|
||||
|
||||
if (( run_tests )); then
|
||||
if (( unit_tests_only )); then
|
||||
npm run test -- -headless || fail "Unit tests failed"
|
||||
if builder_start_action configure :browser; then
|
||||
if [ -n "$CONFIGURED" ]; then
|
||||
echo "Configuration already completed in ${BUILDER_TERM_START}${CONFIGURED}${BUILDER_TERM_END}; skipping."
|
||||
else
|
||||
npm test || fail "Tests failed"
|
||||
do_configure
|
||||
CONFIGURED=configure:browser
|
||||
fi
|
||||
builder_finish_action success configure :browser
|
||||
fi
|
||||
|
||||
if builder_start_action configure :headless; then
|
||||
if [ -n "$CONFIGURED" ]; then
|
||||
echo "Configuration already completed in ${BUILDER_TERM_START}${CONFIGURED}${BUILDER_TERM_END}; skipping."
|
||||
else
|
||||
do_configure
|
||||
CONFIGURED=configure:headless
|
||||
fi
|
||||
|
||||
builder_finish_action success configure :headless
|
||||
fi
|
||||
|
||||
### CLEAN ACTIONS
|
||||
|
||||
# A nice, extensible method for -clean operations. Add to this as necessary.
|
||||
do_clean() {
|
||||
if [ -d $LMLAYER_OUTPUT ]; then
|
||||
rm -rf "$LMLAYER_OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
CLEANED=
|
||||
if builder_start_action clean :libraries; then
|
||||
do_clean
|
||||
CLEANED=clean:libraries
|
||||
|
||||
builder_finish_action success clean :libraries
|
||||
fi
|
||||
|
||||
if builder_start_action clean :browser; then
|
||||
if [ -n "$CLEANED" ]; then
|
||||
echo "${BUILDER_TERM_START}clean${BUILDER_TERM_END} already completed as ${BUILDER_TERM_START}${CLEANED}${BUILDER_TERM_END}; skipping."
|
||||
else
|
||||
do_clean
|
||||
CLEANED=clean:browser
|
||||
fi
|
||||
builder_finish_action success clean :browser
|
||||
fi
|
||||
|
||||
if builder_start_action clean :headless; then
|
||||
if [ -n "$CLEANED" ]; then
|
||||
echo "${BUILDER_TERM_START}clean${BUILDER_TERM_END} already completed as ${BUILDER_TERM_START}${CLEANED}${BUILDER_TERM_END}; skipping."
|
||||
else
|
||||
do_clean
|
||||
CLEANED=clean:headless
|
||||
fi
|
||||
|
||||
builder_finish_action success clean :headless
|
||||
fi
|
||||
|
||||
### BUILD ACTIONS
|
||||
|
||||
if builder_start_action build :libraries; then
|
||||
"$KEYMAN_ROOT/common/web/keyman-version/build.sh"
|
||||
"$KEYMAN_ROOT/common/web/lm-worker/build.sh"
|
||||
|
||||
builder_finish_action success build :libraries
|
||||
fi
|
||||
|
||||
# Builds the top-level JavaScript file for use in browsers
|
||||
if builder_start_action build :browser; then
|
||||
npm run tsc -- -b ./browser.tsconfig.json
|
||||
|
||||
builder_finish_action success build :browser
|
||||
fi
|
||||
|
||||
# Builds the top-level JavaScript file for use on Node
|
||||
if builder_start_action build :headless; then
|
||||
npm run tsc -- -b ./tsconfig.json || fail
|
||||
|
||||
builder_finish_action success build :headless
|
||||
fi
|
||||
|
||||
### TEST ACTIONS
|
||||
# Note - the actual test setup is done in a separate test script, but it's easy
|
||||
# enough to route the calls through.
|
||||
|
||||
if builder_start_action test :libraries; then
|
||||
./unit_tests/test.sh test:libraries
|
||||
|
||||
builder_finish_action success test :libraries
|
||||
fi
|
||||
|
||||
if builder_start_action test :headless; then
|
||||
./unit_tests/test.sh test:headless
|
||||
|
||||
builder_finish_action success test :headless
|
||||
fi
|
||||
|
||||
if builder_start_action test :browser; then
|
||||
./unit_tests/test.sh test:browser
|
||||
|
||||
builder_finish_action success test :browser
|
||||
fi
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
var assert = require('chai').assert;
|
||||
var sinon = require('sinon');
|
||||
|
||||
let PromiseStore = require('../../build').PromiseStore;
|
||||
let PromiseStore = require('../../build/headless').PromiseStore;
|
||||
|
||||
describe('PromiseStore', function () {
|
||||
describe('.make()', function () {
|
||||
|
|
@ -19,13 +19,13 @@ describe('PromiseStore', function () {
|
|||
|
||||
it('should reject the promise when a token is reused', function () {
|
||||
var promises = new PromiseStore();
|
||||
|
||||
|
||||
var reusedToken = randomToken();
|
||||
// These two fakes are to ensure the original is called.
|
||||
var originalResolve;
|
||||
var overwrittenResolve;
|
||||
|
||||
|
||||
|
||||
|
||||
// Add a promise, and an unrelated promise.
|
||||
new Promise(function (resolve, reject) {
|
||||
originalResolve = sinon.fake(resolve);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
var assert = require('chai').assert;
|
||||
var sinon = require('sinon');
|
||||
|
||||
let LMLayer = require('../../build');
|
||||
let LMLayer = require('../../build/headless');
|
||||
|
||||
// Test the top-level LMLayer interface.
|
||||
// Note: these tests can only be run after BOTH stages of compilation are completed.
|
||||
|
|
@ -54,7 +54,7 @@ describe('LMLayer', function() {
|
|||
assert.notProperty(data.source, 'code');
|
||||
assert.property(data.source, 'file');
|
||||
assert.isString(data.source.file);
|
||||
|
||||
|
||||
callAsynchronously(() => fakeWorker.onmessage({
|
||||
data: {
|
||||
message: 'ready',
|
||||
|
|
@ -113,7 +113,7 @@ describe('LMLayer', function() {
|
|||
* Returns an object implementing *enough* of the Worker
|
||||
* interface to fool the LMLayer into thinking it's
|
||||
* communicating with a bona fide Web Worker.
|
||||
*
|
||||
*
|
||||
* @returns {Worker} an object with sinon.fake() instances.
|
||||
*/
|
||||
function createFakeWorker(postMessage) {
|
||||
|
|
@ -124,10 +124,10 @@ describe('LMLayer', function() {
|
|||
}
|
||||
|
||||
/**
|
||||
* Call a function in the future, i.e., later in the event loop.
|
||||
* Call a function in the future, i.e., later in the event loop.
|
||||
* The call does NOT block the current execution.
|
||||
* Use this to fake asynchronous callbacks.
|
||||
*
|
||||
* Use this to fake asynchronous callbacks.
|
||||
*
|
||||
* @param {Function} fn function to call
|
||||
*/
|
||||
function callAsynchronously(fn) {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ if builder_start_action configure :libraries; then
|
|||
fi
|
||||
|
||||
if builder_start_action configure :headless; then
|
||||
if [[ -n "$CONFIGURED" ]]; then
|
||||
if [ -n "$CONFIGURED" ]; then
|
||||
echo "Configuration already completed in ${BUILDER_TERM_START}${CONFIGURED}${BUILDER_TERM_END}; skipping."
|
||||
else
|
||||
do_configure
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue