From 9dcf3de1384baf30f961e13002f31e459d4a2285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hauke=20Kr=C3=BCger?= Date: Thu, 16 May 2024 19:54:00 +0200 Subject: [PATCH] More cleanup to add flutter UI to sub projects --- .../linux/exports-flutter-native-config.def | 0 .../macosx/exports-flutter-native-config.def | 0 .../windows/exports-flutter-native-config.def | 0 .../include/generic-native-config.h.in | 9 +++++++ .../src/generic-config-hook.cpp.in | 27 +++++++++++++++++++ .../.gitignore | 0 .../.metadata | 0 .../CHANGELOG.md | 0 .../LICENSE | 0 .../README.md | 0 .../analysis_options.yaml | 0 .../android/.gitignore | 0 .../android/build.gradle | 0 .../android/settings.gradle | 0 .../android/src/main/AndroidManifest.xml | 0 .../ayfcorepack/AyfcorepackPlugin.kt | 0 .../ios/.gitignore | 0 .../ios/Assets/.gitkeep | 0 .../ios/Classes/AyfcorepackPlugin.h | 0 .../ios/Classes/AyfcorepackPlugin.m | 0 .../ios/Classes/SwiftAyfcorepackPlugin.swift | 0 .../ios/ayfcorepack.podspec | 0 .../lib/ayfcorepack.dart | 0 .../lib/ayfcorepack_method_channel.dart | 0 .../lib/ayfcorepack_platform_interface.dart | 0 .../linux/CMakeLists.txt | 0 .../macos/Classes/AyfcorepackPlugin.swift | 0 .../macos/ayfcorepack.podspec | 0 .../pubspec.yaml | 0 .../test/ayfcorepack_method_channel_test.dart | 0 .../test/ayfcorepack_test.dart | 0 .../windows/.gitignore | 0 .../windows/CMakeLists.txt | 2 +- .../windows/ayf-sdk-local-headers.h | 0 .../windows/ayfcorepack_plugin.cpp | 0 .../windows/ayfcorepack_plugin.h | 0 .../windows/ayfcorepack_plugin_c_api.cpp | 0 .../ayfcorepack/ayfcorepack_plugin_c_api.h | 0 .../flutter/starter_app/example/pubspec.yaml | 2 +- .../example/windows/runner/main.cpp | 2 +- .../post_install/install_flutter_app.sh | 22 +++++++++------ .../ayfstarter-native-config/CMakeLists.txt | 5 +++- .../include/ayfstarter-native-config.h | 6 ++--- .../src/ayfstarter-config-hook.cpp | 2 +- 44 files changed, 61 insertions(+), 16 deletions(-) rename {sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config => software/codeFragments/jvxApplications/native-config}/exports/linux/exports-flutter-native-config.def (100%) rename {sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config => software/codeFragments/jvxApplications/native-config}/exports/macosx/exports-flutter-native-config.def (100%) rename {sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config => software/codeFragments/jvxApplications/native-config}/exports/windows/exports-flutter-native-config.def (100%) create mode 100644 software/codeFragments/jvxApplications/native-config/include/generic-native-config.h.in create mode 100644 software/codeFragments/jvxApplications/native-config/src/generic-config-hook.cpp.in rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/.gitignore (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/.metadata (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/CHANGELOG.md (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/LICENSE (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/README.md (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/analysis_options.yaml (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/android/.gitignore (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/android/build.gradle (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/android/settings.gradle (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/android/src/main/AndroidManifest.xml (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/android/src/main/kotlin/com/binauricsaudio/ayfcorepack/AyfcorepackPlugin.kt (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/ios/.gitignore (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/ios/Assets/.gitkeep (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/ios/Classes/AyfcorepackPlugin.h (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/ios/Classes/AyfcorepackPlugin.m (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/ios/Classes/SwiftAyfcorepackPlugin.swift (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/ios/ayfcorepack.podspec (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/lib/ayfcorepack.dart (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/lib/ayfcorepack_method_channel.dart (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/lib/ayfcorepack_platform_interface.dart (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/linux/CMakeLists.txt (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/macos/Classes/AyfcorepackPlugin.swift (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/macos/ayfcorepack.podspec (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/pubspec.yaml (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/test/ayfcorepack_method_channel_test.dart (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/test/ayfcorepack_test.dart (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/.gitignore (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/CMakeLists.txt (97%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/ayf-sdk-local-headers.h (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/ayfcorepack_plugin.cpp (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/ayfcorepack_plugin.h (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/ayfcorepack_plugin_c_api.cpp (100%) rename sources/sub-projects/ayfstarter/flutter/{starter_core_pack => ayf_starter_corepack}/windows/include/ayfcorepack/ayfcorepack_plugin_c_api.h (100%) diff --git a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/exports/linux/exports-flutter-native-config.def b/software/codeFragments/jvxApplications/native-config/exports/linux/exports-flutter-native-config.def similarity index 100% rename from sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/exports/linux/exports-flutter-native-config.def rename to software/codeFragments/jvxApplications/native-config/exports/linux/exports-flutter-native-config.def diff --git a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/exports/macosx/exports-flutter-native-config.def b/software/codeFragments/jvxApplications/native-config/exports/macosx/exports-flutter-native-config.def similarity index 100% rename from sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/exports/macosx/exports-flutter-native-config.def rename to software/codeFragments/jvxApplications/native-config/exports/macosx/exports-flutter-native-config.def diff --git a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/exports/windows/exports-flutter-native-config.def b/software/codeFragments/jvxApplications/native-config/exports/windows/exports-flutter-native-config.def similarity index 100% rename from sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/exports/windows/exports-flutter-native-config.def rename to software/codeFragments/jvxApplications/native-config/exports/windows/exports-flutter-native-config.def diff --git a/software/codeFragments/jvxApplications/native-config/include/generic-native-config.h.in b/software/codeFragments/jvxApplications/native-config/include/generic-native-config.h.in new file mode 100644 index 00000000..769e466d --- /dev/null +++ b/software/codeFragments/jvxApplications/native-config/include/generic-native-config.h.in @@ -0,0 +1,9 @@ +#ifndef __AYF_NATIVE_CONFIG_H__ +#define __AYF_NATIVE_CONFIG_H__ + +extern "C" +{ + jvxErrorType flutter_config_open(native_host_configure_func_pointers* fcPtr); +} + +#endif \ No newline at end of file diff --git a/software/codeFragments/jvxApplications/native-config/src/generic-config-hook.cpp.in b/software/codeFragments/jvxApplications/native-config/src/generic-config-hook.cpp.in new file mode 100644 index 00000000..9b0766e1 --- /dev/null +++ b/software/codeFragments/jvxApplications/native-config/src/generic-config-hook.cpp.in @@ -0,0 +1,27 @@ +#include "jvx.h" +#include "flutter_native_host_config.h" + +extern "C" +{ + extern jvxErrorType jvx_access_link_objects(jvxInitObject_tp* funcInit, jvxTerminateObject_tp* funcTerm, jvxApiString* adescr, jvxComponentType tp, jvxSize id); + extern jvxErrorType jvx_default_connection_rules_add(IjvxDataConnections* theDataConnectionDefRule); + extern jvxErrorType jvx_default_sequence_add(IjvxSequencer* theSeq); + extern jvxErrorType jvx_configure_factoryhost_features(configureFactoryHost_features* features); + extern jvxErrorType jvx_invalidate_factoryhost_features(configureFactoryHost_features* features); +} + +extern "C" +{ + jvxErrorType flutter_config_open(native_host_configure_func_pointers* fcPtr) + { + if (fcPtr) + { + fcPtr->access_link_objects = jvx_access_link_objects; + fcPtr->configure_factoryhost_features = jvx_configure_factoryhost_features; + fcPtr->invalidate_factoryhost_features = jvx_invalidate_factoryhost_features; + fcPtr->default_connection_rules_add = jvx_default_connection_rules_add; + fcPtr->default_sequence_add = jvx_default_sequence_add; + } + return JVX_NO_ERROR; + } +} \ No newline at end of file diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/.gitignore b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/.gitignore similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/.gitignore rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/.gitignore diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/.metadata b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/.metadata similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/.metadata rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/.metadata diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/CHANGELOG.md b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/CHANGELOG.md similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/CHANGELOG.md rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/CHANGELOG.md diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/LICENSE b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/LICENSE similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/LICENSE rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/LICENSE diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/README.md b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/README.md similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/README.md rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/README.md diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/analysis_options.yaml b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/analysis_options.yaml similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/analysis_options.yaml rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/analysis_options.yaml diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/.gitignore b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/.gitignore similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/.gitignore rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/.gitignore diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/build.gradle b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/build.gradle similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/build.gradle rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/build.gradle diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/settings.gradle b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/settings.gradle similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/settings.gradle rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/settings.gradle diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/src/main/AndroidManifest.xml b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/src/main/AndroidManifest.xml similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/src/main/AndroidManifest.xml rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/src/main/AndroidManifest.xml diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/src/main/kotlin/com/binauricsaudio/ayfcorepack/AyfcorepackPlugin.kt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/src/main/kotlin/com/binauricsaudio/ayfcorepack/AyfcorepackPlugin.kt similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/android/src/main/kotlin/com/binauricsaudio/ayfcorepack/AyfcorepackPlugin.kt rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/android/src/main/kotlin/com/binauricsaudio/ayfcorepack/AyfcorepackPlugin.kt diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/.gitignore b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/.gitignore similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/.gitignore rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/.gitignore diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Assets/.gitkeep b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Assets/.gitkeep similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Assets/.gitkeep rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Assets/.gitkeep diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Classes/AyfcorepackPlugin.h b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Classes/AyfcorepackPlugin.h similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Classes/AyfcorepackPlugin.h rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Classes/AyfcorepackPlugin.h diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Classes/AyfcorepackPlugin.m b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Classes/AyfcorepackPlugin.m similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Classes/AyfcorepackPlugin.m rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Classes/AyfcorepackPlugin.m diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Classes/SwiftAyfcorepackPlugin.swift b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Classes/SwiftAyfcorepackPlugin.swift similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/Classes/SwiftAyfcorepackPlugin.swift rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/Classes/SwiftAyfcorepackPlugin.swift diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/ayfcorepack.podspec b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/ayfcorepack.podspec similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/ios/ayfcorepack.podspec rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/ios/ayfcorepack.podspec diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/lib/ayfcorepack.dart b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/lib/ayfcorepack.dart similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/lib/ayfcorepack.dart rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/lib/ayfcorepack.dart diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/lib/ayfcorepack_method_channel.dart b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/lib/ayfcorepack_method_channel.dart similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/lib/ayfcorepack_method_channel.dart rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/lib/ayfcorepack_method_channel.dart diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/lib/ayfcorepack_platform_interface.dart b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/lib/ayfcorepack_platform_interface.dart similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/lib/ayfcorepack_platform_interface.dart rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/lib/ayfcorepack_platform_interface.dart diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/linux/CMakeLists.txt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/CMakeLists.txt similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/linux/CMakeLists.txt rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/CMakeLists.txt diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/macos/Classes/AyfcorepackPlugin.swift b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/macos/Classes/AyfcorepackPlugin.swift similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/macos/Classes/AyfcorepackPlugin.swift rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/macos/Classes/AyfcorepackPlugin.swift diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/macos/ayfcorepack.podspec b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/macos/ayfcorepack.podspec similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/macos/ayfcorepack.podspec rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/macos/ayfcorepack.podspec diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/pubspec.yaml b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/pubspec.yaml similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/pubspec.yaml rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/pubspec.yaml diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/test/ayfcorepack_method_channel_test.dart b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/test/ayfcorepack_method_channel_test.dart similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/test/ayfcorepack_method_channel_test.dart rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/test/ayfcorepack_method_channel_test.dart diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/test/ayfcorepack_test.dart b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/test/ayfcorepack_test.dart similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/test/ayfcorepack_test.dart rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/test/ayfcorepack_test.dart diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/.gitignore b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/.gitignore similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/.gitignore rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/.gitignore diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/CMakeLists.txt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt similarity index 97% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/CMakeLists.txt rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt index 4b32b195..be2d381c 100644 --- a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/CMakeLists.txt +++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt @@ -42,7 +42,7 @@ list(APPEND PLUGIN_SOURCES "ayfcorepack_plugin.cpp" "ayfcorepack_plugin.h" "ayf-sdk-local-headers.h" - "${AYF_SDK_PATH}/include/${AYF_CORE_PACK_INCLUDE}/exports/windows/exports-flutter-native-config.def" + "${AYF_SDK_PATH}/software/codeFragments/jvxApplications/native-config/exports/windows/exports-flutter-native-config.def" "${AYF_SDK_PATH}/include/${AYF_CORE_PACK_INCLUDE}/include/ayfstarter-native-config.h" ) diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayf-sdk-local-headers.h b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayf-sdk-local-headers.h similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayf-sdk-local-headers.h rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayf-sdk-local-headers.h diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayfcorepack_plugin.cpp b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.cpp similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayfcorepack_plugin.cpp rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.cpp diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayfcorepack_plugin.h b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.h similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayfcorepack_plugin.h rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.h diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayfcorepack_plugin_c_api.cpp b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin_c_api.cpp similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/ayfcorepack_plugin_c_api.cpp rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin_c_api.cpp diff --git a/sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/include/ayfcorepack/ayfcorepack_plugin_c_api.h b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/include/ayfcorepack/ayfcorepack_plugin_c_api.h similarity index 100% rename from sources/sub-projects/ayfstarter/flutter/starter_core_pack/windows/include/ayfcorepack/ayfcorepack_plugin_c_api.h rename to sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/include/ayfcorepack/ayfcorepack_plugin_c_api.h diff --git a/sources/sub-projects/ayfstarter/flutter/starter_app/example/pubspec.yaml b/sources/sub-projects/ayfstarter/flutter/starter_app/example/pubspec.yaml index 72663b16..567d0123 100644 --- a/sources/sub-projects/ayfstarter/flutter/starter_app/example/pubspec.yaml +++ b/sources/sub-projects/ayfstarter/flutter/starter_app/example/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: path: '../../../../../../flutter/ayf_pack_native' ayfcorepack: - path: '../../starter_core_pack' + path: '../../ayf_starter_corepack' ayfstarter: path: '../' diff --git a/sources/sub-projects/ayfstarter/flutter/starter_app/example/windows/runner/main.cpp b/sources/sub-projects/ayfstarter/flutter/starter_app/example/windows/runner/main.cpp index ea92aa2c..cd380a36 100644 --- a/sources/sub-projects/ayfstarter/flutter/starter_app/example/windows/runner/main.cpp +++ b/sources/sub-projects/ayfstarter/flutter/starter_app/example/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"ayf_pack_example", origin, size)) { + if (!window.CreateAndShow(L"ayfstarter_app", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/sources/sub-projects/ayfstarter/post_install/install_flutter_app.sh b/sources/sub-projects/ayfstarter/post_install/install_flutter_app.sh index 6113fde2..a8cdedc8 100644 --- a/sources/sub-projects/ayfstarter/post_install/install_flutter_app.sh +++ b/sources/sub-projects/ayfstarter/post_install/install_flutter_app.sh @@ -28,16 +28,22 @@ echo "Running zip release with path=$PATH" echo "flutter build $2" flutter build $2 -echo cp $1/.$3.env build/$sysfolder/runner/Release/data/flutter_assets -cp $1/.$3.env build/$sysfolder/runner/Release/data/flutter_assets +if [[ "$2" == "web" ]] +then + # What to do here?? + echo "Compiling for target web" +else + echo cp $1/.$3.env build/$sysfolder/runner/Release/data/flutter_assets + cp $1/.$3.env build/$sysfolder/runner/Release/data/flutter_assets -if [ -d "$4/$3" ]; then - echo "rm -rf $4/$3" - rm -rf $4/$3 -fi + if [ -d "$4/$3" ]; then + echo "rm -rf $4/$3" + rm -rf $4/$3 + fi -echo "mv build/$sysfolder/runner/Release $4/$3" -mv build/$sysfolder/runner/Release $4/$3 + echo "mv build/$sysfolder/runner/Release $4/$3" + mv build/$sysfolder/runner/Release $4/$3 +fi echo "Flutter app preparation completed!" diff --git a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/CMakeLists.txt b/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/CMakeLists.txt index 5f4d84c4..a0007ac1 100644 --- a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/CMakeLists.txt +++ b/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/CMakeLists.txt @@ -9,11 +9,14 @@ include_directories( ${JVX_SUBPRODUCT_ROOT}/sources/jvxLibraries/jvx-flutter-native-static/include ) +# Involving the template files for the native config lib +configure_file(${JVX_BASE_ROOT}/software/codeFragments/jvxApplications/native-config/include/generic-native-config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/ayfstarter-native-config.h) +configure_file(${JVX_BASE_ROOT}/software/codeFragments/jvxApplications/native-config/src/generic-config-hook.cpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/ayfstarter-config-hook.cpp) # Add local sources (header files only for project workspace generation!) set(LOCAL_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/exports/${JVX_OS}/exports-flutter-native-config.def + ${JVX_BASE_ROOT}/software/codeFragments/jvxApplications/native-config/exports/${JVX_OS}/exports-flutter-native-config.def ${CMAKE_CURRENT_SOURCE_DIR}/src/ayfstarter-config-hook.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/ayfstarter-native-config.h diff --git a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/include/ayfstarter-native-config.h b/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/include/ayfstarter-native-config.h index 71ece08f..af5b9f8f 100644 --- a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/include/ayfstarter-native-config.h +++ b/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/include/ayfstarter-native-config.h @@ -1,9 +1,9 @@ -#ifndef __AYFBINRENDER_NATIVE_CONFIG_H__ -#define __AYFBINRENDER_NATIVE_CONFIG_H__ +#ifndef __AYF_NATIVE_CONFIG_H__ +#define __AYF_NATIVE_CONFIG_H__ extern "C" { jvxErrorType flutter_config_open(native_host_configure_func_pointers* fcPtr); } -#endif \ No newline at end of file +#endif diff --git a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/src/ayfstarter-config-hook.cpp b/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/src/ayfstarter-config-hook.cpp index 9b0766e1..da7e1a75 100644 --- a/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/src/ayfstarter-config-hook.cpp +++ b/sources/sub-projects/ayfstarter/sources/Applications/ayfstarter-native-config/src/ayfstarter-config-hook.cpp @@ -24,4 +24,4 @@ extern "C" } return JVX_NO_ERROR; } -} \ No newline at end of file +}