Skip to content

Commit

Permalink
chore(linux): rename keyboardprocessor_ldml.* to keyman_core_ldml
Browse files Browse the repository at this point in the history
  • Loading branch information
ermshiperete committed Oct 18, 2023
1 parent ba5485c commit 5083461
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion core/include/ldml/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ builder_describe "Build Keyman ldml-keyboard-constants package" \

builder_describe_outputs \
configure /node_modules \
build /core/include/ldml/build/keyboardprocessor_ldml.js
build /core/include/ldml/build/keyman_core_ldml.js

builder_parse "$@"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// Generated File - do not edit
//
// This file is generated by core/tools/ldml-const-builder/build.sh
// based on core/include/ldml/keyboardprocessor_ldml.ts
// based on core/include/ldml/keyman_core_ldml.ts
//

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
// core/tools/ldml-const-builder/build.sh clean build run
//
// To update keyboardprocessor_ldml.h, and commit the result.
// To update keyman_core_ldml.h, and commit the result.
//
// It is not updated automatically.

Expand Down
6 changes: 3 additions & 3 deletions core/include/ldml/ldml-const-builder.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
Copyright: Copyright (C) 2022 SIL International.
Authors: srl295
This tool generates a .h version of the keyboardprocessor_ldml.ts file
This tool generates a .h version of the keyman_core_ldml.ts file
*/

import { constants } from './keyboardprocessor_ldml.js';
import { constants } from './keyman_core_ldml.js';

const keys = Object.keys(constants);
keys.sort();
Expand All @@ -20,7 +20,7 @@ console.log(`
// Generated File - do not edit
//
// This file is generated by core/tools/ldml-const-builder/build.sh
// based on core/include/ldml/keyboardprocessor_ldml.ts
// based on core/include/ldml/keyman_core_ldml.ts
//
#pragma once
Expand Down
4 changes: 2 additions & 2 deletions core/include/ldml/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"unicode"
],
"files": [
"/build/keyboardprocessor_ldml.*"
"/build/keyman_core_ldml.*"
],
"license": "MIT",
"type": "module",
"main": "build/keyboardprocessor_ldml.js",
"main": "build/keyman_core_ldml.js",
"repository": {
"type": "git",
"url": "git+https://github.com/keymanapp/keyman.git"
Expand Down
2 changes: 1 addition & 1 deletion core/include/ldml/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"node_modules"
],
"files": [
"keyboardprocessor_ldml.ts",
"keyman_core_ldml.ts",
"ldml-const-builder.ts"
]
}
2 changes: 1 addition & 1 deletion core/include/ldml/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"node_modules"
],
"files": [
"keyboardprocessor_ldml.ts"
"keyman_core_ldml.ts"
]
}
2 changes: 1 addition & 1 deletion core/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Authors: Tim Eves (TSE)
#

project('keyboardprocessor', 'cpp', 'c',
project('keyman_core', 'cpp', 'c',
version: run_command(find_program('getversion.bat', 'getversion.sh'), check:true).stdout().strip(),
license: 'MIT',
default_options : ['buildtype=release',
Expand Down
2 changes: 1 addition & 1 deletion core/src/kmx/kmx_plus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <kmx/kmx_xstring.h>

#include "kmx_processevent.h" // for debug functions
#include "ldml/keyboardprocessor_ldml.h"
#include "ldml/keyman_core_ldml.h"

#include <assert.h>
#include "kmx_plus.h"
Expand Down
2 changes: 1 addition & 1 deletion core/src/kmx/kmx_plus.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <km_types.h>
#include <kmx/kmx_base.h>
#include <kmx_file.h>
#include <ldml/keyboardprocessor_ldml.h>
#include <ldml/keyman_core_ldml.h>
#include <list>
#include <deque>

Expand Down
4 changes: 2 additions & 2 deletions core/src/ldml/C7532_ldml_updating.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ working on ‘layr’, using ‘disp’ as a model from https://github.com/keyma

## Constants and Scaffolding

- *Edit/Commit*: `core/include/ldml/keyboardprocessor_ldml.ts`
- *Edit/Commit*: `core/include/ldml/keyman_core_ldml.ts`
- update `SectionIdent` and keep in order: `'layr' |`
- update `Constants.section` (near the end of the file) and keep in order: `'layr': 'layr',`
- add a comment block in order `layr section`
Expand All @@ -18,7 +18,7 @@ working on ‘layr’, using ‘disp’ as a model from https://github.com/keyma
- add parameters for each flag/bitfield
- Check indentation, check for copypasta errs!
- Run: `./core/tools/ldml-const-builder/build.sh clean build run`
- Verify/Commit: `core/include/ldml/keyboardprocessor_ldml.h`
- Verify/Commit: `core/include/ldml/keyman_core_ldml.h`

## XML changes

Expand Down
2 changes: 1 addition & 1 deletion core/src/ldml/ldml_processor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "kmx_file.h"
#include "kmx/kmx_plus.h"
#include "kmx/kmx_xstring.h"
#include "ldml/keyboardprocessor_ldml.h"
#include "ldml/keyman_core_ldml.h"
#include "kmx/kmx_file_validator.hpp"
#include "debuglog.h"
#include <assert.h>
Expand Down
2 changes: 1 addition & 1 deletion core/tests/unit/ldml/ldml_test_source.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <kmx/kmx_processevent.h> // for char to vk mapping tables
#include <kmx/kmx_xstring.h> // for surrogate pair macros
#include <kmx/kmx_plus.h>
#include "ldml/keyboardprocessor_ldml.h"
#include "ldml/keyman_core_ldml.h"
#include "ldml/ldml_processor.hpp"

#include "path.hpp"
Expand Down
4 changes: 2 additions & 2 deletions core/tools/ldml-const-builder/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Builds /core/include/ldml/keyboardprocessor_ldml.h from /core/include/ldml/keyboardprocessor_ldml.ts
# Builds /core/include/ldml/keyman_core_ldml.h from /core/include/ldml/keyman_core_ldml.ts
#

# Exit on command failure and when using unset variables:
Expand All @@ -17,7 +17,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
# This script runs from its own folder
cd "$(dirname "$THIS_SCRIPT")"

CORE_LDML_H_FILE="../../include/ldml/keyboardprocessor_ldml.h"
CORE_LDML_H_FILE="../../include/ldml/keyman_core_ldml.h"

################################ Main script ################################

Expand Down

0 comments on commit 5083461

Please sign in to comment.