diff --git a/openless-all/app/scripts/build-mac.sh b/openless-all/app/scripts/build-mac.sh index 3a51ea81..63b7c94e 100755 --- a/openless-all/app/scripts/build-mac.sh +++ b/openless-all/app/scripts/build-mac.sh @@ -25,9 +25,7 @@ else fi echo "▶ tauri build" -# bundle.resources 里有 Windows TSF DLL（仅 NSIS/MSI 需要），mac 端用空 map 覆盖避免 -# 把 0 字节占位 OpenLessIme.dll 打进 .app/Contents/Resources。 -TAURI_BUILD_ARGS=(build --config '{"bundle":{"resources":{}}}') +TAURI_BUILD_ARGS=(build) if [ -n "${TAURI_SIGNING_PRIVATE_KEY:-}" ] || [ -n "${TAURI_SIGNING_PRIVATE_KEY_PATH:-}" ]; then TAURI_BUILD_ARGS+=(--config '{"bundle":{"createUpdaterArtifacts":true}}') fi diff --git a/openless-all/app/scripts/windows-build-gnu.ps1 b/openless-all/app/scripts/windows-build-gnu.ps1 index 2d875d96..e647035e 100644 --- a/openless-all/app/scripts/windows-build-gnu.ps1 +++ b/openless-all/app/scripts/windows-build-gnu.ps1 @@ -53,6 +53,28 @@ try { Copy-Item -LiteralPath (Join-Path $releaseRoot "openless.exe") -Destination (Join-Path $artifactDevRoot "openless.exe") -Force Copy-Item -LiteralPath (Resolve-WebView2Loader) -Destination (Join-Path $artifactDevRoot "WebView2Loader.dll") -Force + # Build OpenLessIme.dll (x64 + x86) 并导出绝对路径 env var—— + # nsis/openless-ime-hooks.nsh 的 PREINSTALL 用 File "$%OPENLESS_IME_DLL_X64%" / _X86 + # 在 makensis 编译时把 dll 嵌入 NSIS 包；wix/openless-ime.wxs 也用同一对 env 解析 + # candle/light 的绝对路径（CI release-tauri.yml 同款做法）。 + foreach ($t in @( + @{ Platform = 'x64'; Folder = 'x64'; EnvName = 'OPENLESS_IME_DLL_X64' }, + @{ Platform = 'Win32'; Folder = 'x86'; EnvName = 'OPENLESS_IME_DLL_X86' } + )) { + $out = Join-Path $buildRoot "src-tauri\target\windows-ime-msvc\$($t.Folder)\Release" + $obj = Join-Path $buildRoot "src-tauri\target\windows-ime-msvc\obj\$($t.Folder)\Release" + & ./scripts/windows-ime-build.ps1 -Configuration Release -Platform $t.Platform -OutputDirectory $out -IntermediateDirectory $obj + if ($LASTEXITCODE -ne 0) { + throw "OpenLessIme $($t.Platform) build failed with exit $LASTEXITCODE" + } + $dll = (Resolve-Path (Join-Path $out 'OpenLessIme.dll')).Path + if (-not (Test-Path $dll)) { + throw "OpenLessIme.dll not produced at $dll" + } + Set-Item -Path "Env:$($t.EnvName)" -Value $dll + Write-Host "[ok] built $dll (exported $($t.EnvName))" + } + npm run tauri build -- --target x86_64-pc-windows-gnu --bundles msi nsis } finally { Pop-Location diff --git a/openless-all/app/src-tauri/installer.nsh b/openless-all/app/src-tauri/installer.nsh deleted file mode 100644 index e6675c39..00000000 --- a/openless-all/app/src-tauri/installer.nsh +++ /dev/null @@ -1,52 +0,0 @@ -; NSIS installer hook：注册 / 反注册 OpenLess TSF 输入法 DLL。 -; -; 背景：MSI 包通过 wix/openless-ime.wxs 的 CustomAction 跑 regsvr32，可正常注册到 -; HKLM 下的 TSF 注册表四件套；NSIS 包没有等价钩子 → NSIS 安装的用户在 -; "设置 → 权限"页面看到 "Windows 输入法后端：不可用"。 -; -; 这里的 hook 在 NSIS 安装/卸载流程里调 regsvr32 把 OpenLessIme.dll 注册到 HKLM。 -; bundle.resources 把 x64 / x86 DLL 拷到 $INSTDIR\tsf-ime\{x64,x86}\OpenLessIme.dll -; (resources map 的 target 必须避开 wxs fragment 已声明的 windows-ime\x64\ -; 路径，否则 MSI 包里同一路径会被两个 component 占用)。 -; tauri.conf.json 的 nsis.installMode = "perMachine" 让 NSIS 以管理员身份运行 -; (写 HKLM 必需)。 -; -; 必须同时注册 x64 + x86 两份 dll：windows_ime_profile.rs 的 -; inspect_windows_ime_registration() 会用 KEY_WOW64_64KEY 和 KEY_WOW64_32KEY 两次 -; 检查 HKLM CLSID InprocServer32，少了任何一边都会被判 RegistrationBroken。 -; -; ⚠️ NSIS installer 自身是 32-bit 进程，会触发 WOW64 文件系统重定向： -; - 32-bit 进程里的 $SYSDIR / $WINDIR\System32 都被重定向到 $WINDIR\SysWOW64， -; 运行的是 32-bit regsvr32 → 注册结果落在 HKLM\Software\Wow6432Node（即 -; KEY_WOW64_32KEY 视图），Rust 端 KEY_WOW64_64KEY 查不到 → 仍判"不可用"。 -; - 32-bit 进程访问真正的 64-bit System32 必须走 $WINDIR\Sysnative 这个 alias。 -; 因此： -; - x64 dll → $WINDIR\Sysnative\regsvr32.exe → 写 KEY_WOW64_64KEY 视图 -; - x86 dll → $WINDIR\SysWOW64\regsvr32.exe → 写 KEY_WOW64_32KEY 视图 -; -; regsvr32 失败时不阻塞安装：用户仍可以靠 SendInput / 粘贴兜底完成上屏。 - -!macro NSIS_HOOK_POSTINSTALL - DetailPrint "Registering OpenLess TSF IME (x64) ..." - nsExec::ExecToLog '"$WINDIR\Sysnative\regsvr32.exe" /s "$INSTDIR\tsf-ime\x64\OpenLessIme.dll"' - Pop $0 - ${If} $0 != 0 - DetailPrint "OpenLess TSF IME x64 registration failed (exit $0); fallback insertion paths still work." - ${EndIf} - - DetailPrint "Registering OpenLess TSF IME (x86) ..." - nsExec::ExecToLog '"$WINDIR\SysWOW64\regsvr32.exe" /s "$INSTDIR\tsf-ime\x86\OpenLessIme.dll"' - Pop $0 - ${If} $0 != 0 - DetailPrint "OpenLess TSF IME x86 registration failed (exit $0); fallback insertion paths still work." - ${EndIf} -!macroend - -!macro NSIS_HOOK_PREUNINSTALL - DetailPrint "Unregistering OpenLess TSF IME (x86) ..." - nsExec::ExecToLog '"$WINDIR\SysWOW64\regsvr32.exe" /s /u "$INSTDIR\tsf-ime\x86\OpenLessIme.dll"' - Pop $0 - DetailPrint "Unregistering OpenLess TSF IME (x64) ..." - nsExec::ExecToLog '"$WINDIR\Sysnative\regsvr32.exe" /s /u "$INSTDIR\tsf-ime\x64\OpenLessIme.dll"' - Pop $0 -!macroend diff --git a/openless-all/app/src-tauri/openless-ime-payload/x64/OpenLessIme.dll b/openless-all/app/src-tauri/openless-ime-payload/x64/OpenLessIme.dll deleted file mode 100644 index e69de29b..00000000 diff --git a/openless-all/app/src-tauri/openless-ime-payload/x86/OpenLessIme.dll b/openless-all/app/src-tauri/openless-ime-payload/x86/OpenLessIme.dll deleted file mode 100644 index e69de29b..00000000 diff --git a/openless-all/app/src-tauri/tauri.conf.json b/openless-all/app/src-tauri/tauri.conf.json index 6164ca12..1349489a 100644 --- a/openless-all/app/src-tauri/tauri.conf.json +++ b/openless-all/app/src-tauri/tauri.conf.json @@ -79,10 +79,6 @@ "icons/icon.icns", "icons/icon.ico" ], - "resources": { - "openless-ime-payload/x64/OpenLessIme.dll": "tsf-ime/x64/OpenLessIme.dll", - "openless-ime-payload/x86/OpenLessIme.dll": "tsf-ime/x86/OpenLessIme.dll" - }, "macOS": { "minimumSystemVersion": "12.0", "infoPlist": "Info.plist", @@ -101,10 +97,6 @@ "OpenLessImeDllX64Component", "OpenLessImeDllX86Component" ] - }, - "nsis": { - "installMode": "perMachine", - "installerHooks": "installer.nsh" } } },