update shell

debugly · debugly · commit 19ecd5db2f5f · 2024-06-13T17:38:50.000+08:00
diff --git a/.github/workflows/ass.yml b/.github/workflows/ass.yml
@@ -44,19 +44,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/bluray.yml b/.github/workflows/bluray.yml
@@ -38,7 +38,7 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../macos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: Zip apple xcframework
diff --git a/.github/workflows/dav1d.yml b/.github/workflows/dav1d.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/dvdread.yml b/.github/workflows/dvdread.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
@@ -44,19 +44,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/freetype.yml b/.github/workflows/freetype.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/fribidi.yml b/.github/workflows/fribidi.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/harfbuzz.yml b/.github/workflows/harfbuzz.yml
@@ -44,19 +44,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/libyuv.yml b/.github/workflows/libyuv.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/openssl.yml b/.github/workflows/openssl.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/opus.yml b/.github/workflows/opus.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/.github/workflows/unibreak.yml b/.github/workflows/unibreak.yml
@@ -42,19 +42,19 @@ jobs:
         ls  | awk -F ' ' '{printf "echo %s\n echo -------------\ngit -C %s log -n 1 | cat\n",$0,$0}' | bash > ../tvos-src-log.md
     - name: do compile macos libs
       run: |
-        ./macos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p macos -c build -l ${{ env.LIB_NAME }}
         cd build/product/macos/universal
         zip -rq macos-universal.zip ./*
     - name: do compile ios libs
       run: |
-        ./ios/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p ios -c build -l ${{ env.LIB_NAME }}
         cd build/product/ios/universal
         zip -rq ios-universal.zip ./*
         cd ../universal-simulator
         zip -rq ios-universal-simulator.zip ./*
     - name: do compile tvos libs
       run: |
-        ./tvos/compile-any.sh -c build -l ${{ env.LIB_NAME }}
+        ./apple/compile-any.sh -p tvos -c build -l ${{ env.LIB_NAME }}
         cd build/product/tvos/universal
         zip -rq tvos-universal.zip ./*
         cd ../universal-simulator
diff --git a/README.md b/README.md
@@ -6,6 +6,14 @@ MRFFToolChain products was built for ijkplayer : [https://github.com/debugly/ijk
 
 At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、ffmpeg、freetype、fribidi、harfbuzz、libyuv、openssl、opus、unibreak`.
 
+## Supported Plat
+
+| Plat  | Arch                                   |
+| ----- | -------------------------------------- |
+| iOS   | arm64、arm64_simulator、x86_64_simulator |
+| macOS | arm64、x86_64                           |
+| tvOS  | arm64、arm64_simulator、x86_64_simulator |
+
 ## Folder structure
 
 ```
@@ -47,6 +55,8 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、ffmpeg、fr
 │   └── compile-any.sh
 ├── macos             #macos 平台编译脚本
 │   └── compile-any.sh
+├── tvos             #tvos 平台编译脚本
+│   └── compile-any.sh
 ├── patches            #补丁
 │   ├── README.md
 │   ├── ffmpeg -> ffmpeg-release-5.1
@@ -64,14 +74,16 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、ffmpeg、fr
 
 ## Download Pre-compiled libs
 
-可以跳过自己编译，直接从github上下载预编译好的库，节省时间！
-预编译库已经打了 extra/patches/ 目录下的补丁，调用示例：
+不修改三方库的源码时，没有必要自己编译，直接从 github 上下载预编译好的就行，可节省大量时间！
+预编译库已经打了 extra/patches/ 目录下的补丁，使用方法：
 
 ```bash
+# 第一个参数是平台，支持的值： ios,macos,tvos,all 其中 all 的意思是所有平台
+# 第二个参数指定要下载的库，可以是全部，可以是一个，也可以是多个
 ./install-pre-any.sh all
-./install-pre-any.sh ios 'libyuv openssl opus bluray dav1d'
+./install-pre-any.sh ios 'openssl opus bluray dav1d'
 ./install-pre-any.sh macos 'openssl'
-./install-pre-any.sh macos 'openssl ffmpeg'
+./install-pre-any.sh tvos all
 ```
 
 ## Compile by yourself
@@ -99,51 +111,18 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、ffmpeg、fr
 
 ### Compile
 
-根据编译的平台，进入相应的目录，比如编译 macos 平台：
-
-```
-# 编译 macos arm64 架构下的所有库
-./macos/compile-any.sh build all arm64
-# 编译 macos x86_64 架构下的所有库
-./macos/compile-any.sh build all x86_64
-# 编译 macos 所有架构下的所有库
-./macos/compile-any.sh build all
-```
-
-编译指定库，比如 openssl，ffmpeg
-
-```
-# 编译 macos arm64 架构 debug 版
-./macos/compile-any.sh build "openssl ffmpeg" arm64 debug
-# 编译 macos x86_64 架构
-./macos/compile-any.sh build "openssl ffmpeg" x86_64
-# 编译 macos 所有架构
-./macos/compile-any.sh build "openssl ffmpeg"
-```
-
-清理 macos 平台编译产物
-
-```
-# 清理 macos arm64 架构下的所有库的产物
-./macos/compile-any.sh clean all arm64
-# 清理 macos x86_64 架构下的所有库的产物
-./macos/compile-any.sh clean all x86_64
-# 清理 macos 所有架构下的所有库的产物
-./macos/compile-any.sh clean all
-```
+第一次使用编译脚本，可以先看下帮助：`./apple/compile-any.sh -h`
 
-将 macos 平台编译产物合并成 fat 版本放到 universal 文件夹下（build 所有架构时会自动lipo，只有手动编译不同架构时才会用到 lipo）
+根据帮助可知 -p 参数指定平台；-c 参数指定行为，比如：build是编译，rebuild是重编等; -l 指定要编译的库；-a 指定 cpu 架构。
 
 ```
-# 合并 macos 所有架构下的所有库的产物
-./macos/compile-any.sh lipo all
-# 将 macos arm64 架构下的所有库的产物复制到 universal
-./macos/compile-any.sh lipo all arm64
-# 将 macos x86_64 架构下的所有库的产物复制到 universal
-./macos/compile-any.sh lipo all x86_64
+#比如编译 ios 平台所有依赖库
+./apple/compile-any.sh -c build -p ios -l all
+#比如编译 ios 平台 arm64 架构下的 libass 库
+./apple/compile-any.sh -c build -p ios -a arm64 -l ass
 ```
 
-编译 ios 平台跟 macos 是一样的流程，只需要将 macos 改成 ios 即可。
+脚本对于这些参数的顺序没有要求，可以随意摆放。
 
 ### Support Mirror
 
diff --git a/apple/compile-any.sh b/apple/compile-any.sh
@@ -46,6 +46,7 @@ do
     case $opt in
         h)
             usage
+            exit 1
         ;;
         p)
             XC_PLAT="$OPTARG"
diff --git a/ios/compile-any.sh b/ios/compile-any.sh
diff --git a/macos/compile-any.sh b/macos/compile-any.sh
diff --git a/tvos/compile-any.sh b/tvos/compile-any.sh
