Commit graph

323 commits

Author SHA1 Message Date
Marc Durdin
f394245636 maint(common): consolidate builder scripts
Clarifies the confusing builder.inc.sh / build-utils.sh distinction by
giving the scripts more appropriate names. Most build scripts should use
builder-full.inc.sh; some helper scripts can use builder-basic.inc.sh.
Documented in resources/build/README.md.

Renames:
* resources/build/builder.inc.sh to resources/build/builder-full.inc.sh
* resources/build/build-utils.sh to resources/build/builder-basic.inc.sh

Other changes:
* Moves Android-specific functions out of builder-basic.inc.sh and into
  android/build.sh.
* Renames functions in builder-basic.inc.sh

More functions may be moved from builder-basic.inc.sh into utils.inc.sh
or other scripts in the future.

Fixes: #14065
Build-bot: build all
Test-bot: skip
2025-08-02 08:11:24 +10:00
Marc Durdin
65158a0526 maint(common): rename shellHelperFunctions.sh to utils.inc.sh
Adds documentation for various functions, removes unused functions (a
couple of simple, very lightly used functions were unDRYed; these could
go back the other way across all shell scripts if necessary). TODO items
noted for follow-up refactoring.

Fixes: #14275
Relates-to: #14269
Build-bot: build all
Test-bot: skip
2025-08-02 06:58:40 +10:00
Marc Durdin
808b6557d6 maint(common): use cpp_std=c++17 in meson project default_options
We attempted to set the C++ version in standard.meson.build, but this
does not work well as the option name varies by platform, and it also
triggers a warning in meson. This fix moves the setting into each
meson.build project() default_options. As there are only a handful
of these, the maintenance burden is not high.

Fixes: #14432
Relates-to: #14355
Build-bot: build
Test-bot: skip
2025-08-01 10:23:57 +10:00
Marc Durdin
f8917d2454 maint(common): cleanup meson versioning
* Adds `VERSION_WITH_TAG` variable to standard.meson.build
* Consistently uses `file('VERSION.md')` to retrieve version number

Note that VERSION_WITH_TAG is not yet used but should be used for
version tagged files later.
2025-04-30 08:23:05 +07:00
Sabine
c983380123 chore(linux): change loop for filling the vector of dk triplets 2024-12-19 09:32:42 +01:00
Sabine
0529946511 chore(linux): mcompile more edit 2024-12-18 17:40:27 +01:00
Sabine
18976715f4 chore(linux): mcompile edit comment 2024-12-18 17:30:18 +01:00
Sabine
ef71a7485a chore(linux): undo mcompile edit comment 2024-12-18 17:30:18 +01:00
Sabine
8d62a9a391 chore(linux): mcompile edit comment 2024-12-18 17:30:18 +01:00
SabineSIL
e8b9da2c28
Merge branch 'epic/linux-mcompile' into feat/linux/mcompile-PR_11334 2024-12-17 09:53:55 +01:00
Sabine
9577a129b6 chore(linux): add changes from mcompile-mac(PR 11334) to mcompile-linux 2024-12-17 09:04:29 +01:00
Sabine
5e93570558 Merge branch 'chore/mac/mcompile_mac-CommonMesonPatterns' of https://github.com/keymanapp/keyman into chore/mac/mcompile_mac-CommonMesonPatterns 2024-10-10 11:15:36 +02:00
Sabine
33dcf94c09 chore (common): rename do_clean, do_configure, do_build, do_test to do_meson_... 2024-10-10 11:13:59 +02:00
SabineSIL
44a9fa906d
Merge branch 'feat/mac/mcompile_mac' into chore/mac/mcompile_mac-CommonMesonPatterns 2024-10-09 09:15:04 +02:00
Sabine
afc82297ea chore (common): on mcompile-linux->move do_clean, do_configure, do_build and do_test to meson-utils.inc.sh 2024-10-04 09:01:46 +02:00
Sabine
c8b084b884 Merge remote-tracking branch 'origin/epic/linux-mcompile' into feat/linux/mcompile-PR_11334 2024-09-30 09:49:33 +02:00
Sabine
2ad66f6a59 chore(linux): add kbp->dpBitmapOffset, kbp->dwBitmapSize and calculate dky in 2 lines 2024-09-19 10:58:54 +02:00
Sabine
057675d3e1 chore(linux): name changes in comments 2024-09-18 17:05:39 +02:00
Sabine
7736780b33 chore(linux): implement all of Marcs changes from mcompile-mac into mcompile-linux 2024-09-18 16:33:59 +02:00
Marc Durdin
4c9d44851a chore(linux): add utfcodec.cpp to mcompile 2024-08-16 15:09:23 +02:00
Sabine
b10bba7b25 chore(linux): remove unused libxklavier dep 2024-08-16 11:36:47 +02:00
SabineSIL
d0d5aa3068
Merge pull request #12180 from keymanapp/feat/linux/mcompile-replace_U16
refactor(linux): remove local u16 and use km_u16 🐘
2024-08-14 11:46:48 +02:00
Sabine
816175f9bf refactor(linux): remove meson.build 2024-08-14 11:43:41 +02:00
Sabine
dd0ea90d66 feat(linux): remove local u16 and use km_u16 2024-08-14 11:30:08 +02:00
Sabine
ad21aa037b chore(linux): add build.sh for mcompile-lin 2024-08-14 10:53:30 +02:00
Sabine
58c1e507b4 chore(linux): remove mcompile-specific km_types.h 2024-08-13 17:03:41 +02:00
Sabine
9e1d2f9e48 feat(linux): u16: change parameter name; while loop 2024-08-08 11:48:19 +02:00
Sabine
ef4e47c198 feat(Linux): layout mcompile 2024-08-08 08:37:50 +02:00
Sabine
1719df281b feat(Linux): "more minor things" 2024-08-08 08:26:11 +02:00
Sabine
e0f4e50dc7 feat(Linux): "a few minor things" 2024-08-08 08:08:20 +02:00
Sabine
690caec12b feat(Linux): swap detailed comments <-> one-line comments 2024-08-06 09:26:00 +02:00
Sabine
0388967813 feat(Linux): more comments PR 12065 2024-08-02 12:20:00 +02:00
SabineSIL
fe6f828885
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mcompile-comments 2024-08-01 16:30:29 +02:00
Sabine
e64c1ff441 feat(linux): comment changes 2024-08-01 16:21:29 +02:00
SabineSIL
2b21d734fc
Apply suggestions from code review
Co-authored-by: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
2024-08-01 16:10:52 +02:00
SabineSIL
04e237ddf2
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mcompile-comments 2024-08-01 16:01:09 +02:00
Sabine
56c6be2aa2 feat(linux): comments of PR 12065
# Conflicts:
#	linux/mcompile/keymap/keymap.h
#	linux/mcompile/keymap/mcompile.cpp
2024-08-01 15:08:58 +02:00
SabineSIL
7ed711ce3e
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mcompile-comments 2024-07-30 20:35:18 +02:00
Sabine
03df66deb1 feat(linux): use u16.cpp/h from feat/linux/mcompile-comments 2024-07-30 19:35:52 +02:00
Sabine
2aacc783e3 feat(linux): use Shiftstate instead of int in ToUnicodeEx 2024-07-30 18:43:06 +02:00
Sabine
bf79287481 feat(linux): remove Open_File for KMX_WCHAR ;capslock=1 2024-07-30 17:28:40 +02:00
Sabine
ddcd45216e feat(linux): info for KMX_ToUnicodeEx 2024-07-30 16:06:30 +02:00
Sabine
1828b46ab2 feat(linux): start adding comments according to the new regulations
feat(linux): more comments

feat(linux): even more comments

feat(linux): code comments deadkey

feat(linux): code comments deadkey, keymap

feat(linux): code comments mc_import_rules,mc_kmxfile, mcompile

feat(linux): remaining stuff

feat(linux): some more little edits

feat(linux): format documents

feat(linux): a few edits

feat(linux): u16: comments and replace codecvt
2024-07-30 11:32:06 +02:00
Sabine
7e2d46e467 Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mcompile-rework_mc_kmxfile
# Conflicts:
#	linux/mcompile/keymap/mc_import_rules.cpp
2024-07-24 16:43:45 +02:00
SabineSIL
90e53e845b
Merge pull request #11895 from keymanapp/feat/linux/mcompile-rework_u16
feat(linux): comments on module u16 🐘
2024-07-04 18:17:19 +02:00
SabineSIL
4424c23f73
Merge branch 'feat/linux/mcompile-rework_keymap_part2' into feat/linux/mcompile-rework_mcompile 2024-07-04 18:11:15 +02:00
Sabine
e6f212ce77 feat(linux): changes in convert_rgkey_Shiftstate_to_LinuxShiftstate 2024-07-04 17:56:08 +02:00
Sabine
83f079e685 feat(linux): remove count 2024-07-04 17:16:45 +02:00
Sabine
5a70d83b4f feat(linux): new fun convert_rgkey_Shiftstate_to_LinuxShiftstate() 2024-07-04 17:09:31 +02:00
Sabine
17eea39b4b feat(linux): ensureValidInputForKeyboardTranslation more 2024-07-04 15:00:57 +02:00