Merge pull request #162 from Chocobo1/cli

nsis: Bundle `chewing-cli.exe`
chewing · May 29, 2024 · bc57cf0 · bc57cf0
2 parents 61e8ef7 + 28e913e
commit bc57cf0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -31,6 +31,7 @@ jobs:
             x86\ChewingTextService\Release\*.dll
             x86\libchewing\Release\*.dll
             x86\ChewingPreferences\Release\*.exe
+            x86\libchewing\chewing-cli.exe
           name: x86
           retention-days: 1
   x64:
@@ -58,6 +59,7 @@ jobs:
             x64\ChewingTextService\Release\*.dll
             x64\libchewing\Release\*.dll
             x64\ChewingPreferences\Release\*.exe
+            x64\libchewing\chewing-cli.exe
           name: x64
           retention-days: 1
   package:
@@ -79,6 +81,7 @@ jobs:
           copy x86\ChewingTextService\Release\*.dll nsis\x86\
           copy x86\libchewing\Release\*.dll nsis\x86\
           copy x86\ChewingPreferences\Release\*.exe nsis\
+          copy x86\libchewing\chewing-cli.exe nsis\
           mkdir nsis\x64
           copy x64\ChewingTextService\Release\*.dll nsis\x64\
           copy x64\libchewing\Release\*.dll nsis\x64\

diff --git a/installer/README.txt b/installer/README.txt
@@ -8,5 +8,7 @@ To build an installer:
 
 4. Put `32-bit` ChewingPreferences.exe in this dir.
 
-5. Compile installer.nsi with NSIS.
+5. Put `32-bit` chewing-cli.exe in this dir.
+
+6. Compile installer.nsi with NSIS.
 
diff --git a/installer/installer.nsi b/installer/installer.nsi
@@ -135,6 +135,7 @@ Section "新酷音輸入法" SecMain
 	File /r "x86" ; put 32-bit ChewingTextService.dll in x86 folder
 	File /r Dictionary ; Install dictionary files
 	File ChewingPreferences.exe ; Configuration Tool
+	File chewing-cli.exe ; Command-line Tool
 
 	; Register COM objects (NSIS RegDLL command is broken and cannot be used)
 	ExecWait '"$SYSDIR\regsvr32.exe" /s "$INSTDIR\x86\ChewingTextService.dll"'
@@ -185,6 +186,7 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\Dictionary"
 	Delete "$INSTDIR\SetupChewing.bat"
 	Delete "$INSTDIR\ChewingPreferences.exe"
+	Delete "$INSTDIR\chewing-cli.exe"
 
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ChewingTextService"
 	DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "SetupChewing"