Integrate lua addon (#13)

fcitx-contrib · Jan 20, 2025 · 60e8162 · 60e8162
1 parent 2e41484
commit 60e8162
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "entry/src/main/cpp/fcitx5-chinese-addons"]
 	path = entry/src/main/cpp/fcitx5-chinese-addons
 	url = https://github.com/fcitx/fcitx5-chinese-addons
+[submodule "entry/src/main/cpp/fcitx5-lua"]
+	path = entry/src/main/cpp/fcitx5-lua
+	url = https://github.com/fcitx/fcitx5-lua
diff --git a/entry/src/main/cpp/CMakeLists.txt b/entry/src/main/cpp/CMakeLists.txt
@@ -41,6 +41,10 @@ option(ENABLE_DATA "" OFF)
 option(ENABLE_TOOLS "" OFF)
 add_subdirectory(libime)
 
+option(USE_DLOPEN "" OFF)
+add_subdirectory(fcitx5-lua)
+target_link_libraries(luaaddonloader "-L${PREBUILT_DIR}/lib" lua)
+
 option(ENABLE_CLOUDPINYIN "" OFF)
 option(ENABLE_GUI "" OFF)
 set(OPENCC_INCLUDE_DIR "${PREBUILT_DIR}/include/opencc")

diff --git a/entry/src/main/cpp/fcitx5-lua b/entry/src/main/cpp/fcitx5-lua
diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
@@ -1,7 +1,10 @@
+set -e
+
 deps=(
   boost
   ecm
   fmt
+  lua
   libintl
   marisa
   opencc
@@ -21,6 +24,13 @@ done
 RES_EXTRACT_DIR=entry/src/main/resources/resfile/usr
 mkdir -p $RES_EXTRACT_DIR
 
-file=chinese-addons-any.tar.bz2
-[[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-plugins/releases/download/macos/$file
-tar xf cache/$file -C $RES_EXTRACT_DIR lib share
+addons=(
+  chinese-addons
+  lua
+)
+for addon in "${addons[@]}"; do
+  file=$addon-any.tar.bz2
+  [[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-plugins/releases/download/macos/$file
+  tar xf cache/$file -C $RES_EXTRACT_DIR lib || true
+  tar xf cache/$file -C $RES_EXTRACT_DIR share
+done