add chinese-addons (#3)

.github/workflows/ci.yml

@@ -28,6 +28,9 @@ jobs:
             fmt \
             extra-cmake-modules \
             json-c \
+            lua \
+            boost \
+            opencc \
             ninja
 
       - name: Setup arm homebrew
@@ -45,6 +48,9 @@ jobs:
             json-c \
             gettext \
             openssl@3 \
+            lua \
+            boost \
+            opencc \
             libevent
           wget https://github.com/fcitx-contrib/fcitx5-macos-prebuilder/releases/download/latest/local-x86_64.tar.bz2
           tar xjvf local-x86_64.tar.bz2 -C /usr/local --strip-components=1 # need marisa-build

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "fcitx5-hallelujah"]
 	path = fcitx5-hallelujah
 	url = https://github.com/fcitx-contrib/fcitx5-hallelujah
+[submodule "fcitx5-chinese-addons"]
+	path = fcitx5-chinese-addons
+	url = [email protected]:fcitx/fcitx5-chinese-addons.git
+[submodule "fcitx5-lua"]
+	path = fcitx5-lua
+	url = https://github.com/fcitx/fcitx5-lua.git

README.md

@@ -2,9 +2,16 @@
 Build plugins for [fcitx5-macos](https://github.com/fcitx-contrib/fcitx5-macos).
 
 ## Plugins
+### Chinese
+* [chinese-addons](https://github.com/fcitx/fcitx5-chinese-addons): LGPL-2.1-or-later
+
 ### English
 * [hallelujah](https://github.com/fcitx-contrib/fcitx5-hallelujah): GPL-3.0-only
 
+### Other
+* [lua](https://github.com/fcitx/fcitx5-lua): LGPL-2.1-or-later
+(NOT WORKING)
+
 ## Manual installation
 ```sh
 tar -xjvC /usr/local -f hallelujah-x86_64.tar.bz2

all.sh

@@ -1,2 +1,13 @@
+#!/bin/bash
+
 set -e
-scripts/hallelujah.sh $1
+
+all_plugins=(
+  lua
+  hallelujah
+  chinese-addons # Optional dependency: lua
+)
+
+for plugin in "${all_plugins[@]}"; do
+  scripts/$plugin.sh $1
+done

common.sh

@@ -1,6 +1,8 @@
 name=$1
-export DESTDIR=`pwd`/build/$name
-cd fcitx5-$name
+
+ROOT=`pwd`
+ADDON_ROOT=$ROOT/fcitx5-$name
+DESTDIR=$ROOT/build/$name
 
 if [[ -z $2 ]]; then
   ARCH=`uname -m`
@@ -14,23 +16,27 @@ else
   HOMEBREW_PREFIX=/opt/homebrew
 fi
 
-cbr() {
+f5m_configure() {
   # Install plugins to /usr/local for both arm and x86 to ease fcitx5 search
   PKG_CONFIG_PATH=$HOMEBREW_PREFIX/lib/pkgconfig cmake -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_FIND_ROOT_PATH="/Library/Input Methods/Fcitx5.app/Contents;$HOMEBREW_PREFIX" \
     -DCMAKE_OSX_ARCHITECTURES=$ARCH "$@"
 }
 
-cb() {
+f5m_build() {
   cmake --build build
 }
 
-ci() {
-  cmake --install build
+f5m_install() {
+  cmake --install build # install for other plugins
+  DESTDIR=$DESTDIR cmake --install build # install for package
 }
 
-tbz() {
-  cd $DESTDIR/..
-  tar cjvf $name-$ARCH.tar.bz2 -C $name/usr/local lib share
+f5m_make_tarball() {
+  cd $DESTDIR/usr/local
+  tar cjvf ../../../$name-$ARCH.tar.bz2 *
 }
+
+set -x
+cd $ADDON_ROOT

scripts/chinese-addons.sh

@@ -0,0 +1,16 @@
+set -e
+. ./common.sh chinese-addons $1
+
+ARGS=(
+  -DENABLE_TEST=OFF
+  -DENABLE_GUI=OFF
+)
+
+if [[ $ARCH != $(uname -m) ]]; then
+  ARGS+=("-DENABLE_DATA=OFF")
+fi
+
+f5m_configure "${ARGS[@]}"
+f5m_build
+f5m_install
+f5m_make_tarball

scripts/hallelujah.sh

@@ -1,6 +1,8 @@
 set -e
+
 . ./common.sh hallelujah $1
-cbr -D ENABLE_TEST=OFF
-cb
-ci
-tbz
+
+f5m_configure -DENABLE_TEST=OFF
+f5m_build
+f5m_install
+f5m_make_tarball

scripts/lua.sh

@@ -0,0 +1,9 @@
+set -e
+. ./common.sh lua $1
+
+# Turning on dlopen produces wrong config.h,
+# and even fixed it will hard-code lua dylib path in code.
+f5m_configure -DENABLE_TEST=OFF -DUSE_DLOPEN=OFF
+f5m_build
+f5m_install
+f5m_make_tarball