此前 build.sh 在非 Windows 宿主上把前端当「可选项」:flutter 缺失只告警、 交叉编译失败只告警、macOS 前端在 Linux 上直接跳过。结果是包照出,用户拿到 的是 Avalonia 回退界面,而构建日志里一行红字很容易被忽略。 改为默认必需: - build_flutter_ui / build_flutter_ui_cross 缺 flutter 或编译失败一律返回非 0, build.sh 立即中断并给出原因(交叉编译失败时带日志尾巴) - 确实要出降级包时显式声明 ./build.sh build --allow-no-ui 目标平台按构建主机决定,每条产物都带 Flutter: macOS 主机 → mac-arm64(Xcode 原生)+ win-amd64/win-arm64(mingw 交叉) Linux 主机 → linux-amd64(原生)+ win-amd64/win-arm64(mingw 交叉) Windows 主机 → win-amd64/win-arm64(原生) Linux 目标此前根本不存在,这次一并补上: - GC-UI/frontend/linux/ 由 flutter create 生成,BINARY_NAME=GC-UI、 APPLICATION_ID=com.xhmcl.GC、窗口标题 "Morris GC" - build_flutter_ui 增加 linux 分支,bundle(GC-UI + lib/ + data/)铺进 dist/linux-amd64/,pack_launcher 增加 Linux 整目录打包 - linux/CMakeLists.txt 强制 CMAKE_INSTALL_PREFIX 指向 build/.../bundle: 某些环境下它会被初始化成 /usr/local,导致 flutter 报「构建成功」但 bundle 是空的、产物装进了系统目录(本机实测踩到) 顺带修正两处: - 生成 settings.json 的默认 updateRepository 还是 gitcode 地址,与只保留 xhmcl 源的现状不符 - 进度条权重改为按实际目标动态计算,新平台不会再把总进度算过 100% 验证(Linux 主机,flutter 3.24.5): - ./build.sh build 出 win-amd64 109 MB、win-arm64 105 MB、linux-amd64 65 MB, 三份均含 Flutter 前端,清单签名 Verified - Linux 包在 Xvfb + llvmpipe 下实跑:后端 /api/health 返回 ok,GC-UI 窗口 正常渲染出模型库首页 - macOS 目标在 Linux 上不再产出 Avalonia 空壳包(要它得回 macOS 编)
125 lines
4.3 KiB
C++
125 lines
4.3 KiB
C++
#include "my_application.h"
|
|
|
|
#include <flutter_linux/flutter_linux.h>
|
|
#ifdef GDK_WINDOWING_X11
|
|
#include <gdk/gdkx.h>
|
|
#endif
|
|
|
|
#include "flutter/generated_plugin_registrant.h"
|
|
|
|
struct _MyApplication {
|
|
GtkApplication parent_instance;
|
|
char** dart_entrypoint_arguments;
|
|
};
|
|
|
|
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
|
|
|
|
// Implements GApplication::activate.
|
|
static void my_application_activate(GApplication* application) {
|
|
MyApplication* self = MY_APPLICATION(application);
|
|
GtkWindow* window =
|
|
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
|
|
|
|
// Use a header bar when running in GNOME as this is the common style used
|
|
// by applications and is the setup most users will be using (e.g. Ubuntu
|
|
// desktop).
|
|
// If running on X and not using GNOME then just use a traditional title bar
|
|
// in case the window manager does more exotic layout, e.g. tiling.
|
|
// If running on Wayland assume the header bar will work (may need changing
|
|
// if future cases occur).
|
|
gboolean use_header_bar = TRUE;
|
|
#ifdef GDK_WINDOWING_X11
|
|
GdkScreen* screen = gtk_window_get_screen(window);
|
|
if (GDK_IS_X11_SCREEN(screen)) {
|
|
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
|
|
if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
|
|
use_header_bar = FALSE;
|
|
}
|
|
}
|
|
#endif
|
|
if (use_header_bar) {
|
|
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
|
|
gtk_widget_show(GTK_WIDGET(header_bar));
|
|
gtk_header_bar_set_title(header_bar, "Morris GC");
|
|
gtk_header_bar_set_show_close_button(header_bar, TRUE);
|
|
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
|
|
} else {
|
|
gtk_window_set_title(window, "Morris GC");
|
|
}
|
|
|
|
gtk_window_set_default_size(window, 1280, 720);
|
|
gtk_widget_show(GTK_WIDGET(window));
|
|
|
|
g_autoptr(FlDartProject) project = fl_dart_project_new();
|
|
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
|
|
|
|
FlView* view = fl_view_new(project);
|
|
gtk_widget_show(GTK_WIDGET(view));
|
|
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
|
|
|
|
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
|
|
|
|
gtk_widget_grab_focus(GTK_WIDGET(view));
|
|
}
|
|
|
|
// Implements GApplication::local_command_line.
|
|
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
|
|
MyApplication* self = MY_APPLICATION(application);
|
|
// Strip out the first argument as it is the binary name.
|
|
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
|
|
|
|
g_autoptr(GError) error = nullptr;
|
|
if (!g_application_register(application, nullptr, &error)) {
|
|
g_warning("Failed to register: %s", error->message);
|
|
*exit_status = 1;
|
|
return TRUE;
|
|
}
|
|
|
|
g_application_activate(application);
|
|
*exit_status = 0;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
// Implements GApplication::startup.
|
|
static void my_application_startup(GApplication* application) {
|
|
//MyApplication* self = MY_APPLICATION(object);
|
|
|
|
// Perform any actions required at application startup.
|
|
|
|
G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
|
|
}
|
|
|
|
// Implements GApplication::shutdown.
|
|
static void my_application_shutdown(GApplication* application) {
|
|
//MyApplication* self = MY_APPLICATION(object);
|
|
|
|
// Perform any actions required at application shutdown.
|
|
|
|
G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
|
|
}
|
|
|
|
// Implements GObject::dispose.
|
|
static void my_application_dispose(GObject* object) {
|
|
MyApplication* self = MY_APPLICATION(object);
|
|
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
|
|
G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
|
|
}
|
|
|
|
static void my_application_class_init(MyApplicationClass* klass) {
|
|
G_APPLICATION_CLASS(klass)->activate = my_application_activate;
|
|
G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
|
|
G_APPLICATION_CLASS(klass)->startup = my_application_startup;
|
|
G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
|
|
G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
|
|
}
|
|
|
|
static void my_application_init(MyApplication* self) {}
|
|
|
|
MyApplication* my_application_new() {
|
|
return MY_APPLICATION(g_object_new(my_application_get_type(),
|
|
"application-id", APPLICATION_ID,
|
|
"flags", G_APPLICATION_NON_UNIQUE,
|
|
nullptr));
|
|
}
|