Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add predict support #1094

Merged
merged 1 commit into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@
[submodule "librime-charcode"]
path = app/src/main/jni/librime-charcode
url = https://github.com/rime/librime-charcode
[submodule "app/src/main/jni/librime-predict"]
path = app/src/main/jni/librime-predict
url = https://github.com/rime/librime-predict
1 change: 1 addition & 0 deletions app/src/main/jni/cmake/RimePlugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set(RIME_PLUGINS
librime-lua
librime-charcode
librime-octagram
librime-predict
)

# plugins didn't use target_link_libraries, the usage-requirements won't work, include manually
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/jni/librime
Submodule librime updated 84 files
+1 −0 .dockerignore
+1 −1 .github/workflows/commit-ci.yml
+12 −8 .github/workflows/linux-build.yml
+5 −5 .github/workflows/macos-build.yml
+18 −3 .github/workflows/release-ci.yml
+47 −33 .github/workflows/windows-build.yml
+1 −1 .gitmodules
+11 −10 CMakeLists.txt
+1 −2 Dockerfile
+30 −8 Makefile
+6 −4 README.md
+4 −9 action-install-linux.sh
+4 −25 build-clang.bat
+15 −103 build.bat
+0 −26 cmake/FindKyotoCabinet.cmake
+3 −2 data/minimal/default.yaml
+6 −3 deps.mk
+0 −50 deps/CMakeLists.txt
+1 −1 deps/marisa-trie
+1 −1 deps/opencc
+34 −34 include/utf8.h
+77 −85 include/utf8/checked.h
+158 −129 include/utf8/core.h
+103 −0 include/utf8/cpp17.h
+84 −53 include/utf8/unchecked.h
+0 −17 install-boost.sh
+2 −2 plugins/plugins_module.cc
+3 −1 src/CMakeLists.txt
+20 −0 src/rime/algo/fs.h
+0 −1 src/rime/build_config.h.in
+17 −0 src/rime/candidate.cc
+1 −0 src/rime/candidate.h
+0 −11 src/rime/common.h
+5 −2 src/rime/config/build_info_plugin.cc
+2 −2 src/rime/config/config_data.cc
+4 −5 src/rime/config/config_types.cc
+1 −1 src/rime/config/save_output_plugin.cc
+3 −3 src/rime/context.h
+11 −5 src/rime/deployer.cc
+2 −2 src/rime/deployer.h
+3 −3 src/rime/dict/db.cc
+3 −3 src/rime/dict/dict_compiler.cc
+3 −3 src/rime/dict/dictionary.cc
+0 −1 src/rime/dict/entry_collector.cc
+1 −1 src/rime/dict/level_db.cc
+3 −3 src/rime/dict/mapped_file.cc
+4 −4 src/rime/dict/mapped_file.h
+3 −4 src/rime/dict/preset_vocabulary.cc
+1 −2 src/rime/dict/reverse_lookup_dictionary.cc
+3 −2 src/rime/dict/string_table.h
+2 −3 src/rime/dict/table_db.cc
+6 −7 src/rime/dict/user_db.cc
+7 −7 src/rime/dict/user_db_recovery_task.cc
+2 −3 src/rime/dict/user_dictionary.cc
+13 −1 src/rime/engine.cc
+1 −0 src/rime/gear/charset_filter.cc
+15 −8 src/rime/gear/key_binder.cc
+0 −4 src/rime/gear/schema_list_translator.cc
+3 −3 src/rime/gear/simplifier.cc
+2 −2 src/rime/lever/custom_settings.cc
+2 −3 src/rime/lever/customizer.cc
+5 −5 src/rime/lever/customizer.h
+36 −28 src/rime/lever/deployment_tasks.cc
+2 −2 src/rime/lever/switcher_settings.cc
+2 −2 src/rime/lever/switcher_settings.h
+7 −7 src/rime/lever/user_dict_manager.cc
+2 −2 src/rime/lever/user_dict_manager.h
+13 −14 src/rime/resource.cc
+8 −8 src/rime/resource.h
+4 −4 src/rime/segmentation.h
+2 −2 src/rime/service.h
+7 −3 src/rime/setup.cc
+1 −15 src/rime/translation.cc
+1 −1 src/rime/translation.h
+1 −0 src/rime_api.h
+3 −3 test/resource_resolver_test.cc
+17 −0 tools/codepage.h
+44 −31 tools/rime_api_console.cc
+22 −23 tools/rime_console.cc
+53 −30 tools/rime_deployer.cc
+23 −8 tools/rime_dict_manager.cc
+9 −7 tools/rime_patch.cc
+13 −5 tools/rime_table_decompiler.cc
+0 −99 xcode.mk
1 change: 1 addition & 0 deletions app/src/main/jni/librime-predict
Submodule librime-predict added at dbe622
2 changes: 2 additions & 0 deletions app/src/main/jni/librime_jni/rime_jni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
extern void rime_require_module_lua();
extern void rime_require_module_charcode();
extern void rime_require_module_octagram();
extern void rime_require_module_predict();
// librime is compiled as a static library, we have to link modules explicitly
static void declare_librime_module_dependencies() {
rime_require_module_lua();
rime_require_module_charcode();
rime_require_module_octagram();
rime_require_module_predict();
}

class Rime {
Expand Down
Loading