Commit graph

72 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
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
Eberhard Beilharz
faa521d82c
maint(common): set C++17 in standard.meson.build
Note that the ICU subprojects still explicitly specify C++17 since they
are maintained outside of Keyman and so shouldn't be tied to the Keyman
compiler version requirement.

Fixes: #12526
Test-bot: skip
2025-07-18 14:04:11 +02: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
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
f079aae6fa feat (mac): new message if SaveKeyboard fails 2024-10-08 18:56:03 +02:00
Sabine
b9bd855a78 feat (mac): new message if DoConvert fails 2024-10-08 18:47:49 +02:00
Sabine
92d5f93ffd feat (mac): use a vector instead of an array in mac_KMX_GetDeadkeys 2024-10-07 10:25:39 +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
de7b654428 feat (mac): set OPtimize Option to -O2; resolve problem in UCKeyTranslate: check noErr only after 2nd use of UCKeyTranslate 2024-10-02 17:38:20 +02:00
Sabine
5ea67fc4a4 chore (mac): marked another possible C++ -O1, -O2, -O3 standard-compliant problem using UCKeyTranslate 2024-09-18 10:59:16 +02:00
Sabine
335bfb7115 chore (mac): replace UniCharCount with const UniCharCount in datatype for maxStringlength 2024-09-17 18:36:27 +02:00
Sabine
e449437146 chore (mac): catch possible overflow of dk array; check for noErr in status = UCKeyTranslate(...) 2024-09-17 14:14:27 +02:00
Sabine
c045b94429 chore (mac): remove argc, use VK_SPACE, use _countof() 2024-09-13 09:50:42 +02:00
Sabine
f385652435 chore (mac): mac_run and minor things (edits, comments,...) 2024-09-12 18:16:11 +02:00
Sabine
6a8c815c7c chore (mac): remove (w)main for windows/Linux; define arrays+variables in *.cpp and declare as extern in *.h 2024-09-12 17:34:59 +02:00
Sabine
23c66922ce chore(mac): change bitmapoffset + bitmapsize to prevent buffer problems 2024-09-09 18:09:15 +02:00
Sabine
07edecd17f chore(mac): disable optimization for mcompile
See https://github.com/keymanapp/keyman/pull/11334#issuecomment-2290784399
for details, but with anything other than -O0, the output is not correct

This is intended to be a temporary workaround
2024-08-15 09:08:40 +02:00
Sabine
8c480ac131 feat(mac): add build.sh 2024-08-14 16:00:27 +02:00
Sabine
e79c534335 feat(mac): mcompile remove u16, kmx_file from mcompile-mac and use from common 2024-08-14 15:33:14 +02:00
Sabine
e889fd8e7b refactor(mac): use km_types from common 2024-08-14 14:09:58 +02:00
Sabine
53ece797ba feat(mac): swapped comments 2024-08-06 10:58:28 +02:00
Sabine
365d62ea30 feat(mac): include comments from PR 12065 2024-08-02 12:18:11 +02:00
Sabine
4688e4d097 feat(mac): remove RALT filter 2024-07-25 13:58:54 +02:00
Sabine
aa5ad7af4a feat(mac): use new u16 2024-07-25 13:56:31 +02:00
Sabine
63181e9ce7 feat(mac): chande in u16tol 2024-07-24 10:47:28 +02:00
Sabine
eae766673e feat(mac): ensureValidInputForKeyboardTranslation 2024-07-19 12:02:44 +02:00
Sabine
06d078336b feat(mac): remove all _S2 2024-07-19 11:21:34 +02:00
Sabine
e545402ab5 feat(mac): resolve conflicts 2024-07-18 19:33:58 +02:00
Sabine
e29c51c1e9 Merge branch 'feat/mac/mcompile-rework-keymap' into feat/mac/mcompile_mac
# Conflicts:
#	mac/mcompile/mc_import_rules.h
#	mac/mcompile/mcompile.h
2024-07-18 19:25:06 +02:00
Sabine
f71c4aa0de feat(mac): little edit 2024-07-18 17:50:18 +02:00
Sabine
3528e7160e Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/keyman into feat/mac/mcompile_mac
# Conflicts:
#	mac/mcompile/keymap.cpp
#	mac/mcompile/keymap.h
#	mac/mcompile/mc_import_rules.cpp
#	mac/mcompile/mc_import_rules.h
#	mac/mcompile/mc_kmxfile.h
#	mac/mcompile/mcompile.cpp
#	mac/mcompile/mcompile.h
#	mac/mcompile/util_filesystem.cpp

Signed-off-by: Sabine <Sabine_SIL@web.de>
2024-07-18 16:01:32 +02:00
Sabine
a9479927c3 feat(mac): still layout stuff 2024-07-16 10:50:02 +02:00
Sabine
927154cebb # This is a combination of 8 commits.
# This is the 1st commit message:

feat(mac): remove unused func

# This is the commit message #2:

feat(mac): edit, remove unused code

# This is the commit message #3:

feat(mac): more edit

# This is the commit message #4:

feat(mac): comments keymap

# This is the commit message #5:

feat(mac): comments importRules

# This is the commit message #6:

feat(mac): comments

# This is the commit message #7:

feat(mac): more comments

# This is the commit message #8:

feat(mac): adapt data types return para
2024-07-16 10:43:48 +02:00
Sabine
96870c4926 feat(mac): comments from all other PR 2024-07-11 13:56:24 +02:00
Sabine
70b232a95b feat(mac): comments from #9384 2024-07-10 15:59:57 +02:00
Sabine
48f98cdce9 feat(mac): format documents 2024-07-10 12:54:38 +02:00
Sabine
1c0a44f2b0 feat(mac): add module, fun-comments 2024-07-10 12:31:26 +02:00
Sabine
4040e95e0c feat(mac): implement comments of PR9384 on keymap 2024-07-05 17:14:42 +02:00
Sabine
f47a037a59 feat(mac): implement comments of PR9384 2024-07-05 15:54:45 +02:00
Sabine
71a5226291 feat(mac): function header comments mcompile.cpp, mc_import_rules.cpp, keymap.cpp 2024-06-10 16:54:48 +02:00
Sabine
b2d9e96488 feat(mac): tidy up code:
fixes #11334
use shiftstates consistently;
map shiftstates to mac shiftstates(mac, rgkey, win);
remove unneccessary functions;
rename functions to have more systematic
consolidate order of parameters in functions;
rename variables (casing), and also to clarify shiftstates;
handle unused positions in USVirtualKeyToScanCode+ScanCodeToUSVirtualKey;
use util_filesystem.cpp/h from Keyman instead of my own filesystem.cpp/h;
remove deadkey.cpp/h;
2024-06-07 11:41:32 +02:00
Sabine
cc8cb5de59 feat(mac): tidy up code:
use shiftstates consistently;
map shiftstates to mac shiftstates(mac, rgkey, win);
remove unneccessary functions;
rename functions to have more systematic
consolidate order of parameters in functions;
rename variables (casing), and also to clarify shiftstates;
handle unused positions in USVirtualKeyToScanCode+ScanCodeToUSVirtualKey;
use util_filesystem.cpp/h from Keyman instead of my own filesystem.cpp/h;
remove deadkey.cpp/h;
2024-06-07 11:17:00 +02:00
Sabine
362097da93 feat(mac): work on K_84 <-> K_221 for ~ 2024-05-21 14:45:14 +02:00
Sabine
69a60c9075 feat(mac): massive tidy up 2024-05-17 17:45:58 +02:00
Sabine
4a5e4579c8 feat(mac): fill alDead OK 2024-05-17 16:47:23 +02:00
Sabine
d69600b994 feat(mac): tidy up 2024-05-15 19:34:17 +02:00
Sabine
86850d5558 feat(mac): adapt order of keys for getDeadkeys to catch the most important key combinatin for a dk combination 2024-05-15 18:49:18 +02:00