publish ijk and github edition.

debugly · debugly · commit 118166158f93 · 2022-10-30T16:27:32.000+08:00
diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml
@@ -0,0 +1,77 @@
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+name: Create Release (Github Edition) 
+
+jobs:
+  build:
+    name: compile libs then deploy
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Read Tag Version
+        run: |
+            # https://stackoverflow.com/questions/4916492/git-describe-fails-with-fatal-no-names-found-cannot-describe-anything
+            # git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs echo > constants.env
+            git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs echo > constants.env
+            echo 'EDITION=github' >> constants.env
+            cat constants.env
+      - name: Export Env
+        uses: cardinalby/export-env-action@v2
+        with:
+          envFile: 'constants.env'
+      - name: do compile macos libs
+        run: | 
+            export SKIP_FFMPEG_PATHCHES=1
+            ./init-any.sh macos
+            cd macos
+            ./compile-any.sh build 
+            ./compile-any.sh lipo
+      - name: Zip macos libs
+        run: |             
+            cd build/product/macos/universal
+            zip -rq macos-universal.zip ./*
+      - name: do compile ios libs
+        run: | 
+            export SKIP_FFMPEG_PATHCHES=1
+            export SKIP_PULL_BASE=1
+            ./init-any.sh ios
+            cd ios
+            ./compile-any.sh build
+            ./compile-any.sh lipo
+      - name: Zip ios libs
+        run: |             
+            cd build/product/ios/universal
+            zip -rq ios-universal.zip ./*
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_VERSION }}
+          release_name: Release ${{ env.RELEASE_VERSION }}
+          draft: false
+          prerelease: false
+      - name: Upload macos Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: build/product/macos/universal/macos-universal.zip
+          asset_name: "macos-universal-${{ env.EDITION }}-${{ env.RELEASE_VERSION }}.zip"
+          asset_content_type: application/zip
+      - name: Upload ios Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: build/product/ios/universal/ios-universal.zip
+          asset_name: "ios-universal-${{ env.EDITION }}-${{ env.RELEASE_VERSION }}.zip"
+          asset_content_type: application/zip
diff --git a/.github/workflows/publish-ijk-release.yml b/.github/workflows/publish-ijk-release.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [ master ]
 
-name: Create Release
+name: Create Release (IJK Edition) 
 
 jobs:
   build:
@@ -18,6 +18,7 @@ jobs:
             # https://stackoverflow.com/questions/4916492/git-describe-fails-with-fatal-no-names-found-cannot-describe-anything
             # git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs echo > constants.env
             git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs echo > constants.env
+            echo 'EDITION=ijk' >> constants.env
             cat constants.env
       - name: Export Env
         uses: cardinalby/export-env-action@v2
@@ -35,6 +36,7 @@ jobs:
             zip -rq macos-universal.zip ./*
       - name: do compile ios libs
         run: | 
+            export SKIP_PULL_BASE=1
             ./init-any.sh ios
             cd ios
             ./compile-any.sh build
@@ -60,7 +62,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
           asset_path: build/product/macos/universal/macos-universal.zip
-          asset_name: "macos-universal-${{ env.RELEASE_VERSION }}.zip"
+          asset_name: "macos-universal-${{ env.EDITION }}-${{ env.RELEASE_VERSION }}.zip"
           asset_content_type: application/zip
       - name: Upload ios Release Asset
         uses: actions/upload-release-asset@v1
@@ -69,5 +71,5 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
           asset_path: build/product/ios/universal/ios-universal.zip
-          asset_name: "ios-universal-${{ env.RELEASE_VERSION }}.zip"
+          asset_name: "ios-universal-${{ env.EDITION }}-${{ env.RELEASE_VERSION }}.zip"
           asset_content_type: application/zip
diff --git a/README.md b/README.md
@@ -88,6 +88,11 @@ At present MRFFToolChain contained OpenSSL、FFmpeg 、libyuv、libopus、libblu
 /init-all.sh all "openssl ffmpeg"
 ```
 
+高级选项：
+
+设置环境变量 export SKIP_FFMPEG_PATHCHES=1 不打 FFmpeg 补丁；
+设置环境变量 export SKIP_PULL_BASE=1 不从远程拉取最新代码；
+
 ## Compile
 
 根据编译的平台，进入相应的目录，比如编译 macos 平台：
@@ -159,4 +164,11 @@ cd macos
 
 1、如果不同的平台需要编译不同的库，只需要在 apple/compile-cfgs 目录下，建立 list_PLAT.txt 文件即可，PLAT 为对应的平台，比如 ios,macos 等；默认情况下按照 list.txt 里声明的顺序编译各个库。
 
-2、ffmpeg 的配置需要分平台指定，只需要在 ffconfig 目录下创建 module_PLAT.sh 文件即可，PLAT 为对应的平台，比如 ios,macos 等；默认情况下根据 module.sh 声明的配置进行编译 ffmpeg。
+2、ffmpeg 的配置需要分平台指定，只需要在 ffconfig 目录下创建 module_PLAT.sh 文件即可，PLAT 为对应的平台，比如 ios,macos 等；默认情况下根据 module.sh 声明的配置进行编译 ffmpeg。
+
+## Precompiled Edition
+
+预编译库分为 ijk 版和 github 版，其区别是 ijk 版本打了 extra/patches/ffmpeg 目录下的补丁。
+
+- 下载 ijk 版预编译库：./download-pre.sh ijk
+- 下载 github 版预编译库：./download-pre.sh github
diff --git a/download-pre.sh b/download-pre.sh
@@ -15,37 +15,56 @@
 # limitations under the License.
 #
 
-PLAT=$1
-VER=$2
+set -e
+
+EDITION=$1
+PLAT=$2
+VER=$3
 
 if test -z $VER ;then
     VER='V1.0-104be8c'
 fi
 
-set -e
+if test -z $PLAT ;then
+    PLAT='all'
+fi
 
 cd $(dirname "$0")
 c_dir="$PWD"
 
 function usage() {
     echo " useage:"
-    echo " $0 [ios,macos,all]"
+    echo "download precompiled ijk or github edition."
+    echo " $0 ijk|github [ios|macos|all] [<release tag>]"
 }
 
 function download() {
     local plat=$1
-    echo "===[download $plat $VER]===================="
+    echo "===[download $plat $EDITION $VER]===================="
     mkdir -p build/pre
     cd build/pre
-    echo "https://github.com/debugly/MRFFToolChainBuildShell/releases/download/$VER/$plat-universal-$VER.zip"
-    curl -LO https://github.com/debugly/MRFFToolChainBuildShell/releases/download/$VER/$plat-universal-$VER.zip
+    local fname="$plat-universal-$EDITION-$VER.zip"
+    echo "https://github.com/debugly/MRFFToolChainBuildShell/releases/download/$VER/$fname"
+    curl -LO https://github.com/debugly/MRFFToolChainBuildShell/releases/download/$VER/$fname
     mkdir -p ../product/$plat/universal
-    unzip -oq $plat-universal-$VER.zip -d ../product/$plat/universal
+    unzip -oq $fname -d ../product/$plat/universal
     tree -L 2 ../product/$plat/universal
     echo "===================================="
     cd - >/dev/null
 }
 
+if [[ "$EDITION" != 'ijk' && "$EDITION" != 'github' ]]; then
+    echo 'wrong edition,use ijk or github!'
+    usage
+    exit
+fi
+
+if [[ "$PLAT" != 'ios' && "$PLAT" != 'macos' && "$PLAT" != 'all' ]]; then
+    echo 'wrong plat,use ios or macos or all!'
+    usage
+    exit
+fi
+
 if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' ]]; then
     download $PLAT
 elif [[ "$PLAT" == 'all' ]]; then
diff --git a/init-any.sh b/init-any.sh
@@ -38,6 +38,14 @@ function usage()
     echo " $0 [ios,macos,all] [all|fdk-aac|ffmpeg|lame|libyuv|openssl|opus|x264|bluray] [all,arm64,x86_64]"
 }
 
+if [[ "$SKIP_PULL_BASE" ]];then
+    echo "SKIP_PULL_BASE env recognized"
+fi
+
+if [[ "$SKIP_FFMPEG_PATHCHES" ]];then
+    echo "SKIP_FFMPEG_PATHCHES env recognized"
+fi
+
 if [[ "x$LIBS" == "x" || "$LIBS" == "all" ]]; then
     LIBS=$(ls init-cfgs)
 fi
diff --git a/tools/init-repo.sh b/tools/init-repo.sh
@@ -37,7 +37,7 @@ ARCH=$3
 if [[ "$ARCH" == 'all' || "x$ARCH" == 'x' ]];then
     iOS_ARCHS="x86_64 arm64"
     macOS_ARCHS="x86_64 arm64"
-elif [[ "$ARCH" == 'x86_64' || "$ARCH" == 'arm64' ]];then
+    elif [[ "$ARCH" == 'x86_64' || "$ARCH" == 'arm64' ]];then
     iOS_ARCHS="$ARCH"
     macOS_ARCHS="$ARCH"
 else
@@ -51,7 +51,7 @@ function pull_common() {
         cd "$GIT_LOCAL_REPO"
         [[ -d .git/rebase-apply ]] && git am --skip
         git reset --hard
-
+        
         local origin=$(git remote get-url origin)
         if [[ "$origin" != "$GIT_UPSTREAM" ]]; then
             git remote remove origin
@@ -61,7 +61,7 @@ function pull_common() {
         if [[ "$SKIP_PULL_BASE" ]];then
             echo "skip pull $REPO_DIR because you set SKIP_PULL_BASE env."
         else
-            git fetch --all --tags    
+            git fetch --all --tags
         fi
     else
         if [[ "$SKIP_PULL_BASE" ]];then
@@ -82,8 +82,14 @@ function pull_common() {
 
 function apply_patches()
 {
+    if [[ "$SKIP_FFMPEG_PATHCHES" && $REPO_DIR == 'ffmpeg' ]];then
+        echo "skip apply $REPO_DIR patches,because you set SKIP_FFMPEG_PATHCHES env."
+        return    
+    fi
+
     local plat="$1"
     local patch_dir="${TOOLS}/../extra/patches/$REPO_DIR"
+
     if [[ -d "${patch_dir}_${plat}" ]];then
         patch_dir="${patch_dir}_${plat}"
     fi
@@ -105,7 +111,7 @@ function make_arch_repo() {
     echo "== copy $REPO_DIR → $dest_repo =="
     $TOOLS/copy-local-repo.sh $GIT_LOCAL_REPO $dest_repo
     cd $dest_repo
-    if [[ "$GIT_WITH_SUBMODULE" ]]; then
+    if [[ "$GIT_WITH_SUBMODULE" ]];then
         git submodule update --init --depth=1
     fi
     echo "last commit:"$(git log -1 --pretty=format:"[%h] %s:%ce %cd")
@@ -130,12 +136,12 @@ function main() {
                     make_arch_repo 'ios' $arch
                 fi
             done
-
+            
             if [[ found -eq 0 ]];then
                 echo "unknown arch:$2 for $1"
             fi
         ;;
-
+        
         macOS|macos)
             
             pull_common
@@ -147,25 +153,25 @@ function main() {
                     make_arch_repo 'macos' $arch
                 fi
             done
-
+            
             if [[ found -eq 0 ]];then
                 echo "unknown arch:$2 for $1"
             fi
         ;;
-
+        
         all)
             pull_common
             for arch in $iOS_ARCHS
             do
                 make_arch_repo 'ios' $arch
             done
-
+            
             for arch in $macOS_ARCHS
             do
                 make_arch_repo 'macos' $arch
             done
         ;;
-
+        
         *)
             usage
             exit 1
