chore(linux): More libkmnkbp related renames

keymanapp · Oct 18, 2023 · 653b5e7 · 653b5e7
1 parent 8a81e02
commit 653b5e7
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
@@ -219,7 +219,7 @@ jobs:
         echo "::endgroup::"
 
   api_verification:
-    name: Verify API for libkmnkbp0.so
+    name: Verify API for libkeymancore1.so
     needs: [sourcepackage, binary_packages]
     runs-on: ubuntu-latest
 

diff --git a/developer/src/inst/kmdev.wxs b/developer/src/inst/kmdev.wxs
@@ -164,7 +164,7 @@
       </Component>
 
       <Component>
-        <File Name="kmnkbp0-0.dll" KeyPath="yes" />
+        <File Name="keymancore1-0.dll" KeyPath="yes" />
       </Component>
 
       <Component>

diff --git a/developer/src/tike/Makefile b/developer/src/tike/Makefile
@@ -13,7 +13,7 @@ build: version.res manifest.res icons dirs xml xsd pull-core
     $(COPY) kmlmc.cmd $(DEVELOPER_PROGRAM)
     $(COPY) kmlmp.cmd $(DEVELOPER_PROGRAM)
     $(COPY) kmc.cmd $(DEVELOPER_PROGRAM)
-    $(COPY) $(KEYMAN_ROOT)\core\build\x86\$(TARGET_PATH)\src\kmnkbp0-0.dll $(DEVELOPER_PROGRAM)
+    $(COPY) $(KEYMAN_ROOT)\core\build\x86\$(TARGET_PATH)\src\keymancore1-0.dll $(DEVELOPER_PROGRAM)
     if exist $(WIN32_TARGET_PATH)\tike.dbg $(COPY) $(WIN32_TARGET_PATH)\tike.dbg $(DEVELOPER_DEBUGPATH)
 
 xsd:
@@ -66,7 +66,7 @@ clean: def-clean
 
 signcode:
     $(SIGNCODE) /d "Keyman Developer" $(DEVELOPER_PROGRAM)\tike.exe
-    $(SIGNCODE) /d "Keyman Core" $(DEVELOPER_PROGRAM)\kmnkbp0-0.dll
+    $(SIGNCODE) /d "Keyman Core" $(DEVELOPER_PROGRAM)\keymancore1-0.dll
 # Sign the Sentry executables and libraries here
     $(SIGNCODE) /d "Keyman Developer" $(DEVELOPER_PROGRAM)\sentry.dll
     $(SIGNCODE) /d "Keyman Developer" $(DEVELOPER_PROGRAM)\sentry.x64.dll
@@ -78,7 +78,7 @@ wrap-symbols:
 
 install:
     $(COPY) $(DEVELOPER_PROGRAM)\tike.exe "$(INSTALLPATH_KEYMANDEVELOPER)\tike.exe"
-    $(COPY) $(DEVELOPER_PROGRAM)\kmnkbp0-0.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmnkbp0-0.dll"
+    $(COPY) $(DEVELOPER_PROGRAM)\keymancore1-0.dll "$(INSTALLPATH_KEYMANDEVELOPER)\keymancore1-0.dll"
 
 test-manifest:
 # test that linked manifest exists and correct

diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
@@ -85,7 +85,7 @@ class procedure TDebugCore.InitKeymanCore;
 begin
   if not KeymanCoreLoaded then
   begin
-    path := TKeymanPaths.KeymanCoreLibraryPath(kmnkbp0);
+    path := TKeymanPaths.KeymanCoreLibraryPath(keymancore1);
     try
       _km_core_set_library_path(path);
     except

diff --git a/developer/src/tike/main/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas
@@ -79,58 +79,58 @@   km_core_context_item = record
   );
 
 const
-  kmnkbp0 = 'kmnkbp0-0.dll';
+  keymancore1 = 'keymancore1-0.dll';
 
 function km_core_context_items_from_utf16(
   const text: pkm_core_cp;
   var out_ptr: pkm_core_context_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_context_items_from_utf8(
   const text: PAnsiChar;
   var out_ptr: pkm_core_context_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_context_items_to_utf16(
   const item: pkm_core_context_item;
   buf: pkm_core_cp;
   var buf_size: integer
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_context_items_to_utf8(
   const item: pkm_core_context_item;
   buf: pansichar;
   var buf_size: integer
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 procedure km_core_context_items_dispose(
   const context_items: km_core_context_item
-); cdecl; external kmnkbp0 delayed;
+); cdecl; external keymancore1 delayed;
 
 function km_core_context_set(
   context: pkm_core_context;
   context_items: pkm_core_context_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_context_get(
   context: pkm_core_context;
   var context_items: pkm_core_context_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 procedure km_core_context_clear(
   context: pkm_core_context
-); cdecl; external kmnkbp0 delayed;
+); cdecl; external keymancore1 delayed;
 
 function km_core_context_append(
   context: pkm_core_context;
   context_items: pkm_core_context_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_context_shrink(
   context: pkm_core_context;
   num: Integer;
   prefix: pkm_core_context_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 
 
@@ -208,25 +208,25 @@   km_core_action_item = record
 
 function km_core_options_list_size(
   opts: pkm_core_option_item
-): Integer; cdecl; external kmnkbp0 delayed;
+): Integer; cdecl; external keymancore1 delayed;
 
 function km_core_state_option_lookup(
   state: pkm_core_state;
   scope: km_core_option_scope;
   key: pkm_core_cp;
   var value: pkm_core_cp
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_state_options_update(
   state: pkm_core_state;
   new_opts: pkm_core_option_item
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_state_options_to_json(
   state: pkm_core_state;
   buf: PAnsiChar;
   var space: Integer
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 type
   km_core_keyboard_attrs = record
@@ -241,46 +241,46 @@   km_core_keyboard_attrs = record
 function km_core_keyboard_load(
   kb_path: km_core_path_name;
   var keyboard: pkm_core_keyboard
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 procedure km_core_keyboard_dispose(
   keyboard: pkm_core_keyboard
-); cdecl; external kmnkbp0 delayed;
+); cdecl; external keymancore1 delayed;
 
 function km_core_keyboard_get_attrs(
   keyboard: pkm_core_keyboard;
   var out: pkm_core_keyboard_attrs
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_state_create(
   keyboard: pkm_core_keyboard;
   env: pkm_core_option_item;
   var out: pkm_core_state
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 function km_core_state_clone(
   state: pkm_core_state;
   var out: pkm_core_state
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 procedure km_core_state_dispose(
   state: pkm_core_state
-); cdecl; external kmnkbp0 delayed;
+); cdecl; external keymancore1 delayed;
 
 function km_core_state_context(
   state: pkm_core_state
-): pkm_core_context; cdecl; external kmnkbp0 delayed;
+): pkm_core_context; cdecl; external keymancore1 delayed;
 
 function km_core_state_action_items(
   state: pkm_core_state;
   num_items: pinteger
-): pkm_core_action_item; cdecl; external kmnkbp0 delayed;
+): pkm_core_action_item; cdecl; external keymancore1 delayed;
 
 function km_core_state_to_json(
   state: pkm_core_state;
   buf: PAnsiChar;
   space: pinteger
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 type
   km_core_attr = record
@@ -305,7 +305,7 @@   km_core_attr = record
 
 function km_core_get_engine_attrs(
   state: pkm_core_state
-): pkm_core_attr; cdecl; external kmnkbp0 delayed;
+): pkm_core_attr; cdecl; external keymancore1 delayed;
 
 function
 km_core_process_event(
@@ -314,7 +314,7 @@ function
   modifier_state: uint16_t;
   is_key_down: uint8_t;
   event_flags: uint16_t
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 const
   KM_CORE_EVENT_FLAG_DEFAULT = 0; // default value: hardware

diff --git a/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas b/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas
@@ -147,7 +147,7 @@ km_core_state_debug_item = record
 function km_core_state_debug_set(
   state: pkm_core_state;
   value: integer
-): km_core_status; cdecl; external kmnkbp0 delayed;
+): km_core_status; cdecl; external keymancore1 delayed;
 
 ///
 /// Get current debug tracing status
@@ -158,7 +158,7 @@ function km_core_state_debug_set(
 ///
 function km_core_state_debug_get(
   state: pkm_core_state
-): uint8_t; cdecl; external kmnkbp0 delayed;
+): uint8_t; cdecl; external keymancore1 delayed;
 
 ///
 /// Read current debug trace log
@@ -173,7 +173,7 @@ function km_core_state_debug_get(
 function km_core_state_debug_items(
   state: pkm_core_state;
   num_items: PCardinal
-): pkm_core_state_debug_item; cdecl; external kmnkbp0 delayed;
+): pkm_core_state_debug_item; cdecl; external keymancore1 delayed;
 
 implementation
 

diff --git a/docs/settings/linux/tasks.json b/docs/settings/linux/tasks.json
@@ -108,7 +108,7 @@
           "CPPFLAGS": "-DG_MESSAGES_DEBUG -I${workspaceFolder}/core/build/arch/debug/include/ -I${workspaceFolder}/core/include/ -I/home/eberhard/Develop/keyman/ibus/ibus/src -I${workspaceFolder}/common/include",
           "CFLAGS": "-g -O0",
           "CXXFLAGS": "-g -O0",
-          "KEYMAN_PROC_LIBS": "-L${workspaceFolder}/core/build/arch/debug/src -lkmnkbp0",
+          "KEYMAN_PROC_LIBS": "-L${workspaceFolder}/core/build/arch/debug/src -lkeymancore1",
           "KEYMAN_PROC_CFLAGS": "-I${workspaceFolder}/core/build/arch/debug/include -I${workspaceFolder}/core/include -I${workspaceFolder}/common/include",
           "PKG_CONFIG_PATH": "${workspaceFolder}/core/build/arch/debug/meson-private"
         },

diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
@@ -63,7 +63,7 @@ if builder_start_action verify; then
     tmpDir=$(mktemp -d)
     dpkg -x "${BIN_PKG}" "$tmpDir"
     cd debian
-    dpkg-gensymbols -v"${PKG_VERSION}" -plibkmnkbp0-0 -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/libkmnkbp0.so* -Olibkmnkbp0-0.symbols -c4
+    dpkg-gensymbols -v"${PKG_VERSION}" -plibkmnkbp0-0 -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/libkeymancore1.so* -Olibkmnkbp0-0.symbols -c4
     echo ":heavy_check_mark: libkmnkbp0-0 API didn't change" >&2
   fi
   builder_finish_action success verify