build: migrate WeaselSetup to Weasel.Setup

rime · Jan 27, 2025 · d56e5c0 · d56e5c0
1 parent 50ab385
commit d56e5c0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ ReleaseHant/
 /output/*.ime
 /output/*.txt
 /output/*.bat
+/output/*.config
 /output/data/essay.txt
 /output/data/opencc/
 /output/data/*.yaml

diff --git a/clang-format.sh b/clang-format.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-WEASEL_SOURCE_PATH="RimeWithWeasel WeaselDeployer WeaselIME WeaselIPC WeaselIPCServer WeaselServer WeaselSetup WeaselTSF WeaselUI include test"
+WEASEL_SOURCE_PATH="RimeWithWeasel WeaselDeployer WeaselIME WeaselIPC WeaselIPCServer WeaselServer WeaselTSF WeaselUI include test"
 
 # clang format options
 method="-i"

diff --git a/output/install.nsi b/output/install.nsi
@@ -260,7 +260,8 @@ program_files:
     ${Endif}
   ${Endif}
 
-  File "WeaselSetup.exe"
+  File "Weasel.Setup.exe"
+  File "TSF.TypeLib.dll"
   ; shared data files
   SetOutPath $INSTDIR\data
   File "data\*.yaml"
@@ -287,7 +288,7 @@ program_files:
   IfErrors +2 0
   StrCpy $R2 "/t"
 
-  ExecWait '"$INSTDIR\WeaselSetup.exe" $R2'
+  ExecWait '"$INSTDIR\Weasel.Setup.exe" $R2'
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayName" "$(DISPLAYNAME)"
@@ -350,7 +351,7 @@ Section "Start Menu Shortcuts"
   CreateShortCut "$SMPROGRAMS\$(DISPLAYNAME)\$(LNKFORUSERFOLDER).lnk" "$INSTDIR\WeaselServer.exe" "/userdir" "$SYSDIR\shell32.dll" 126
   CreateShortCut "$SMPROGRAMS\$(DISPLAYNAME)\$(LNKFORAPPFOLDER).lnk" "$INSTDIR\WeaselServer.exe" "/weaseldir" "$SYSDIR\shell32.dll" 19
   CreateShortCut "$SMPROGRAMS\$(DISPLAYNAME)\$(LNKFORUPDATER).lnk" "$INSTDIR\WeaselServer.exe" "/update" "$SYSDIR\shell32.dll" 13
-  CreateShortCut "$SMPROGRAMS\$(DISPLAYNAME)\$(LNKFORSETUP).lnk" "$INSTDIR\WeaselSetup.exe" "" "$SYSDIR\shell32.dll" 162
+  CreateShortCut "$SMPROGRAMS\$(DISPLAYNAME)\$(LNKFORSETUP).lnk" "$INSTDIR\Weasel.Setup.exe" "" "$SYSDIR\shell32.dll" 162
   CreateShortCut "$SMPROGRAMS\$(DISPLAYNAME)\$(LNKFORUNINSTALL).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
 
 SectionEnd
@@ -363,7 +364,7 @@ Section "Uninstall"
 
   ExecWait '"$INSTDIR\WeaselServer.exe" /quit'
 
-  ExecWait '"$INSTDIR\WeaselSetup.exe" /u'
+  ExecWait '"$INSTDIR\Weasel.Setup.exe" /u'
 
   ; Remove registry keys
   DeleteRegKey HKLM SOFTWARE\Rime

diff --git a/xmake.lua b/xmake.lua
@@ -51,9 +51,24 @@ if is_arch("x64") or is_arch("x86") then
   includes("RimeWithWeasel", "WeaselIPCServer", "WeaselServer", "WeaselDeployer")
 end
 
-if is_arch("x86") then
-  includes("WeaselSetup")
-end
+target("Weasel.Setup")
+  on_build(function(target)
+    import("package.tools.msbuild")
+
+    local sln = "weasel.sln"
+    local target_name = string.gsub(target:name(), "%.", "_")
+    local build_type = is_mode("debug") and "Debug" or "Release"
+    local platform = "Any CPU"
+    local configs = {
+      sln,
+      "/t:" .. target_name,
+      "-restore",
+      "/p:Configuration=" .. build_type,
+      "/p:Platform=" .. platform
+    }
+
+    msbuild.build(target, configs)
+  end)
 
 if is_mode("debug") then
   includes("test/TestWeaselIPC")