From d3e096a49f4c5a2c403f15858820f7068419dd7d Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Sat, 25 Oct 2025 23:49:39 +0800 Subject: [PATCH 1/9] Update McBopomofoWeb submodule to 1.8.5 --- McBopomofoWeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McBopomofoWeb b/McBopomofoWeb index 9fa4191f..e4a6c86e 160000 --- a/McBopomofoWeb +++ b/McBopomofoWeb @@ -1 +1 @@ -Subproject commit 9fa4191fc876ac8b74205d97aaa707bc6d9cd1e1 +Subproject commit e4a6c86e986148a7987051121befd54fac64c7c8 From c12f8b5ea54a7e469474f676e8c46e1a327ac96a Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Mon, 3 Nov 2025 11:45:01 +0800 Subject: [PATCH 2/9] Bumps to McBopomofo 1.8.6. --- McBopomofoWeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McBopomofoWeb b/McBopomofoWeb index e4a6c86e..d1bd003f 160000 --- a/McBopomofoWeb +++ b/McBopomofoWeb @@ -1 +1 @@ -Subproject commit e4a6c86e986148a7987051121befd54fac64c7c8 +Subproject commit d1bd003fd3e680cb98aef4dda060cd127b39bcd2 From 53655085646d321f45bcd6d5b6749c1537027b71 Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Mon, 3 Nov 2025 12:12:52 +0800 Subject: [PATCH 3/9] Tries to fix the CI. --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c82d20da..e6ddddb6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,7 @@ jobs: - name: Build the installer run: | cmd /C "C:\Program Files (x86)\NSIS\Bin\makensis.exe" ".\installer\installer.nsi" + shell: cmd - uses: actions/upload-artifact@v4 with: name: Installer From bbf087197784e4cfee2f65b7397e5b2266f450a4 Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Mon, 3 Nov 2025 12:24:10 +0800 Subject: [PATCH 4/9] Updates CI settings. --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e6ddddb6..9994a636 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,15 +9,15 @@ jobs: build: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 with: submodules: 'true' - name: Use Node.js 21.x - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 21.x - name: Use Install NSIS - uses: repolevedavaj/install-nsis@v1.0.2 + uses: repolevedavaj/install-nsis@v1.1.0 with: nsis-version: 3.08 - name: Run build.bat @@ -25,7 +25,7 @@ jobs: .\build.bat - name: Build the installer run: | - cmd /C "C:\Program Files (x86)\NSIS\Bin\makensis.exe" ".\installer\installer.nsi" + "C:\Program Files (x86)\NSIS\Bin\makensis.exe" ".\installer\installer.nsi" shell: cmd - uses: actions/upload-artifact@v4 with: From d14eb652665326887f3c06ebb717afa995a6f996 Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Sat, 8 Nov 2025 00:44:54 +0800 Subject: [PATCH 5/9] Update build configuration and installer localization --- .gitignore | 1 + .gitmodules | 3 +++ McFoximWeb | 1 + build.bat | 12 ++++++++++++ installer/installer.nsi | 8 ++++++++ installer/locale/English.nsh | 2 ++ installer/locale/SimpChinese.nsh | 2 ++ installer/locale/TradChinese.nsh | 2 ++ 8 files changed, 31 insertions(+) create mode 160000 McFoximWeb diff --git a/.gitignore b/.gitignore index f1b3b624..af149097 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build build64 build_arm64/ node/input_methods/McBopomofo +node/input_methods/McFoxim installer/*.exe diff --git a/.gitmodules b/.gitmodules index eb3e42f7..839a9dc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "McBopomofoWeb"] path = McBopomofoWeb url = https://github.com/openvanilla/McBopomofoWeb.git +[submodule "McFoximWeb"] + path = McFoximWeb + url = https://github.com/openvanilla/McFoximWeb.git diff --git a/McFoximWeb b/McFoximWeb new file mode 160000 index 00000000..e5fb356a --- /dev/null +++ b/McFoximWeb @@ -0,0 +1 @@ +Subproject commit e5fb356a06627cb6820fef7e7ae3eceb710ae3e7 diff --git a/build.bat b/build.bat index 5cbe5255..cfe1d166 100644 --- a/build.bat +++ b/build.bat @@ -18,3 +18,15 @@ echo "Copy McBopomofo to node\input_methods\McBopomofo" cmd /C rd /s /q node\input_methods\McBopomofo cmd /C mkdir node\input_methods\McBopomofo cmd /C xcopy /s /q /y /f McBopomofoWeb\output\pime node\input_methods\McBopomofo\. + + +echo "Start building McFoximWeb" +cd McFoximWeb +cmd /C npm install +cmd /C npm run build:pime +cd .. + +echo "Copy McFoximWeb to node\input_methods\McFoxim" +cmd /C rd /s /q node\input_methods\McFoxim +cmd /C mkdir node\input_methods\McFoxim +cmd /C xcopy /s /q /y /f McFoximWeb\output\pime node\input_methods\McFoxim\. diff --git a/installer/installer.nsi b/installer/installer.nsi index d7624701..401f5a7d 100644 --- a/installer/installer.nsi +++ b/installer/installer.nsi @@ -580,6 +580,13 @@ SectionGroup /e $(NODE_SECTION_GROUP) node_section_group StrCpy $INST_NODE "True" SectionEnd + Section $(MCFOXIM) McFoxim + SectionIn 2 + SetOutPath "$INSTDIR\node\input_methods\McFoxim" + File /r "..\node\input_methods\McFoxim\*.*" + StrCpy $INST_NODE "True" + SectionEnd + Section $(EMOJIME) emojime SectionIn 2 SetOutPath "$INSTDIR\node\input_methods\emojime" @@ -733,6 +740,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${cheez} $(cheez_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${rime} $(rime_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${mcbopomofo} $(mcbopomofo_DESC) + !insertmacro MUI_DESCRIPTION_TEXT ${mcfoxim} $(mcfoxim_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${emojime} $(emojime_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${cheeng} $(cheeng_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${braille_chewing} $(braille_chewing_DESC) diff --git a/installer/locale/English.nsh b/installer/locale/English.nsh index 2e40837d..a1b65559 100644 --- a/installer/locale/English.nsh +++ b/installer/locale/English.nsh @@ -38,6 +38,7 @@ !insertmacro LANG_STRING CHEEZ "EZ Input" !insertmacro LANG_STRING RIME "Rime" !insertmacro LANG_STRING MCBOPOMOFO "McBopomofo" +!insertmacro LANG_STRING MCFOXIM "McFoxim" !insertmacro LANG_STRING EMOJIME "emojime" !insertmacro LANG_STRING CHEENG "Eng-Num" !insertmacro LANG_STRING BRAILLE_CHEWING "Braille Chewing" @@ -63,6 +64,7 @@ !insertmacro LANG_STRING cheez_DESC "Install EZ Input method module." !insertmacro LANG_STRING rime_DESC "Install Rime input method engine, 内含拼音、注音、仓颉、五笔、粤拼、吴语等数种输入方案。" !insertmacro LANG_STRING mcbopomofo_DESC "Install McBopomofo input method module." +!insertmacro LANG_STRING mcfoxim_DESC "Install McFoxIM input method module." !insertmacro LANG_STRING emojime_DESC "Install emojime input method module." !insertmacro LANG_STRING cheeng_DESC "Install Eng-Num input method module." !insertmacro LANG_STRING braille_chewing_DESC "Install Braille Chewing input method module." diff --git a/installer/locale/SimpChinese.nsh b/installer/locale/SimpChinese.nsh index f8b52653..506f9f58 100644 --- a/installer/locale/SimpChinese.nsh +++ b/installer/locale/SimpChinese.nsh @@ -38,6 +38,7 @@ !insertmacro LANG_STRING CHEEZ 轻松 !insertmacro LANG_STRING RIME 中州韵 !insertmacro LANG_STRING MCBOPOMOFO 小麦注音 +!insertmacro LANG_STRING MCFOXIM 小麦族语 !insertmacro LANG_STRING EMOJIME emojime !insertmacro LANG_STRING CHEENG 英数 !insertmacro LANG_STRING BRAILLE_CHEWING "盲文酷音" @@ -63,6 +64,7 @@ !insertmacro LANG_STRING cheez_DESC "安装轻松输入法模块。" !insertmacro LANG_STRING rime_DESC "安装中州韵输入法引擎，内含拼音、注音、仓颉、五笔、粤拼、吴语等数种输入方案。" !insertmacro LANG_STRING mcbopomofo_DESC "安装小麦注音输入法模块。" +!insertmacro LANG_STRING mcfoxim_DESC "安装小麦族语输入法模块。" !insertmacro LANG_STRING emojime_DESC "安装 emojime 输入法模块。" !insertmacro LANG_STRING cheeng_DESC "安装英数输入法模块。" !insertmacro LANG_STRING braille_chewing_DESC "安装盲文酷音输入法模块。" diff --git a/installer/locale/TradChinese.nsh b/installer/locale/TradChinese.nsh index e53e7c43..00792527 100644 --- a/installer/locale/TradChinese.nsh +++ b/installer/locale/TradChinese.nsh @@ -38,6 +38,7 @@ !insertmacro LANG_STRING CHEEZ 輕鬆 !insertmacro LANG_STRING RIME 中州韻 !insertmacro LANG_STRING MCBOPOMOFO 小麥注音 +!insertmacro LANG_STRING MCFOXIM 小麥族語 !insertmacro LANG_STRING EMOJIME emojime !insertmacro LANG_STRING CHEENG 英數 !insertmacro LANG_STRING BRAILLE_CHEWING "點字酷音" @@ -63,6 +64,7 @@ !insertmacro LANG_STRING cheez_DESC "安裝輕鬆輸入法模組。" !insertmacro LANG_STRING rime_DESC "安裝中州韻輸入法引擎，內含拼音、注音、倉頡、五筆、粵拼、吳語等數種輸入方案。" !insertmacro LANG_STRING mcbopomofo_DESC "安裝小麥注音輸入法模組。" +!insertmacro LANG_STRING mcfoxim_DESC "安裝小麥族語輸入法模組。" !insertmacro LANG_STRING emojime_DESC "安裝 emojime 輸入法模組。" !insertmacro LANG_STRING cheeng_DESC "安裝英數輸入法模組。" !insertmacro LANG_STRING braille_chewing_DESC "安裝點字酷音輸入法模組。" From 4ed0c384f5326b55e9dc8cf4e482d36c51ad0217 Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Sun, 23 Nov 2025 14:14:50 +0800 Subject: [PATCH 6/9] Bumps to McFoxIM 0.3.1. --- McFoximWeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McFoximWeb b/McFoximWeb index e5fb356a..931affc0 160000 --- a/McFoximWeb +++ b/McFoximWeb @@ -1 +1 @@ -Subproject commit e5fb356a06627cb6820fef7e7ae3eceb710ae3e7 +Subproject commit 931affc0db75200d7e2c1a3554d692dbd05e7da4 From 324b13edc3ecb3bbc39d41726b4080f876670dee Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Tue, 25 Nov 2025 02:58:06 +0800 Subject: [PATCH 7/9] Bumps to McFoximWeb 0.4.0. --- McFoximWeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McFoximWeb b/McFoximWeb index 931affc0..24b52671 160000 --- a/McFoximWeb +++ b/McFoximWeb @@ -1 +1 @@ -Subproject commit 931affc0db75200d7e2c1a3554d692dbd05e7da4 +Subproject commit 24b52671dc6f7ecf7316583c1925fff97403eb71 From fa46f9158533ad2a0296bc9cf164cd72e47d4aaa Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Thu, 27 Nov 2025 12:27:01 +0800 Subject: [PATCH 8/9] Bumps to McFoxIM 0.4.1. --- McFoximWeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McFoximWeb b/McFoximWeb index 24b52671..d8b86b4b 160000 --- a/McFoximWeb +++ b/McFoximWeb @@ -1 +1 @@ -Subproject commit 24b52671dc6f7ecf7316583c1925fff97403eb71 +Subproject commit d8b86b4ba698654ab4a83a0fbcbfdce78e1ad24a From da444fd16c1cd3f59b43f1723221846bfa894079 Mon Sep 17 00:00:00 2001 From: "Weizhong Yang a.k.a zonble" Date: Mon, 1 Dec 2025 22:51:51 +0800 Subject: [PATCH 9/9] Updates McBopomofoWeb to 1.9.0. McFoximWeb to 0.4.2. --- McBopomofoWeb | 2 +- McFoximWeb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/McBopomofoWeb b/McBopomofoWeb index d1bd003f..962af366 160000 --- a/McBopomofoWeb +++ b/McBopomofoWeb @@ -1 +1 @@ -Subproject commit d1bd003fd3e680cb98aef4dda060cd127b39bcd2 +Subproject commit 962af36607caea5d2b999c81cd23c8fb1881293c diff --git a/McFoximWeb b/McFoximWeb index d8b86b4b..cd43770b 160000 --- a/McFoximWeb +++ b/McFoximWeb @@ -1 +1 @@ -Subproject commit d8b86b4ba698654ab4a83a0fbcbfdce78e1ad24a +Subproject commit cd43770b95cabce87b97bd26af4a3470b8b82d4d