diff --git a/GC-UI/CI.md b/GC-UI/CI.md index f414f15..09962ae 100644 --- a/GC-UI/CI.md +++ b/GC-UI/CI.md @@ -64,9 +64,55 @@ Windows 还需要 **VS Build Tools 的「使用 C++ 的桌面开发」工作负 ## 本地构建(不经 CI) ```bash -# macOS +# Linux / macOS:三平台一次出齐。Windows 前端用 mingw-w64 + wine 交叉编译, +# 不需要 Windows 机器。 +./build.sh build + +# 只编 macOS 前端 ./GC-UI/build-ui.sh macos -# Windows +# Windows 主机原生构建 GC-UI\build-ui.cmd ``` + +### Windows 前端交叉编译 + +Flutter 官方不支持在非 Windows 主机上 `flutter build windows`,但 Windows 嵌入层 +(`windows/runner/*.cpp` + `cpp_client_wrapper`)是纯 Win32 + 标准 C++,只通过 C ABI +调用 `flutter_windows.dll`,所以 mingw-w64 就能编译。整条链路上唯一必须执行的 +Windows 二进制是 AOT 快照生成器 `gen_snapshot.exe`,交给 wine 跑即可。 + +```bash +# 依赖 +sudo apt install mingw-w64 cmake ninja-build wine # Linux +brew install mingw-w64 cmake ninja # macOS +brew install --cask wine-stable # macOS 的 wine + +# 单独构建(默认输出到 GC-UI/frontend/build/windows/x64/runner/Release) +./buildsh/cross/build-ui-win-cross.sh [输出目录] +``` + +产物与官方 toolchain 完全一致,可直接拷到 Windows 运行: + +``` +GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/} +``` + +实现分三层: + +| 文件 | 职责 | +|---|---| +| `buildsh/cross/toolchain-mingw.cmake` | CMake 交叉工具链(posix 线程模型,静态链接 libstdc++,产物只依赖系统 DLL) | +| `buildsh/cross/CMakeLists.txt` | 只编 C++ 外壳;绕开 `tool_backend.bat` 与 MSVC 专用参数 | +| `buildsh/cross/build-ui-win-cross.sh` | 拉引擎产物、装 `gen_snapshot` 的 wine 包装、生成 AOT 快照、组装 | + +两个容易踩的坑,脚本里已处理: + +- `flutter_tools` 会 exec 路径为 `.../windows-x64-release/gen_snapshot`(**没有 `.exe`**) + 的文件,所以脚本在原 `.exe` 旁边放一个同名 shell 脚本转调 wine。 +- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING` + 依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。 + +`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux +构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本, +不再需要 VS Build Tools。 diff --git a/GC-UI/frontend/lib/shell.dart b/GC-UI/frontend/lib/shell.dart index 0824adb..5e0f7da 100644 --- a/GC-UI/frontend/lib/shell.dart +++ b/GC-UI/frontend/lib/shell.dart @@ -140,7 +140,7 @@ class _Sidebar extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), alignment: Alignment.center, - child: const Text( + child: Text( '◎', style: TextStyle(fontSize: 14, color: GcColors.accent), ), diff --git a/buildsh/build.sh b/buildsh/build.sh index 61f87e1..6c8d54f 100644 --- a/buildsh/build.sh +++ b/buildsh/build.sh @@ -53,17 +53,19 @@ bs_build() { _run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1 publish_backend "win-arm64" "dist/win-arm64" || return 1 - # Windows 版 Flutter 只能在 Windows 上编;x64 产物同时放进两个 Windows 包 - # (ARM64 上由系统模拟 x64 进程运行前端)。 + # Windows 前端:Windows 主机走官方 toolchain;Linux/macOS 主机用 mingw-w64 + + # wine 交叉编译(buildsh/cross)。只产出 x64 一份,两个包共用, + # ARM64 上由系统模拟 x64 进程运行前端。 case "$(uname -s)" in - MINGW*|MSYS*|CYGWIN*) - build_flutter_ui windows "dist/win-flutter" || return 1 - for label in win-amd64 win-arm64; do - cp -R "$ROOT_DIR/dist/win-flutter/." "$ROOT_DIR/dist/$label/" - done - rm -rf "$ROOT_DIR/dist/win-flutter" - ;; + MINGW*|MSYS*|CYGWIN*) build_flutter_ui windows "dist/win-flutter" || return 1 ;; + *) build_flutter_ui_cross "dist/win-flutter" ;; esac + if [ -d "$ROOT_DIR/dist/win-flutter" ]; then + for label in win-amd64 win-arm64; do + cp -R "$ROOT_DIR/dist/win-flutter/." "$ROOT_DIR/dist/$label/" + done + rm -rf "$ROOT_DIR/dist/win-flutter" + fi progress_step "运行骨架"; progress_tick 100 package_mac_app diff --git a/buildsh/cross/CMakeLists.txt b/buildsh/cross/CMakeLists.txt new file mode 100644 index 0000000..b44e91c --- /dev/null +++ b/buildsh/cross/CMakeLists.txt @@ -0,0 +1,108 @@ +cmake_minimum_required(VERSION 3.14) + +# 交叉编译 Flutter Windows 桌面外壳。 +# +# 只编译 C++ 层:runner(Win32 窗口)+ cpp_client_wrapper(Dart 互操作)。 +# Dart 侧的 flutter_assets 由 flutter assemble 单独产出,最后与 +# flutter_windows.dll 一起摆进同一个目录就是完整的可运行包。 +# +# 与 windows/CMakeLists.txt 的区别:不调用 tool_backend.bat(它在非 Windows +# 上不可执行),也不依赖 Visual Studio 生成器。 + +project(gc_ui_cross LANGUAGES CXX RC) + +get_filename_component(APP_DIR "${CMAKE_CURRENT_LIST_DIR}/../../GC-UI/frontend" ABSOLUTE) + +set(WIN_DIR "${APP_DIR}/windows") +set(RUN_DIR "${WIN_DIR}/runner") +set(EPHEMERAL "${WIN_DIR}/flutter/ephemeral") +set(WRAPPER "${EPHEMERAL}/cpp_client_wrapper") +set(DLL_LIB "${EPHEMERAL}/flutter_windows.dll.lib") + +foreach(required + "${EPHEMERAL}/flutter_windows.dll" + "${DLL_LIB}" + "${WRAPPER}/core_implementations.cc") + if(NOT EXISTS "${required}") + message(FATAL_ERROR + "缺少 Flutter Windows 引擎产物:${required}\n" + "先运行 buildsh/cross/build-ui-win-cross.sh 里的 fetch_engine 步骤。") + endif() +endforeach() + +set(FLUTTER_VERSION "1.0.0" CACHE STRING "写入 exe 版本资源") + +# windres 在非 Windows 主机上不按 rc 文件所在目录解析图标路径, +# 这里把 resources\\app_icon.ico 换成绝对路径再交给 windres。 +# 注意只替换这一处:rc 里其它 "\0" 是字符串转义,不能动。 +file(READ "${RUN_DIR}/Runner.rc" _rc_text) +string(REPLACE "resources\\\\app_icon.ico" "${RUN_DIR}/resources/app_icon.ico" _rc_text "${_rc_text}") +# windres 收到 -DFLUTTER_VERSION=\"1.0.0\" 时会把反斜杠留在宏值里,展开成非法 token。 +# 直接把宏定义成字面量,绕开命令行转义。 +string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION" + "#define VERSION_AS_STRING \"${FLUTTER_VERSION}\"" + _rc_text "${_rc_text}") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}") + +add_executable(${BINARY_NAME} WIN32 + "${RUN_DIR}/main.cpp" + "${RUN_DIR}/flutter_window.cpp" + "${RUN_DIR}/utils.cpp" + "${RUN_DIR}/win32_window.cpp" + "${WIN_DIR}/flutter/generated_plugin_registrant.cc" + "${WRAPPER}/core_implementations.cc" + "${WRAPPER}/standard_codec.cc" + "${WRAPPER}/plugin_registrar.cc" + "${WRAPPER}/flutter_engine.cc" + "${WRAPPER}/flutter_view_controller.cc" + "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" +) + +target_include_directories(${BINARY_NAME} PRIVATE + "${RUN_DIR}" + "${WIN_DIR}" + "${EPHEMERAL}" + "${EPHEMERAL}/include" + "${WRAPPER}/include" +) + +target_compile_features(${BINARY_NAME} PRIVATE cxx_std_17) + +# Flutter 的 C++ wrapper 需要 RTTI 与异常;线程安全相关的锁依赖 posix 线程模型。 +target_compile_options(${BINARY_NAME} PRIVATE + -fexceptions + -frtti + -Wall + -Wno-unused-parameter + -Wno-missing-field-initializers +) + +# Runner.rc 里的 #include "resource.h" / runner.exe.manifest 都是相对路径, +# windres 不按源文件目录解析,必须显式给 -I。 +set_source_files_properties("${RUN_DIR}/Runner.rc" PROPERTIES + COMPILE_FLAGS "-I\"${RUN_DIR}\"") + +target_compile_definitions(${BINARY_NAME} PRIVATE + "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"" + "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}" + "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}" + "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}" + "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}" + "NOMINMAX" +) + +target_link_libraries(${BINARY_NAME} PRIVATE + "${DLL_LIB}" + dwmapi + ole32 + uuid +) + +# runner 的入口是 wWinMain(宽字符版);MSVC 自动处理,mingw 需要 -municode +# 才会链接 wWinMainCRTStartup,否则报 undefined reference to `WinMain'。 +target_link_options(${BINARY_NAME} PRIVATE -municode) + +set_target_properties(${BINARY_NAME} PROPERTIES + OUTPUT_NAME "GC-UI" + SUFFIX ".exe" +) diff --git a/buildsh/cross/build-ui-win-cross.sh b/buildsh/cross/build-ui-win-cross.sh new file mode 100755 index 0000000..1bdb7c0 --- /dev/null +++ b/buildsh/cross/build-ui-win-cross.sh @@ -0,0 +1,221 @@ +#!/usr/bin/env bash +# +# 在 Linux / macOS 上交叉编译 Flutter Windows 桌面界面(GC-UI)。 +# +# ./buildsh/cross/build-ui-win-cross.sh [输出目录] +# +# 产物目录是可直接拷到 Windows 上运行的一整套: +# GC-UI.exe flutter_windows.dll data/{icudtl.dat,app.so,flutter_assets/} +# +# 原理: +# Flutter 的 Windows 外壳(runner + cpp_client_wrapper)是纯 Win32 + 标准 C++, +# 只通过 C ABI 调 flutter_windows.dll,所以 mingw-w64 就能编译。 +# 唯一的 Windows 专属步骤是 AOT 快照生成(gen_snapshot.exe 是 PE 文件), +# 用 wine 执行即可,全流程不需要 Windows 机器或 MSVC。 +# +# 依赖: +# Linux sudo apt install mingw-w64 cmake ninja-build wine unzip curl +# macOS brew install mingw-w64 cmake ninja && brew install --cask wine-stable +# +# 环境变量: +# FLUTTER_BIN flutter 可执行文件(默认 PATH 中的 flutter,要求 3.24+) +# WIN_ENGINE_MIRROR 引擎产物来源(默认官方 GCS,国内可换 storage.flutter-io.cn) +# +set -euo pipefail + +ROOT_DIR=$(cd "$(dirname "$0")/../.." && pwd) +UI_DIR="$ROOT_DIR/GC-UI/frontend" +OUT_DIR="${1:-$UI_DIR/build/windows/x64/runner/Release}" +BUILD_DIR="$UI_DIR/build/windows/x64/cross" + +say() { printf '\033[36m==>\033[0m %s\n' "$*"; } +warn() { printf '\033[33m!!\033[0m %s\n' "$*"; } +die() { printf '\033[31mxx\033[0m %s\n' "$*" >&2; exit 1; } + +need() { command -v "$1" >/dev/null 2>&1 || die "缺少 $1($2)"; } + +# ---------------------------------------------------------------- 工具链 + +MINGW_CXX="" +check_toolchain() { + need cmake "Linux: apt install cmake;macOS: brew install cmake" + need ninja "Linux: apt install ninja-build;macOS: brew install ninja" + need unzip "Linux: apt install unzip" + need curl "Linux: apt install curl" + + for c in x86_64-w64-mingw32-g++-posix x86_64-w64-mingw32-g++; do + if command -v "$c" >/dev/null 2>&1; then MINGW_CXX="$c"; break; fi + done + [ -n "$MINGW_CXX" ] || die "缺少 mingw-w64 C++ 编译器 + Linux: sudo apt install g++-mingw-w64-x86-64-posix + macOS: brew install mingw-w64" + + command -v x86_64-w64-mingw32-windres >/dev/null 2>&1 || die "缺少 mingw-w64 资源编译器" + + # gen_snapshot.exe 靠 wine 执行;没有 wine 就只能出 debug 版(JIT) + if command -v wine >/dev/null 2>&1 || command -v wine64 >/dev/null 2>&1; then + WINE_BIN=$(command -v wine 2>/dev/null || command -v wine64) + else + die "缺少 wine(AOT 快照需要执行 Windows 版 gen_snapshot.exe) + Linux: sudo apt install wine + macOS: brew install --cask wine-stable" + fi +} + +# ---------------------------------------------------------------- Flutter + +resolve_flutter() { + FLUTTER_BIN="${FLUTTER_BIN:-flutter}" + command -v "$FLUTTER_BIN" >/dev/null 2>&1 || die "未找到 flutter,可设置 FLUTTER_BIN=/path/to/flutter" + + local bin_path root target + bin_path=$(command -v "$FLUTTER_BIN") + while [ -L "$bin_path" ]; do + target=$(readlink "$bin_path") + case "$target" in + /*) bin_path="$target" ;; + *) bin_path="$(cd "$(dirname "$bin_path")" && pwd)/$target" ;; + esac + done + root=$(cd "$(dirname "$bin_path")/.." && pwd) + + [ -f "$root/bin/internal/engine.version" ] || die "$root 不像 Flutter SDK 根目录" + FLUTTER_ROOT="$root" + ENGINE_DIR="$root/bin/cache/artifacts/engine" + ENGINE_HASH=$(tr -d '[:space:]' < "$root/bin/internal/engine.version") + + # pubspec 要求 Dart 3.5+(Flutter 3.24+),版本不对直接提醒 + local dart_ver + dart_ver=$("$root/bin/cache/dart-sdk/bin/dart" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1) || dart_ver="" + say "Flutter SDK: $root(engine ${ENGINE_HASH:0:10}${dart_ver:+, dart $dart_ver})" +} + +# ---------------------------------------------------------------- 引擎产物 + +ENGINE_DIR="" # 由 resolve_flutter 填充 + +fetch_engine() { + local base="$MIRROR/flutter/$ENGINE_HASH" + local cache="${TMPDIR:-/tmp}/gc-win-engine" + mkdir -p "$cache" + + # 每个条目:远端相对路径 | 落地目录 | 落地后的标志文件 + local -a items=( + "windows-x64-release/windows-x64-flutter.zip|$ENGINE_DIR/windows-x64-release|flutter_windows.dll.lib" + "windows-x64/artifacts.zip|$ENGINE_DIR/windows-x64|frontend_server_aot.dart.snapshot" + "windows-x64/flutter-cpp-client-wrapper.zip|$ENGINE_DIR/windows-x64/cpp_client_wrapper|core_implementations.cc" + ) + + local item remote dest marker zip + for item in "${items[@]}"; do + IFS='|' read -r remote dest marker <<<"$item" + [ -f "$dest/$marker" ] && continue + + zip="$cache/$(echo "$remote" | tr '/' '_')" + if [ ! -s "$zip" ]; then + say "下载 $(basename "$remote")" + curl -fL --retry 3 --retry-delay 2 -o "$zip.part" "$base/$remote" \ + || die "下载失败:$base/$remote +可设置 WIN_ENGINE_MIRROR=https://storage.flutter-io.cn/flutter_infra_release 走国内镜像" + mv "$zip.part" "$zip" + fi + mkdir -p "$dest" + unzip -oq "$zip" -d "$dest" + done + + install_gen_snapshot_shim +} + +# flutter_tools 会直接 exec $ENGINE_DIR/*/gen_snapshot(无 .exe 后缀)。 +# 这里放一个调用 wine 的同名脚本,并给原本的 exe 加上 .win 后缀避免混淆。 +install_gen_snapshot_shim() { + local dirs=("$ENGINE_DIR/windows-x64-release" "$ENGINE_DIR/windows-x64") + local dir shim + for dir in "${dirs[@]}"; do + [ -f "$dir/gen_snapshot.exe" ] || continue + [ -f "$dir/gen_snapshot.exe.win" ] || mv "$dir/gen_snapshot.exe" "$dir/gen_snapshot.exe.win" + + shim="$dir/gen_snapshot" + cat > "$shim" </dev/null ) + + local dart="$FLUTTER_ROOT/bin/cache/dart-sdk/bin/dart" + local tool="$FLUTTER_ROOT/packages/flutter_tools/bin/tool_backend.dart" + + # tool_backend 是官方 CMake 调用的同一入口:解包引擎产物到 ephemeral、 + # 生成 flutter_assets、aot_elf_release。它末尾的收尾步骤在非 Windows host + # 上可能非零退出,所以只校验产物是否齐备。 + ( cd "$UI_DIR" && \ + FLUTTER_ROOT="$FLUTTER_ROOT" \ + PROJECT_DIR="$UI_DIR" \ + FLUTTER_STORAGE_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-$MIRROR}" \ + "$dart" "$tool" windows-x64 release ) || true + + [ -f "$UI_DIR/build/windows/app.so" ] || die "AOT 快照未生成(wine 执行 gen_snapshot 失败?)" + [ -d "$UI_DIR/build/flutter_assets" ] || die "flutter_assets 未生成" + say "AOT 快照 $(du -h "$UI_DIR/build/windows/app.so" | cut -f1),资源 $(du -sh "$UI_DIR/build/flutter_assets" | cut -f1)" +} + +build_cpp() { + local ver major minor patch build_no + read -r major minor patch build_no <<<"$(sed -n 's/^version:[[:space:]]*//p' "$UI_DIR/pubspec.yaml" \ + | head -1 | awk -F'[.+]' '{print $1+0, $2+0, $3+0, ($4==""?0:$4+0)}')" + ver="${major}.${minor}.${patch}" + + say "编译 C++ 外壳($(basename "$MINGW_CXX"))" + cmake -S "$ROOT_DIR/buildsh/cross" -B "$BUILD_DIR" -G Ninja \ + -DCMAKE_TOOLCHAIN_FILE="$ROOT_DIR/buildsh/cross/toolchain-mingw.cmake" \ + -DCMAKE_BUILD_TYPE=Release \ + -DBINARY_NAME=GC-UI \ + -DFLUTTER_VERSION="$ver" \ + -DFLUTTER_VERSION_MAJOR="$major" \ + -DFLUTTER_VERSION_MINOR="$minor" \ + -DFLUTTER_VERSION_PATCH="$patch" \ + -DFLUTTER_VERSION_BUILD="$build_no" >/dev/null + + cmake --build "$BUILD_DIR" -- -j "$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)" \ + || die "C++ 编译失败" + + [ -f "$BUILD_DIR/GC-UI.exe" ] || die "未产出 GC-UI.exe" +} + +stage() { + local eph="$UI_DIR/windows/flutter/ephemeral" + say "组装到 $OUT_DIR" + rm -rf "$OUT_DIR" + mkdir -p "$OUT_DIR/data" + + cp "$BUILD_DIR/GC-UI.exe" "$OUT_DIR/" + cp "$eph/flutter_windows.dll" "$OUT_DIR/" + cp "$eph/icudtl.dat" "$OUT_DIR/data/" + cp "$UI_DIR/build/windows/app.so" "$OUT_DIR/data/" + cp -R "$UI_DIR/build/flutter_assets/." "$OUT_DIR/data/flutter_assets/" + + say "完成:$(du -sh "$OUT_DIR" | cut -f1)" + find "$OUT_DIR" -maxdepth 2 -mindepth 1 | sed "s|$OUT_DIR| .|" +} + +# ---------------------------------------------------------------- main + +MIRROR="${WIN_ENGINE_MIRROR:-https://storage.googleapis.com/flutter_infra_release}" + +check_toolchain +resolve_flutter +fetch_engine +build_assets_and_aot +build_cpp +stage diff --git a/buildsh/cross/toolchain-mingw.cmake b/buildsh/cross/toolchain-mingw.cmake new file mode 100644 index 0000000..b2b4cc5 --- /dev/null +++ b/buildsh/cross/toolchain-mingw.cmake @@ -0,0 +1,36 @@ +# 在 Linux / macOS 上交叉编译 Flutter Windows 桌面应用的 CMake 工具链。 +# +# 原理:Flutter 的 Windows 嵌入层(windows/runner/*.cpp + cpp_client_wrapper) +# 是纯 Win32 + 标准 C++,只通过 C ABI 调用 flutter_windows.dll。因此用 +# mingw-w64(GCC,posix 线程模型)即可产出与官方 toolchain 等价的 PE 产物, +# 不需要 Windows 机器,也不需要 MSVC。 +# +# 用法: +# cmake -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE=.../toolchain-mingw.cmake ... + +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_VERSION 10.0) +set(CMAKE_SYSTEM_PROCESSOR x86_64) + +set(MINGW_PREFIX "x86_64-w64-mingw32" CACHE STRING "目标三元组前缀") + +# 必须用 posix 线程模型:Flutter 的 C++ wrapper 依赖 std::mutex / std::thread, +# win32 线程模型下的 libstdc++ 不提供这些类型。 +find_program(MINGW_C NAMES ${MINGW_PREFIX}-gcc-posix ${MINGW_PREFIX}-gcc REQUIRED) +find_program(MINGW_CXX NAMES ${MINGW_PREFIX}-g++-posix ${MINGW_PREFIX}-g++ REQUIRED) +find_program(MINGW_RC NAMES ${MINGW_PREFIX}-windres REQUIRED) + +set(CMAKE_C_COMPILER "${MINGW_C}") +set(CMAKE_CXX_COMPILER "${MINGW_CXX}") +set(CMAKE_RC_COMPILER "${MINGW_RC}") + +set(CMAKE_FIND_ROOT_PATH "/usr/${MINGW_PREFIX}") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + +# 静态链接 libgcc / libstdc++ / winpthread,产物只依赖 flutter_windows.dll +# 和系统 DLL,拷到干净机器上也能跑。 +set(CMAKE_CXX_FLAGS_INIT "-DUNICODE -D_UNICODE -DNOMINMAX -D_HAS_EXCEPTIONS=1") +set(CMAKE_EXE_LINKER_FLAGS_INIT "-static -static-libgcc -static-libstdc++") diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index 7932f78..de9b65f 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -190,10 +190,9 @@ publish_backend() { -o "$ROOT_DIR/$OUT" || return 1 } -# 构建 Flutter 前端并把桌面产物放进平台目录。 -# Flutter 桌面只能在对应宿主平台上构建:Windows 产物必须在 Windows 上编, -# macOS 产物必须在 macOS 上编。交叉构建时这里只警告,包内不含前端, -# 启动器会自动回退到内置 Avalonia 界面。 +# 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS)。 +# macOS 版 Flutter 桌面只能在 macOS 上编;Windows 版则由 build_flutter_ui_cross +# 在 Linux/macOS 上交叉编译。 build_flutter_ui() { PLAT="$1"; DEST="$2" UI_SRC="$ROOT_DIR/GC-UI/frontend" @@ -222,6 +221,34 @@ build_flutter_ui() { echo " -> $DEST(Flutter ${PLAT})" } +# 在 Linux / macOS 上交叉编译 Windows 前端:mingw-w64 编 C++ 外壳, +# wine 跑 Windows 版 gen_snapshot 生成 AOT 快照,无需 Windows 机器。 +# 产物布局与官方 toolchain 完全一致(GC-UI.exe + flutter_windows.dll + data/)。 +build_flutter_ui_cross() { + DEST="$1" + UI_SRC="$ROOT_DIR/GC-UI/frontend" + [ -d "$UI_SRC" ] || return 0 + + FLUTTER_BIN="${FLUTTER_BIN:-flutter}" + if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then + echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定),本次包内不含 Flutter 界面" + return 0 + fi + + mkdir -p "$ROOT_DIR/build/logs" + echo "==> 交叉编译 Windows 前端(mingw-w64 + wine)" + if ! FLUTTER_BIN="$FLUTTER_BIN" bash "$ROOT_DIR/buildsh/cross/build-ui-win-cross.sh" \ + "$UI_SRC/build/windows/x64/runner/Release" \ + >"$ROOT_DIR/build/logs/flutter-win-cross.log" 2>&1; then + echo "!! 交叉编译失败,本次包内不含 Flutter 界面(日志:build/logs/flutter-win-cross.log)" + return 0 + fi + + mkdir -p "$ROOT_DIR/$DEST" + cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/" + echo " -> $DEST(Flutter windows,交叉编译)" +} + pack_launcher() { echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"