From d2abeaa4342c690a2f08ff653a7af5c65844bc06 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Thu, 13 Feb 2025 18:07:12 -0800 Subject: [PATCH] Mono SDK packaging -flutter_patched_sdk -flutter_linux -copy all headers to include -copy cpp_client_wrapper_glfw folder if present Signed-off-by: Joel Winarske --- .github/workflows/flutter-engine-arm64.yaml | 4 ++ .github/workflows/flutter-engine-armv7hf.yaml | 4 ++ .github/workflows/flutter-engine-x86_64.yaml | 4 ++ scripts/prepare-sdk-arm64.sh | 39 +++++++++++++++++-- scripts/prepare-sdk-armv7hf.sh | 38 ++++++++++++++++-- scripts/prepare-sdk-x86-64.sh | 38 ++++++++++++++++-- 6 files changed, 118 insertions(+), 9 deletions(-) diff --git a/.github/workflows/flutter-engine-arm64.yaml b/.github/workflows/flutter-engine-arm64.yaml index d07fae1..fe88d23 100644 --- a/.github/workflows/flutter-engine-arm64.yaml +++ b/.github/workflows/flutter-engine-arm64.yaml @@ -72,6 +72,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -122,6 +123,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -171,6 +173,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -220,6 +223,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ diff --git a/.github/workflows/flutter-engine-armv7hf.yaml b/.github/workflows/flutter-engine-armv7hf.yaml index 233455f..9a63ddd 100644 --- a/.github/workflows/flutter-engine-armv7hf.yaml +++ b/.github/workflows/flutter-engine-armv7hf.yaml @@ -72,6 +72,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -123,6 +124,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -172,6 +174,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -222,6 +225,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ diff --git a/.github/workflows/flutter-engine-x86_64.yaml b/.github/workflows/flutter-engine-x86_64.yaml index 0565a2e..bdab0fc 100644 --- a/.github/workflows/flutter-engine-x86_64.yaml +++ b/.github/workflows/flutter-engine-x86_64.yaml @@ -72,6 +72,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -122,6 +123,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -171,6 +173,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ @@ -220,6 +223,7 @@ jobs: --enable-impeller-3d \ --no-goma --no-rbe \ --no-stripped --no-enable-unittests \ + --no-dart-version-git-info \ --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ diff --git a/scripts/prepare-sdk-arm64.sh b/scripts/prepare-sdk-arm64.sh index ade3c83..0a064d9 100755 --- a/scripts/prepare-sdk-arm64.sh +++ b/scripts/prepare-sdk-arm64.sh @@ -9,21 +9,54 @@ mkdir -p engine-sdk/{bin,include,lib,data,clang_x64/bin,clang_x64/lib64} # # Include # -cp flutter_embedder.h engine-sdk/include/ +cp *.h engine-sdk/include/ # # /data # cp icudtl.dat engine-sdk/data/ +# +# cpp_client_wrapper_glfw +# +if [ -e cpp_client_wrapper_glfw ]; then + mkdir -p engine-sdk/sdk/cpp_client_wrapper_glfw/ + cp -r cpp_client_wrapper_glfw/* engine-sdk/sdk/cpp_client_wrapper_glfw/ +fi + # -# SDK +# flutter_linux # -cp -r flutter_patched_sdk engine-sdk/sdk/ +if [ -e flutter_linux ]; then + mkdir -p engine-sdk/include/flutter_linux + cp -r flutter_linux/* engine-sdk/include/flutter_linux/ +fi + +# +# flutter_patched_sdk +# +if [ -e flutter_patched_sdk ]; then + mkdir -p engine-sdk/sdk/flutter_patched_sdk + cp -r flutter_patched_sdk/* engine-sdk/sdk/flutter_patched_sdk/ +fi + +# +# shader_lib +# if [ -e shader_lib ]; then + mkdir -p engine-sdk/sdk/flutter_patched_sdk cp -r shader_lib engine-sdk/ fi +# +# zip archives +# +if [ -e zip_archives ]; then + mkdir -p engine-sdk/sdk/zip_archives + cp -r zip_archives/* engine-sdk/sdk/zip_archives/ +fi + + export cwd=$(pwd) # diff --git a/scripts/prepare-sdk-armv7hf.sh b/scripts/prepare-sdk-armv7hf.sh index 413a9fb..b102ffb 100755 --- a/scripts/prepare-sdk-armv7hf.sh +++ b/scripts/prepare-sdk-armv7hf.sh @@ -9,21 +9,53 @@ mkdir -p engine-sdk/{bin,include,lib,data,clang_x64/bin,clang_x64/lib64} # # Include # -cp flutter_embedder.h engine-sdk/include/ +cp *.h engine-sdk/include/ # # /data # cp icudtl.dat engine-sdk/data/ +# +# cpp_client_wrapper_glfw +# +if [ -e cpp_client_wrapper_glfw ]; then + mkdir -p engine-sdk/sdk/cpp_client_wrapper_glfw/ + cp -r cpp_client_wrapper_glfw/* engine-sdk/sdk/cpp_client_wrapper_glfw/ +fi + # -# SDK +# flutter_linux # -cp -r flutter_patched_sdk engine-sdk/sdk/ +if [ -e flutter_linux ]; then + mkdir -p engine-sdk/include/flutter_linux + cp -r flutter_linux/* engine-sdk/include/flutter_linux/ +fi + +# +# flutter_patched_sdk +# +if [ -e flutter_patched_sdk ]; then + mkdir -p engine-sdk/sdk/flutter_patched_sdk + cp -r flutter_patched_sdk/* engine-sdk/sdk/flutter_patched_sdk/ +fi + +# +# shader_lib +# if [ -e shader_lib ]; then + mkdir -p engine-sdk/sdk/flutter_patched_sdk cp -r shader_lib engine-sdk/ fi +# +# zip archives +# +if [ -e zip_archives ]; then + mkdir -p engine-sdk/sdk/zip_archives + cp -r zip_archives/* engine-sdk/sdk/zip_archives/ +fi + export cwd=$(pwd) # diff --git a/scripts/prepare-sdk-x86-64.sh b/scripts/prepare-sdk-x86-64.sh index ade3c83..9324d45 100755 --- a/scripts/prepare-sdk-x86-64.sh +++ b/scripts/prepare-sdk-x86-64.sh @@ -9,21 +9,53 @@ mkdir -p engine-sdk/{bin,include,lib,data,clang_x64/bin,clang_x64/lib64} # # Include # -cp flutter_embedder.h engine-sdk/include/ +cp *.h engine-sdk/include/ # # /data # cp icudtl.dat engine-sdk/data/ +# +# cpp_client_wrapper_glfw +# +if [ -e cpp_client_wrapper_glfw ]; then + mkdir -p engine-sdk/sdk/cpp_client_wrapper_glfw/ + cp -r cpp_client_wrapper_glfw/* engine-sdk/sdk/cpp_client_wrapper_glfw/ +fi + # -# SDK +# flutter_linux # -cp -r flutter_patched_sdk engine-sdk/sdk/ +if [ -e flutter_linux ]; then + mkdir -p engine-sdk/include/flutter_linux + cp -r flutter_linux/* engine-sdk/include/flutter_linux/ +fi + +# +# flutter_patched_sdk +# +if [ -e flutter_patched_sdk ]; then + mkdir -p engine-sdk/sdk/flutter_patched_sdk + cp -r flutter_patched_sdk/* engine-sdk/sdk/flutter_patched_sdk/ +fi + +# +# shader_lib +# if [ -e shader_lib ]; then + mkdir -p engine-sdk/sdk/flutter_patched_sdk cp -r shader_lib engine-sdk/ fi +# +# zip archives +# +if [ -e zip_archives ]; then + mkdir -p engine-sdk/sdk/zip_archives + cp -r zip_archives/* engine-sdk/sdk/zip_archives/ +fi + export cwd=$(pwd) #