edit builder

RapidAI · Feb 17, 2024 · f7e361e · f7e361e
1 parent 7c1b43d
commit f7e361e
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 17 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -14,19 +14,12 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { cv: 3.4.16 }
+          - { cv: 3.4.16, ndk: 25.2.9519653 }
 
     env:
       PKG_NAME: opencv-${{ matrix.ver.cv }}-android
 
     steps:
-      # Setup JDK 11
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-
       # 删除ndk -g参数
       - name: ndk del -g
         run: sed -i -e '/^  -g$/d' $ANDROID_NDK_HOME/build/cmake/android-legacy.toolchain.cmake

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -15,6 +15,8 @@ jobs:
           - { cv: 3.4.16, ant: 1.10.14 }
         list:
           - { os_ver: 11 }
+          - { os_ver: 12 }
+          - { os_ver: 13 }
 
     runs-on: macos-${{ matrix.list.os_ver }}
 
@@ -23,11 +25,11 @@ jobs:
       JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-macos-${{ matrix.list.os_ver }}-java
 
     steps:
-      # Setup JDK 11
-      - name: Set up JDK 11
+      # Setup JDK 8
+      - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
 
       - uses: cedx/setup-ant@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -33,11 +33,11 @@ jobs:
       JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-windows-${{ matrix.list.vs_name }}-java-${{ matrix.crt }}
 
     steps:
-      # Setup JDK 11
-      - name: Set up JDK 11
+      # Setup JDK 8
+      - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
 
       - uses: cedx/setup-ant@v2

diff --git a/README.md b/README.md
@@ -8,8 +8,37 @@ OpenCV在OCR中只是做图像的读取保存、编解码、缩放等，可以
 
 最后利用Github Actions进行编译。
 
-### 关于Windows静态链接CRT
+## 编译环境
+### Android
+| 操作系统 | ndk  |
+|---|---|
+| ubuntu 22.04 | 25.2.9519653  |
 
-编译选项添加BUILD_WITH_STATIC_CRT=ON
+### Windows
+| 操作系统 | vs版本  | JDK | ant |
+|---|---|-----|---|
+| 2019 | vs2017 | 8 | 1.10.14 |
+| 2019 | vs2019 | 8 | 1.10.14 |
+| 2022 | vs2022 | 8 | 1.10.14 |
 
-### 关于LINUX musl工具链编译
+### Ubuntu
+| 操作系统 | gcc  | libc | binutils | JDK| ant|
+|---|---|---|---|---|---|
+| ubuntu 14.04 | 4.8.4  | 2.19 | 2.24 | 8 | 1.10.14 |
+| ubuntu 16.04 | 5.4.0  | 2.23 | 2.26.1 | 8 | 1.10.14 |
+| ubuntu 18.04 | 7.5.0  | 2.27 | 2.30 | 8 | 1.10.14 |
+| ubuntu 20.04 | 9.4.0  | 2.31 | 2.34 | 8 | 1.10.14 |
+| ubuntu 22.04 | 11.4.0 | 2.35 | 2.38 | 8 | 1.10.14 |
+
+### Musl
+| 操作系统 | musl  |
+|---|---|
+| ubuntu 22.04 | 11.3.1  |
+
+### Macos
+| 操作系统  | JDK | ant|
+|---|---|---|
+| 10 | 8 | 1.10.14 |
+| 11 | 8 | 1.10.14 |
+| 12 | 8 | 1.10.14 |
+| 13 | 8 | 1.10.14 |