erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-05 23:27:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7250 from keymanapp/chore/developer/7221-use-local-ref-to-json-schema

Browse source 
chore(developer): kmc - use local reference for json schema 🙀
This commit is contained in:
Marc Durdin 2022-09-11 11:35:19 +10:00 • committed by GitHub
commit 3f58f2d2e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/build.sh
View file

@ -294,7 +294,7 @@ if $CONFIGURE; then
echo "Note: Found node, checking and building kmc dependency if needed"
if [[ ! -f "$KEYMAN_ROOT/developer/src/kmc/build/kmc.js" ]]; then
"$KEYMAN_ROOT/common/web/keyman-version/build.sh" configure build
"$KEYMAN_ROOT/developer/src/kmc/build.sh" build
"$KEYMAN_ROOT/developer/src/kmc/build.sh" configure build
"$KEYMAN_ROOT/common/tools/hextobin/build.sh" build
fi
else

21
developer/src/kmc/build.sh
View file

@ -31,13 +31,6 @@ builder_parse "$@"
#-------------------------------------------------------------------------------------------------------------------
if builder_has_action configure; then
verify_npm_setup
builder_report success configure
fi
#-------------------------------------------------------------------------------------------------------------------
if builder_has_action clean; then
rm -rf ./build/ ./tsconfig.tsbuildinfo
builder_report success clean
@ -45,10 +38,20 @@ fi
#-------------------------------------------------------------------------------------------------------------------
if builder_has_action configure; then
verify_npm_setup
# We need the schema file at runtime and bundled
mkdir -p "$THIS_SCRIPT_PATH/build/src/"
cp "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json" "$THIS_SCRIPT_PATH/build/src/"
builder_report success configure
fi
#-------------------------------------------------------------------------------------------------------------------
if builder_has_action build; then
npm run build
# We need the schema file at runtime and bundled
cp "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json" "$THIS_SCRIPT_PATH/build/src/"
builder_report success build
fi

4
developer/src/kmc/test/helpers/index.ts
View file

@ -30,9 +30,7 @@ export class CompilerCallbacks {
this.messages.push(event);
}
loadLdmlKeyboardSchema(): Buffer {
// Relative paths phooey!
return fs.readFileSync(path.join(__dirname, '..', '..', '..', '..', '..', '..',
'resources', 'standards-data', 'ldml-keyboards', 'techpreview', 'ldml-keyboard.schema.json'));
return fs.readFileSync(path.join(__dirname, '..', '..', 'src', 'ldml-keyboard.schema.json'));
}
}