From 89cb040bd1a6e73b4777c8c3752f2616fff2cfd9 Mon Sep 17 00:00:00 2001 From: WhiredPlanck Date: Sun, 15 Dec 2024 19:55:55 +0800 Subject: [PATCH] refactor: remove librime charcode plugin It's deprecated by upstream --- .gitmodules | 3 --- app/src/main/jni/CMakeLists.txt | 14 ++++++-------- app/src/main/jni/cmake/Boost.cmake | 4 +--- app/src/main/jni/cmake/FindBoost.cmake | 3 --- app/src/main/jni/cmake/Rime.cmake | 16 +++++++--------- app/src/main/jni/librime-charcode | 1 - app/src/main/jni/librime_jni/rime_jni.cc | 2 -- 7 files changed, 14 insertions(+), 29 deletions(-) delete mode 160000 app/src/main/jni/librime-charcode diff --git a/.gitmodules b/.gitmodules index 00e65c46fb..f9c7ea311e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,9 +26,6 @@ [submodule "librime-octagram"] path = app/src/main/jni/librime-octagram url = https://github.com/lotem/librime-octagram.git -[submodule "librime-charcode"] - path = app/src/main/jni/librime-charcode - url = https://github.com/rime/librime-charcode [submodule "librime-predict"] path = app/src/main/jni/librime-predict url = https://github.com/rime/librime-predict diff --git a/app/src/main/jni/CMakeLists.txt b/app/src/main/jni/CMakeLists.txt index d5a10371c8..13b6f1e606 100644 --- a/app/src/main/jni/CMakeLists.txt +++ b/app/src/main/jni/CMakeLists.txt @@ -18,19 +18,16 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) option(BUILD_SHARED_LIBS "" OFF) option(BUILD_TESTING "" OFF) -# iconv for Boost::locale -include(Iconv) -# workaround for boost install -install(TARGETS iconv EXPORT boost_locale-targets) - include(Boost) option(WITH_GFLAGS "Use gflags" OFF) option(WITH_GTEST "Use googletest" OFF) option(WITH_UNWIND "Enable libunwind support" OFF) add_subdirectory(librime/deps/glog) -target_compile_options(glog_internal PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") -target_compile_definitions(glog PRIVATE GLOG_OS_ANDROID) # remove when glog 0.8.0 +target_compile_options( + glog_internal PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +target_compile_definitions(glog PRIVATE GLOG_OS_ANDROID) # remove when glog + # 0.8.0 option(YAML_CPP_BUILD_TOOLS "" OFF) option(YAML_CPP_BUILD_TESTS "" OFF) @@ -50,7 +47,8 @@ option(LEVELDB_INSTALL "" OFF) add_subdirectory(librime/deps/leveldb) add_subdirectory(librime/deps/marisa-trie) -target_compile_options(marisa PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +target_compile_options( + marisa PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") set(LIBMARISA marisa) option(USE_SYSTEM_MARISA "" ON) diff --git a/app/src/main/jni/cmake/Boost.cmake b/app/src/main/jni/cmake/Boost.cmake index 4ac0a05c75..7d15925c34 100644 --- a/app/src/main/jni/cmake/Boost.cmake +++ b/app/src/main/jni/cmake/Boost.cmake @@ -35,8 +35,6 @@ set(BOOST_INCLUDE_LIBRARIES scope_exit signals2 utility - uuid - # librime-charcode - locale) + uuid) add_subdirectory(boost EXCLUDE_FROM_ALL) diff --git a/app/src/main/jni/cmake/FindBoost.cmake b/app/src/main/jni/cmake/FindBoost.cmake index 69922045a4..61cae8ca9b 100644 --- a/app/src/main/jni/cmake/FindBoost.cmake +++ b/app/src/main/jni/cmake/FindBoost.cmake @@ -17,6 +17,3 @@ foreach(__lib ${__boost_installed_libs}) set(__full_dir "${CMAKE_SOURCE_DIR}/${__lib}/include") list(APPEND Boost_INCLUDE_DIRS "${__full_dir}") endforeach() - -# for librime-charcode -set(Boost_LOCALE_LIBRARIES Boost::locale) diff --git a/app/src/main/jni/cmake/Rime.cmake b/app/src/main/jni/cmake/Rime.cmake index 7cb910d474..f09937d725 100644 --- a/app/src/main/jni/cmake/Rime.cmake +++ b/app/src/main/jni/cmake/Rime.cmake @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # if you want to add some new plugins, add them to librime_jni/rime_jni.cc too -set(RIME_PLUGINS librime-lua librime-charcode librime-octagram librime-predict) +set(RIME_PLUGINS librime-lua librime-octagram librime-predict) # symlink plugins foreach(plugin ${RIME_PLUGINS}) @@ -20,16 +20,14 @@ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/librime/plugins/librime-lua/thirdparty") COPY_ON_ERROR SYMBOLIC) endif() -# librime-charcode -option(BUILD_WITH_ICU "" OFF) - option(BUILD_TEST "" OFF) option(BUILD_STATIC "" ON) add_subdirectory(librime) -target_compile_options(rime-static PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") - -target_link_libraries(rime-charcode-objs Boost::locale) +target_compile_options( + rime-static PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") -target_compile_options(rime-lua-objs PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +target_compile_options( + rime-lua-objs PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") -target_compile_options(rime-octagram-objs PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +target_compile_options( + rime-octagram-objs PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") diff --git a/app/src/main/jni/librime-charcode b/app/src/main/jni/librime-charcode deleted file mode 160000 index c202c85eaa..0000000000 --- a/app/src/main/jni/librime-charcode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c202c85eaa45a2f836a3cf79223897096336aa9e diff --git a/app/src/main/jni/librime_jni/rime_jni.cc b/app/src/main/jni/librime_jni/rime_jni.cc index e801dfc9e9..581dc50908 100644 --- a/app/src/main/jni/librime_jni/rime_jni.cc +++ b/app/src/main/jni/librime_jni/rime_jni.cc @@ -13,13 +13,11 @@ #define MAX_BUFFER_LENGTH 2048 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(); }