Skip to content

Commit

Permalink
Progress in Linux build with flutter
Browse files Browse the repository at this point in the history
  • Loading branch information
hkbinaurics committed May 20, 2024
1 parent 45388e0 commit 9dd7ffd
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 10 deletions.
1 change: 1 addition & 0 deletions cmake/fragments/thrdparty-early.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ if(JVX_FLUTTER_UI)
endif()
endif()


Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
ffi_allocate_backend_handle
ffi_deallocate_backend_handle

ffi_host_initialize
ffi_host_terminate

; ==========================================================================
ffi_req_command_decode_origin
ffi_req_command_decode_uid
ffi_req_command_decode_sswitch
ffi_req_command_decode_broadcast
ffi_req_command_decode_request_type
ffi_req_command_decode_ident_allocate_char_array
ffi_req_command_decode_sequencer_event

; ==========================================================================
ffi_periodic_trigger

; ==========================================================================
ffi_properties_request_handle
ffi_properties_return_handle
ffi_properties_number_properties
ffi_properties_descriptor_property_lin
ffi_properties_descriptor_property_descr
ffi_properties_string_to_array

ffi_properties_get_string_list
ffi_properties_get_selection_list
ffi_properties_get_content_property_fld
ffi_properties_get_string
ffi_properties_get_value_in_range

ffi_properties_set_content_property_fld
ffi_properties_set_selection_list
ffi_properties_set_single_string
ffi_properties_set_value_range

ffi_properties_set_collect_start
ffi_properties_set_collect_stop

; ==========================================================================
ffi_process_handle_for_uid
ffi_process_decode_iterator_context
ffi_process_iterator_next

ffi_process_decode_iterator_component
ffi_process_decode_iterator_module
ffi_process_decode_iterator_connector

ffi_process_system_ready

; ==========================================================================
ffi_config_save

; ==========================================================================

ffi_sequencer_status
ffi_sequencer_start
ffi_sequencer_stop
ffi_sequencer_ack_stop
ffi_sequencer_trigger

; ==========================================================================
ffi_component_description

ffi_component_number_components
ffi_component_number_devices
ffi_component_capabilities_device
ffi_component_selection_option
ffi_component_slot_allocation

ffi_select_component
ffi_activate_selected_component
ffi_deactivate_selected_component
ffi_unselect_selected_component

; ==========================================================================
; ==========================================================================

ffi_transfer_command

ffi_translate_enum_string
ffi_lookup_component_class
ffi_get_compile_flags
ffi_set_operation_flags

; ffi_get_native_config_parameters
; ffi_set_native_config_parameters

ffi_encode_component_identification

ffi_host_request_command_fwd
ffi_host_request_command_reschedule

ffi_simple_call
ffi_host_delete

ffi_last_error
ffi_preload_dll

InitDartApiDL

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ int ffi_host_initialize(void* opaque_hdl, const char** argv, int argc, func_poin

if (ll)
{
std::string alternativePath = JVX_GET_CURRENT_MODULE_PATH(&ffi_host_initialize); // JVX_GET_MODULE_FILENAME((LPCSTR)&ffi_host_initialize);
std::string alternativePath = JVX_GET_CURRENT_MODULE_PATH((void*)&ffi_host_initialize); // JVX_GET_MODULE_FILENAME((LPCSTR)&ffi_host_initialize);
if (!alternativePath.empty())
{
if (argc >= 1)
Expand Down
7 changes: 4 additions & 3 deletions sources/jvxLibraries/third_party/git/orc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ if(${JVX_OS} MATCHES "windows")

endif()

add_library(orcImport STATIC IMPORTED GLOBAL)
set_property(TARGET orcImport PROPERTY IMPORTED_LOCATION "${ORC_LIBRARIES}")

elseif(${JVX_OS} MATCHES "linux")

set(targetfolder orc)
Expand All @@ -64,6 +61,10 @@ elseif(${JVX_OS} MATCHES "linux")
set(ORC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/orc/glnx/include/orc-0.4" CACHE INTERNAL "orc include directory")
set(ORC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/orc/glnx/lib/x86_64-linux-gnu/liborc-0.4.a" CACHE INTERNAL "orc libraries")
set(ORCC "${CMAKE_SOURCE_DIR}/sources/jvxLibraries/third_party/git/orc/orc/glnx/bin/orcc" CACHE INTERNAL "orc compiler")

endif()

add_library(orcImport STATIC IMPORTED GLOBAL)
set_property(TARGET orcImport PROPERTY IMPORTED_LOCATION "${ORC_LIBRARIES}")

## message(FATAL_ERROR "Stop here!")
10 changes: 9 additions & 1 deletion sources/jvxLibraries/third_party/web/flutter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@ set(PROJECT_NAME flutter)
include(${JVX_CMAKE_DIR}/common_local_lib_head.cmake)

set(JVX_FLUTTER_VERSION "3.7.4")

if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/flutter)
message("flutter sub project not available. Starting script to download it.")
message("Make sure you will add ${CMAKE_CURRENT_SOURCE_DIR}/flutter-${JVX_FLUTTER_VERSION}/bin to the PATH environment variable!")
message("Make sure you will set FLUTTER_SDK_PATH=${CMAKE_CURRENT_SOURCE_DIR}/flutter-${JVX_FLUTTER_VERSION} in your compile script!")
execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-win.sh; exit")
if(${JVX_OS} MATCHES "windows")
execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-win.sh; exit")
elseif(${JVX_OS} MATCHES "linux")
execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-glnx.sh; exit")
else()
message(FATAL_ERROR "Flutter activated for platform ${JVX_OS} which is not supported yet.")
endif()
message("flutter installation complete.")
endif()

# message(FATAL_ERROR "Check flutter installation here!")
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

if [ ! -d "flutter-3.7.4" ]; then

curl -kLSs https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.7.4-stable.tar.xz -o flutter.tar.xz
xz -d flutter.tar.xz
tar -xf flutter.tar
sleep 1
mv flutter flutter-3.7.4
rm flutter.tar
fi


0 comments on commit 9dd7ffd

Please sign in to comment.