From 849ba844aa11e72afbc03e916576907c045e1671 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Thu, 16 Jun 2022 20:27:38 -0700 Subject: [PATCH 1/4] Try linux runner build --- .appveyor.yml | 157 +++++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 73 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7afd46d1b..013a0a030 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,56 +20,60 @@ environment: secure: V9nRzVDlIGS0a+dhkC2/vw== matrix: - - job_name: Build Flet for Windows - job_group: build_flet - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + # - job_name: Build Flet for Windows + # job_group: build_flet + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - job_name: Build Flet for macOS - job_group: build_flet - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + # - job_name: Build Flet for macOS + # job_group: build_flet + # APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey - - job_name: Build Flet for iOS + - job_name: Build Flet for Linux job_group: build_flet - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey - - - job_name: Build Fletd - job_group: build_flet - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - - job_name: Test Python 3.7 - job_group: python_tests - job_depends_on: build_flet - python_version: 3.7 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - - job_name: Test Python 3.8 - job_group: python_tests - job_depends_on: build_flet - python_version: 3.8 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - - job_name: Test Python 3.9 - job_group: python_tests - job_depends_on: build_flet - python_version: 3.9 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - - job_name: Test Python 3.10 - job_group: python_tests - job_depends_on: build_flet - python_version: 3.10 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - - job_name: Build Python wheels - job_group: python_build - job_depends_on: python_tests - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - TWINE_USERNAME: __token__ - TWINE_NON_INTERACTIVE: true - pypi_key: - secure: 174ncAbF5IjSIkmioPt62jeSnzmTlRNchUkE4QdjDWH8xK1olYtySXLJpo2q95HcP7lWJky1hv4APESiRRHnBWoY0XRFafzM/mbCDMzG1tZXiXZmpP1qzHAtRP2QSCIg18xh1TMktraUdTi7sbJnjjRhqzgbW1k0kLBxKw79MPFBhYQ/TiGcmaYWZbWVZNY3HCUCb6Dt7bG1OE2Ul9rD1gvs55xwO9Oq9FOVA1VnMYw= - test_pypi_key: - secure: cMCzqE9PcLcAiQ7POU0eVmLsXpy/n3WA9USIQNDKKbvUeajtURVITKpQ4MmwUXZAGv8giPPDUppiIf22AwIfx3O43tBVCp/HjvKNCbgY8sTaQBx60mLRbVBfD1F/+VfeuSTm57qtuSxUkZWF1JlWp8UQqIwCMHHDd0/wqDfmPNKj6U617Lp3vIfhsfgaDofspCKSGfG8+Z+6gcpmI+mA1wFHQB+l/BAbsGbgih8HiH6EzcuyIphxQKEA6r2XDPWE + APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2004 + + # - job_name: Build Flet for iOS + # job_group: build_flet + # APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + + # - job_name: Build Fletd + # job_group: build_flet + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + # - job_name: Test Python 3.7 + # job_group: python_tests + # job_depends_on: build_flet + # python_version: 3.7 + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + # - job_name: Test Python 3.8 + # job_group: python_tests + # job_depends_on: build_flet + # python_version: 3.8 + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + # - job_name: Test Python 3.9 + # job_group: python_tests + # job_depends_on: build_flet + # python_version: 3.9 + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + # - job_name: Test Python 3.10 + # job_group: python_tests + # job_depends_on: build_flet + # python_version: 3.10 + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + # - job_name: Build Python wheels + # job_group: python_build + # job_depends_on: python_tests + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + # TWINE_USERNAME: __token__ + # TWINE_NON_INTERACTIVE: true + # pypi_key: + # secure: 174ncAbF5IjSIkmioPt62jeSnzmTlRNchUkE4QdjDWH8xK1olYtySXLJpo2q95HcP7lWJky1hv4APESiRRHnBWoY0XRFafzM/mbCDMzG1tZXiXZmpP1qzHAtRP2QSCIg18xh1TMktraUdTi7sbJnjjRhqzgbW1k0kLBxKw79MPFBhYQ/TiGcmaYWZbWVZNY3HCUCb6Dt7bG1OE2Ul9rD1gvs55xwO9Oq9FOVA1VnMYw= + # test_pypi_key: + # secure: cMCzqE9PcLcAiQ7POU0eVmLsXpy/n3WA9USIQNDKKbvUeajtURVITKpQ4MmwUXZAGv8giPPDUppiIf22AwIfx3O43tBVCp/HjvKNCbgY8sTaQBx60mLRbVBfD1F/+VfeuSTm57qtuSxUkZWF1JlWp8UQqIwCMHHDd0/wqDfmPNKj6U617Lp3vIfhsfgaDofspCKSGfG8+Z+6gcpmI+mA1wFHQB+l/BAbsGbgih8HiH6EzcuyIphxQKEA6r2XDPWE matrix: fast_finish: true @@ -157,6 +161,39 @@ for: on: APPVEYOR_REPO_TAG: true + # ====================================== + # Build Flet View for Linux + # ====================================== + + - matrix: + only: + - job_name: Build Flet for Linux + + install: + # Flutter SDK + - sudo snap install flutter --classic + - flutter sdk-path + - flutter --version + + build_script: + - cd client + - flutter test + - flutter build linux + - mv build/linux/x64/release/bundle build/linux/x64/release/flet + - tar -czvf flet.tar.gz -C build/linux/x64/release flet + + artifacts: + - path: client/flet.tar.gz + name: flet_linux + + deploy: + provider: GitHub + auth_token: $(GITHUB_TOKEN) + release: $(APPVEYOR_REPO_TAG_NAME) + artifact: flet_linux + on: + APPVEYOR_REPO_TAG: true + # ====================================== # Build Flet View for iOS # ====================================== @@ -201,32 +238,6 @@ for: - path: client/build/flet.ipa name: flet_ios - # ====================================== - # Linux - # ====================================== - - # - matrix: - # only: - # - job_name: Linux - - # install: - # - gvm install go${GO_VERSION} -B - # - gvm use go${GO_VERSION} - # - go version - - # build_script: - # - nvm use 12 - # - cd client - # - yarn - # - yarn build - # - cd .. - # - cp -rf client/build/* server/content - # - ./build.sh - # - ls $GOPATH/bin - - # test_script: - # - ./run-tests.sh - # ====================================== # Build Fletd # ====================================== From fa891977eeea5a33996d617f15b4ebfd9f7da992 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Thu, 16 Jun 2022 20:32:00 -0700 Subject: [PATCH 2/4] Added Linux project --- client/.metadata | 12 +- client/linux/.gitignore | 1 + client/linux/CMakeLists.txt | 138 ++++++++++++++++++ client/linux/flutter/CMakeLists.txt | 88 +++++++++++ .../flutter/generated_plugin_registrant.cc | 15 ++ .../flutter/generated_plugin_registrant.h | 15 ++ client/linux/flutter/generated_plugins.cmake | 24 +++ client/linux/main.cc | 6 + client/linux/my_application.cc | 104 +++++++++++++ client/linux/my_application.h | 18 +++ 10 files changed, 415 insertions(+), 6 deletions(-) create mode 100644 client/linux/.gitignore create mode 100644 client/linux/CMakeLists.txt create mode 100644 client/linux/flutter/CMakeLists.txt create mode 100644 client/linux/flutter/generated_plugin_registrant.cc create mode 100644 client/linux/flutter/generated_plugin_registrant.h create mode 100644 client/linux/flutter/generated_plugins.cmake create mode 100644 client/linux/main.cc create mode 100644 client/linux/my_application.cc create mode 100644 client/linux/my_application.h diff --git a/client/.metadata b/client/.metadata index 8bb66d200..5b87af837 100644 --- a/client/.metadata +++ b/client/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + revision: cd41fdd495f6944ecd3506c21e94c6567b073278 channel: stable project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - - platform: android - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278 + base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278 + - platform: linux + create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278 + base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278 # User provided section diff --git a/client/linux/.gitignore b/client/linux/.gitignore new file mode 100644 index 000000000..d3896c984 --- /dev/null +++ b/client/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/client/linux/CMakeLists.txt b/client/linux/CMakeLists.txt new file mode 100644 index 000000000..dfb08c873 --- /dev/null +++ b/client/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "flet") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.appveyor.flet") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/client/linux/flutter/CMakeLists.txt b/client/linux/flutter/CMakeLists.txt new file mode 100644 index 000000000..d5bd01648 --- /dev/null +++ b/client/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/client/linux/flutter/generated_plugin_registrant.cc b/client/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..5a6c00611 --- /dev/null +++ b/client/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) window_manager_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); + window_manager_plugin_register_with_registrar(window_manager_registrar); +} diff --git a/client/linux/flutter/generated_plugin_registrant.h b/client/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..e0f0a47bc --- /dev/null +++ b/client/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/client/linux/flutter/generated_plugins.cmake b/client/linux/flutter/generated_plugins.cmake new file mode 100644 index 000000000..a8a4fcb06 --- /dev/null +++ b/client/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + window_manager +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/client/linux/main.cc b/client/linux/main.cc new file mode 100644 index 000000000..e7c5c5437 --- /dev/null +++ b/client/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/client/linux/my_application.cc b/client/linux/my_application.cc new file mode 100644 index 000000000..e8e895bee --- /dev/null +++ b/client/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#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, "flet"); + 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, "flet"); + } + + 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 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_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)); +} diff --git a/client/linux/my_application.h b/client/linux/my_application.h new file mode 100644 index 000000000..72271d5e4 --- /dev/null +++ b/client/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ From 20c5daf8bfb0a415230ed1730ae927b1beb27d17 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Thu, 16 Jun 2022 21:05:34 -0700 Subject: [PATCH 3/4] Bundle Flet Linux --- .appveyor.yml | 96 +++++++++++++++++++------------------- sdk/python/build-wheels.py | 3 ++ sdk/python/flet/flet.py | 34 +++++++++++++- sdk/python/flet/utils.py | 4 ++ 4 files changed, 88 insertions(+), 49 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 013a0a030..b6c58e0e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,60 +20,60 @@ environment: secure: V9nRzVDlIGS0a+dhkC2/vw== matrix: - # - job_name: Build Flet for Windows - # job_group: build_flet - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + - job_name: Build Flet for Windows + job_group: build_flet + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - # - job_name: Build Flet for macOS - # job_group: build_flet - # APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + - job_name: Build Flet for macOS + job_group: build_flet + APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey - job_name: Build Flet for Linux job_group: build_flet APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2004 - # - job_name: Build Flet for iOS - # job_group: build_flet - # APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey - - # - job_name: Build Fletd - # job_group: build_flet - # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - # - job_name: Test Python 3.7 - # job_group: python_tests - # job_depends_on: build_flet - # python_version: 3.7 - # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - # - job_name: Test Python 3.8 - # job_group: python_tests - # job_depends_on: build_flet - # python_version: 3.8 - # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - # - job_name: Test Python 3.9 - # job_group: python_tests - # job_depends_on: build_flet - # python_version: 3.9 - # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - # - job_name: Test Python 3.10 - # job_group: python_tests - # job_depends_on: build_flet - # python_version: 3.10 - # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - - # - job_name: Build Python wheels - # job_group: python_build - # job_depends_on: python_tests - # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - # TWINE_USERNAME: __token__ - # TWINE_NON_INTERACTIVE: true - # pypi_key: - # secure: 174ncAbF5IjSIkmioPt62jeSnzmTlRNchUkE4QdjDWH8xK1olYtySXLJpo2q95HcP7lWJky1hv4APESiRRHnBWoY0XRFafzM/mbCDMzG1tZXiXZmpP1qzHAtRP2QSCIg18xh1TMktraUdTi7sbJnjjRhqzgbW1k0kLBxKw79MPFBhYQ/TiGcmaYWZbWVZNY3HCUCb6Dt7bG1OE2Ul9rD1gvs55xwO9Oq9FOVA1VnMYw= - # test_pypi_key: - # secure: cMCzqE9PcLcAiQ7POU0eVmLsXpy/n3WA9USIQNDKKbvUeajtURVITKpQ4MmwUXZAGv8giPPDUppiIf22AwIfx3O43tBVCp/HjvKNCbgY8sTaQBx60mLRbVBfD1F/+VfeuSTm57qtuSxUkZWF1JlWp8UQqIwCMHHDd0/wqDfmPNKj6U617Lp3vIfhsfgaDofspCKSGfG8+Z+6gcpmI+mA1wFHQB+l/BAbsGbgih8HiH6EzcuyIphxQKEA6r2XDPWE + - job_name: Build Flet for iOS + job_group: build_flet + APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + + - job_name: Build Fletd + job_group: build_flet + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + - job_name: Test Python 3.7 + job_group: python_tests + job_depends_on: build_flet + python_version: 3.7 + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + - job_name: Test Python 3.8 + job_group: python_tests + job_depends_on: build_flet + python_version: 3.8 + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + - job_name: Test Python 3.9 + job_group: python_tests + job_depends_on: build_flet + python_version: 3.9 + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + - job_name: Test Python 3.10 + job_group: python_tests + job_depends_on: build_flet + python_version: 3.10 + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + + - job_name: Build Python wheels + job_group: python_build + job_depends_on: python_tests + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + TWINE_USERNAME: __token__ + TWINE_NON_INTERACTIVE: true + pypi_key: + secure: 174ncAbF5IjSIkmioPt62jeSnzmTlRNchUkE4QdjDWH8xK1olYtySXLJpo2q95HcP7lWJky1hv4APESiRRHnBWoY0XRFafzM/mbCDMzG1tZXiXZmpP1qzHAtRP2QSCIg18xh1TMktraUdTi7sbJnjjRhqzgbW1k0kLBxKw79MPFBhYQ/TiGcmaYWZbWVZNY3HCUCb6Dt7bG1OE2Ul9rD1gvs55xwO9Oq9FOVA1VnMYw= + test_pypi_key: + secure: cMCzqE9PcLcAiQ7POU0eVmLsXpy/n3WA9USIQNDKKbvUeajtURVITKpQ4MmwUXZAGv8giPPDUppiIf22AwIfx3O43tBVCp/HjvKNCbgY8sTaQBx60mLRbVBfD1F/+VfeuSTm57qtuSxUkZWF1JlWp8UQqIwCMHHDd0/wqDfmPNKj6U617Lp3vIfhsfgaDofspCKSGfG8+Z+6gcpmI+mA1wFHQB+l/BAbsGbgih8HiH6EzcuyIphxQKEA6r2XDPWE matrix: fast_finish: true diff --git a/sdk/python/build-wheels.py b/sdk/python/build-wheels.py index 1d1f3b487..c980a1b60 100644 --- a/sdk/python/build-wheels.py +++ b/sdk/python/build-wheels.py @@ -44,6 +44,9 @@ "Linux amd64": { "fletd_asset": "linux_amd64", "fletd_exec": "fletd", + "flet_client_job": "Build Flet for Linux", + "flet_client_artifact": "flet_linux", + "flet_client_filename": "flet.tar.gz", "wheel_tags": [ "py3-none-manylinux_2_17_x86_64", "py3-none-manylinux2014_x86_64", diff --git a/sdk/python/flet/flet.py b/sdk/python/flet/flet.py index 5a159d7c3..b079a55ee 100644 --- a/sdk/python/flet/flet.py +++ b/sdk/python/flet/flet.py @@ -101,7 +101,7 @@ def exit_gracefully(signum, frame): fvp = None - if view == FLET_APP and not is_linux(): + if view == FLET_APP and not is_linux_server(): fvp = _open_flet_view(conn.page_url) try: fvp.wait() @@ -333,6 +333,26 @@ def _open_flet_view(page_url): app_path = temp_flet_dir.joinpath("Flet.app") args = ["open", str(app_path), "-W", "--args", page_url] + elif is_linux(): + # build version-specific path to flet folder + temp_flet_dir = Path(tempfile.gettempdir()).joinpath(f"flet-{version.version}") + + # check if flet_view.app exists in a temp directory + if not temp_flet_dir.exists(): + # check if flet.tar.gz exists + tar_file = Path(__file__).parent.joinpath("bin", "flet.tar.gz") + if not tar_file.exists(): + tar_file = _download_flet_view_linux() + + logging.info(f"Extracting Flet from archive to {temp_flet_dir}") + temp_flet_dir.mkdir(parents=True, exist_ok=True) + with tarfile.open(str(tar_file), "r:gz") as tar_arch: + tar_arch.extractall(str(temp_flet_dir)) + else: + logging.info(f"Flet View found in PATH: {temp_flet_dir}") + + app_path = temp_flet_dir.joinpath("flet", "flet") + args = [str(app_path), page_url] # execute process return subprocess.Popen(args) @@ -421,6 +441,18 @@ def _download_flet_view_macos(): return str(temp_arch) +def _download_flet_view_linux(): + ver = version.version + + file_name = "flet.tar.gz" + temp_arch = Path(tempfile.gettempdir()).joinpath(file_name) + print(f"Downloading Flet v{ver} to {temp_arch}") + flet_url = f"https://github.com/flet-dev/flet/releases/download/v{ver}/{file_name}" + + urllib.request.urlretrieve(flet_url, temp_arch) + return str(temp_arch) + + # not currently used, but maybe useful in the future def _get_latest_flet_release(): releases = json.loads( diff --git a/sdk/python/flet/utils.py b/sdk/python/flet/utils.py index 6a12e8f18..f2f20b93c 100644 --- a/sdk/python/flet/utils.py +++ b/sdk/python/flet/utils.py @@ -12,6 +12,10 @@ def is_linux(): return platform.system() == "Linux" +def is_linux_server(): + return platform.system() == "Linux" and os.environ.get("DESKTOP_SESSION") == None + + def is_macos(): return platform.system() == "Darwin" From 7fe1b199e6a36d46ed26839be6a25a4338700c0b Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Thu, 16 Jun 2022 21:07:41 -0700 Subject: [PATCH 4/4] Use XDG_CURRENT_DESKTOP --- sdk/python/flet/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/python/flet/utils.py b/sdk/python/flet/utils.py index f2f20b93c..ef39ba64f 100644 --- a/sdk/python/flet/utils.py +++ b/sdk/python/flet/utils.py @@ -13,7 +13,9 @@ def is_linux(): def is_linux_server(): - return platform.system() == "Linux" and os.environ.get("DESKTOP_SESSION") == None + return ( + platform.system() == "Linux" and os.environ.get("XDG_CURRENT_DESKTOP") == None + ) def is_macos():