chore(linux): Rename KMN_CORE to KM_CORE_LIBRARY

keymanapp · Oct 19, 2023 · 2f073f7 · 2f073f7
1 parent b5c6f31
commit 2f073f7
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/common/include/kmx_file.h b/common/include/kmx_file.h
@@ -25,7 +25,7 @@ typedef KMX_WORD  __attribute__((aligned(1))) KMX_WORD_unaligned;
 #define KMX_WORD_unaligned  KMX_WORD
 #endif
 
-#ifdef KMN_CORE
+#ifdef KM_CORE_LIBRARY
 // TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
 namespace km {
 namespace kbp {
@@ -402,7 +402,7 @@ static_assert(sizeof(COMP_KEY) == KEYBOARDFILEKEY_SIZE, "COMP_KEY must be KEYBOA
 static_assert(sizeof(COMP_GROUP) == KEYBOARDFILEGROUP_SIZE, "COMP_GROUP must be KEYBOARDFILEGROUP_SIZE bytes");
 static_assert(sizeof(COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOARD must be KEYBOARDFILEHEADER_SIZE bytes");
 
-#ifdef KMN_CORE
+#ifdef KM_CORE_LIBRARY
 } // namespace kmx
 } // namespace kbp
 } // namespace km

diff --git a/core/include/keyman/keyman_core_api_bits.h b/core/include/keyman/keyman_core_api_bits.h
@@ -48,19 +48,19 @@
   #define _KM_CORE_EXT_SEPARATOR ('.')
 #endif
 
-#if defined KMN_CORE_STATIC
+#if defined KM_CORE_LIBRARY_STATIC
   #define KMN_API             _kmn_tag_fn(_kmn_static_flag)
   #define KMN_DEPRECATED_API  _kmn_tag_fn(_kmn_deprecated_flag _kmn_and _kmn_static_flag)
-#elif defined KMN_CORE_EXPORTING
+#elif defined KM_CORE_LIBRARY_EXPORTING
   #define KMN_API             _kmn_tag_fn(_kmn_export_flag)
   #define KMN_DEPRECATED_API  _kmn_tag_fn(_kmn_deprecated_flag _kmn_and _kmn_export_flag)
 #else
   #define KMN_API             _kmn_tag_fn(_kmn_import_flag)
   #define KMN_DEPRECATED_API  _kmn_tag_fn(_kmn_deprecated_flag _kmn_and _kmn_import_flag)
 #endif
 
-#ifndef KMN_CORE
-#define KMN_CORE
+#ifndef KM_CORE_LIBRARY
+#define KM_CORE_LIBRARY
 #endif
 #ifndef USE_CHAR16_T
 #define USE_CHAR16_T

diff --git a/core/meson.build b/core/meson.build
@@ -25,8 +25,8 @@ py = import('python')
 python = py.find_installation()
 
 # TODO: Shared includes may use namespaces, etc which need future tidyup.
-# For now, we use KMN_CORE to inject the km::kbp::kmx namespace
-defns += ['-DKMN_CORE']
+# For now, we use KM_CORE_LIBRARY to inject the km::kbp::kmx namespace
+defns += ['-DKM_CORE_LIBRARY']
 
 # #define DEBUG when we are on a debug build
 if get_option('buildtype') == 'debug'
@@ -36,4 +36,4 @@ endif
 subdir('doc')
 subdir('include')
 subdir('src')
-subdir('tests')
+subdir('tests')
diff --git a/core/src/kmx/kmx_file_validator.hpp b/core/src/kmx/kmx_file_validator.hpp
@@ -6,7 +6,7 @@
 
 #include <kmx_file.h>
 
-#ifdef KMN_CORE
+#ifdef KM_CORE_LIBRARY
 // TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
 namespace km {
 namespace kbp {
@@ -27,7 +27,7 @@ class KMX_FileValidator : public COMP_KEYBOARD {
 };
 
 
-#ifdef KMN_CORE
+#ifdef KM_CORE_LIBRARY
 } // namespace kmx
 } // namespace kbp
 } // namespace km

diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
@@ -1,8 +1,8 @@
 
 #pragma once
 
-#ifndef KMN_CORE
-#define KMN_CORE
+#ifndef KM_CORE_LIBRARY
+#define KM_CORE_LIBRARY
 #endif
 #ifndef USE_CHAR16_T
 #define USE_CHAR16_T

diff --git a/core/src/meson.build b/core/src/meson.build
@@ -7,7 +7,7 @@
 version_res = []
 
 # TODO: shouldn't this be defined only for dylib and not static lib?
-defns += ['-DKMN_CORE_EXPORTING']
+defns += ['-DKM_CORE_LIBRARY_EXPORTING']
 
 if cpp_compiler.get_id() == 'msvc'
   defns += ['-DUNICODE']
@@ -18,7 +18,7 @@ endif
 
 if cpp_compiler.get_id() == 'emscripten'
   # TODO: why do we need this defn here?
-  defns += ['-DKMN_CORE']
+  defns += ['-DKM_CORE_LIBRARY']
 endif
 
 # ICU4C is used for repertoire tests and core implementation

diff --git a/core/tests/unit/kmnkbd/meson.build b/core/tests/unit/kmnkbd/meson.build
@@ -14,7 +14,7 @@ else
   warns = []
 endif
 
-local_defns = ['-DKMN_CORE_STATIC']
+local_defns = ['-DKM_CORE_LIBRARY_STATIC']
 tests = [
   ['context-api', 'context_api.cpp'],
   ['keyboard-api', 'keyboard_api.cpp'],

diff --git a/core/tests/unit/kmnkbd/test_kmx_xstring.cpp b/core/tests/unit/kmnkbd/test_kmx_xstring.cpp
@@ -4,8 +4,8 @@
  * Keyman Core - KMX Extended String unit tests
  */
 
-#ifndef KMN_CORE
-#define KMN_CORE
+#ifndef KM_CORE_LIBRARY
+#define KM_CORE_LIBRARY
 #endif
 #ifndef USE_CHAR16_T
 #define USE_CHAR16_T

diff --git a/windows/src/engine/keyman32/keymanengine.h b/windows/src/engine/keyman32/keymanengine.h
@@ -19,8 +19,8 @@
 #endif
 
 // For keyman_core_api_bits.h
-#ifndef KMN_CORE_STATIC
-#define KMN_CORE_STATIC
+#ifndef KM_CORE_LIBRARY_STATIC
+#define KM_CORE_LIBRARY_STATIC
 #endif
 // For keyman_core_api_bits.h
 #ifndef _WIN32