ci: more xcframeworks

Author: wang-bin

.github/workflows/build.yml

@@ -183,7 +183,7 @@ jobs:
         name: mdk-sdk-${{ env.TARGET_OS }}-${{ matrix.config }}
         path: mdk-sdk-${{ env.TARGET_OS }}.tar.xz
     - name: Upload to SourceForge
-      if: ${{ env.SF_UPLOAD == 'true' }}
+      if: ${{ env.SF_UPLOAD == 'true' && matrix.os == 'macCatalyst' }}
       shell: bash
       run: sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-${TARGET_OS}.tar.xz ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/
 
@@ -283,13 +283,20 @@ jobs:
         gtar Jcvf mdk-sdk-apple.tar.xz mdk-sdk README.md
         gtar Jcvf mdk-sdk-macOS.tar.xz -C macOS .
         7z a mdk-sdk-apple.zip mdk-sdk
+
+        for OS in iOS tvOS visionOS; do
+          rm -rf mdk-sdk/{bin,Frameworks,include} mdk-sdk/lib/mdk.*
+          xcodebuild -create-xcframework -framework ${OS}/mdk-sdk/lib/mdk.framework -debug-symbols $PWD/${OS}/mdk-sdk/lib/mdk.framework.dSYM -framework ${OS}Simulator/mdk-sdk/lib/mdk.framework -debug-symbols $PWD/${OS}Simulator/mdk-sdk/lib/mdk.framework.dSYM -output mdk-sdk/lib/mdk.xcframework
+          gtar Jcvf mdk-sdk-${OS}.tar.xz mdk-sdk
+        done
+
         swift package compute-checksum mdk-sdk-apple.zip
     - name: Archieve XCFramework SDK
       uses: actions/upload-artifact@v4
       with:
         name: mdk-sdk-apple
         path: mdk-sdk-apple.tar.xz
-    - name: Archieve XCFramework SDK
+    - name: Archieve XCFramework SDK zip
       uses: actions/upload-artifact@v4
       with:
         name: mdk-sdk-apple-zip
@@ -299,6 +306,21 @@ jobs:
       with:
         name: mdk-sdk-macOS
         path: mdk-sdk-macOS.tar.xz
+    - name: Archieve iOS SDK
+      uses: actions/upload-artifact@v4
+      with:
+        name: mdk-sdk-iOS
+        path: mdk-sdk-iOS.tar.xz
+    - name: Archieve tvOS SDK
+      uses: actions/upload-artifact@v4
+      with:
+        name: mdk-sdk-tvOS
+        path: mdk-sdk-tvOS.tar.xz
+    - name: Archieve visionOS SDK
+      uses: actions/upload-artifact@v4
+      with:
+        name: mdk-sdk-visionOS
+        path: mdk-sdk-visionOS.tar.xz
     - name: Upload to SourceForge
       if: ${{ env.SF_UPLOAD == 'true' }}
       shell: bash
@@ -1056,27 +1078,15 @@ jobs:
       - name: Download iOS sdk
         uses: actions/download-artifact@v4
         with:
-          name: mdk-sdk-iOS-MinSizeRel
-      - name: Download iOSSimulator sdk
-        uses: actions/download-artifact@v4
-        with:
-          name: mdk-sdk-iOSSimulator-MinSizeRel
+          name: mdk-sdk-iOS
       - name: Download tvOS sdk
         uses: actions/download-artifact@v4
         with:
-          name: mdk-sdk-tvOS-MinSizeRel
-      - name: Download tvOSSimulator sdk
-        uses: actions/download-artifact@v4
-        with:
-          name: mdk-sdk-tvOSSimulator-MinSizeRel
+          name: mdk-sdk-tvOS
       - name: Download visionOS sdk
         uses: actions/download-artifact@v4
         with:
-          name: mdk-sdk-visionOS-MinSizeRel
-      - name: Download visionOSSimulator sdk
-        uses: actions/download-artifact@v4
-        with:
-          name: mdk-sdk-visionOSSimulator-MinSizeRel
+          name: mdk-sdk-visionOS
       - name: Download macCatalyst sdk
         uses: actions/download-artifact@v4
         with:

ci-before-build.sh

@@ -42,7 +42,7 @@ elif [ `which brew` ]; then
     export HOMEBREW_NO_AUTO_UPDATE=true
     #time brew update --preinstall
     export HOMEBREW_NO_AUTO_UPDATE=1
-    pkgs="ninja vulkan-headers dav1d md5sha1sum" # p7zip  gnu-tar
+    pkgs="vulkan-headers dav1d md5sha1sum" # p7zip  gnu-tar
     #pkgs+=" cmake" # visionOS simulator requires cmake 3.28.4
     if [[ "$DEVTOOLS_CACHE_HIT" != "true" ]]; then
         pkgs+=" hudochenkov/sshpass/sshpass"
@@ -83,7 +83,7 @@ if [[ "$EXTERNAL_DEP_CACHE_HIT" != "true" ]]; then
   if [ "$TARGET_OS" == "sunxi" ]; then
       mkdir -p external/lib/sunxi/armv7
       cp -af ${FFPKG}/lib/* external/lib/sunxi/armv7 #single arch package
-  elif [ "$TARGET_OS" == "windows-desktop" ]; then
+  elif [[ "$TARGET_OS" == "win"* ]]; then
       # TODO: download in cmake(if check_include_files failed)
       curl -kL -o vk.zip https://github.com/KhronosGroup/Vulkan-Headers/archive/main.zip
       7z x vk.zip

upload.mk

@@ -1,11 +1,17 @@
-all: apple_txz apple_zip mac_txz upload_win_ltl upload_win upload_win64 upload_uwp upload_nupkg
+all: apple_txz apple_zip mac_txz ios_txz tvos_txz visionos_txz upload_win_ltl upload_win upload_win64 upload_uwp upload_nupkg
 
 apple_txz:
 	[ -f mdk-sdk-apple.tar.xz ] && sshpass -p $$SF_PW scp -o StrictHostKeyChecking=no mdk-sdk-apple.tar.xz $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-apple.tar.xz
 mac_txz:
 	[ -f mdk-sdk-macOS.tar.xz ] && sshpass -p $${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-macOS.tar.xz $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-macOS.tar.xz
 apple_zip:
 	[ -f mdk-sdk-apple.zip ] && sshpass -p $$SF_PW scp -o StrictHostKeyChecking=no mdk-sdk-apple.zip $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-apple.zip
+ios_txz:
+	[ -f mdk-sdk-iOS.tar.xz ] && sshpass -p $${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-iOS.tar.xz $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-iOS.tar.xz
+tvos_txz:
+	[ -f mdk-sdk-tvOS.tar.xz ] && sshpass -p $${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-tvOS.tar.xz $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-tvOS.tar.xz
+visionos_txz:
+	[ -f mdk-sdk-visionOS.tar.xz ] && sshpass -p $${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-visionOS.tar.xz $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-visionOS.tar.xz
 upload_win_ltl:
 	[ -f mdk-sdk-windows-desktop-vs2022-ltl.7z ] && sshpass -p $${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-windows-desktop-vs2022-ltl.7z $${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ || echo no mdk-sdk-windows-desktop-vs2022-ltl.7z
 upload_win: