Skip to content

Commit 836a7e1

Browse files
committed
edit builder
1 parent f2dd444 commit 836a7e1

File tree

4 files changed

+44
-15
lines changed

4 files changed

+44
-15
lines changed

.github/workflows/android.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
ver:
17-
- { cv: 4.8.1 }
17+
- { cv: 4.8.1, ndk: 25.2.9519653 }
1818

1919
env:
2020
PKG_NAME: opencv-${{ matrix.ver.cv }}-android
2121

2222
steps:
23-
# Setup JDK 11
24-
- name: Set up JDK 11
25-
uses: actions/setup-java@v3
26-
with:
27-
java-version: '11'
28-
distribution: 'adopt'
29-
3023
# 删除ndk -g参数
3124
- name: ndk del -g
3225
run: sed -i -e '/^ -g$/d' $ANDROID_NDK_HOME/build/cmake/android-legacy.toolchain.cmake

.github/workflows/macos.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-macos-${{ matrix.list.os_ver }}-java
2727

2828
steps:
29-
# Setup JDK 11
30-
- name: Set up JDK 11
29+
# Setup JDK 8
30+
- name: Set up JDK 8
3131
uses: actions/setup-java@v3
3232
with:
33-
java-version: '11'
33+
java-version: '8'
3434
distribution: 'adopt'
3535

3636
- uses: cedx/setup-ant@v2

.github/workflows/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333
JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-windows-${{ matrix.list.vs_name }}-java-${{ matrix.crt }}
3434

3535
steps:
36-
# Setup JDK 11
37-
- name: Set up JDK 11
36+
# Setup JDK 8
37+
- name: Set up JDK 8
3838
uses: actions/setup-java@v3
3939
with:
40-
java-version: '11'
40+
java-version: '8'
4141
distribution: 'adopt'
4242

4343
- uses: cedx/setup-ant@v2

README.md

+37-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,40 @@ OpenCV在OCR中只是做图像的读取保存、编解码、缩放等,可以
1616

1717
编译选项添加BUILD_WITH_STATIC_CRT=ON
1818

19-
### 关于LINUX musl工具链编译
19+
## 编译环境
20+
### Android
21+
| 操作系统 | ndk |
22+
|---|---|
23+
| ubuntu 22.04 | 25.2.9519653 |
24+
25+
### Windows
26+
| 操作系统 | vs版本 | JDK | ant |
27+
|---|---|-----|---|
28+
| 2019 | vs2017 | 8 | 1.10.14 |
29+
| 2019 | vs2019 | 8 | 1.10.14 |
30+
| 2022 | vs2022 | 8 | 1.10.14 |
31+
32+
### Ubuntu
33+
| 操作系统 | gcc | libc | binutils | JDK| ant|
34+
|---|---|---|---|---|---|
35+
| ubuntu 14.04 | 4.8.4 | 2.19 | 2.24 | 8 | 1.10.14 |
36+
| ubuntu 16.04 | 5.4.0 | 2.23 | 2.26.1 | 8 | 1.10.14 |
37+
| ubuntu 18.04 | 7.5.0 | 2.27 | 2.30 | 8 | 1.10.14 |
38+
| ubuntu 20.04 | 9.4.0 | 2.31 | 2.34 | 8 | 1.10.14 |
39+
| ubuntu 22.04 | 11.4.0 | 2.35 | 2.38 | 8 | 1.10.14 |
40+
41+
### Musl
42+
| 操作系统 | musl |
43+
|---|---|
44+
| ubuntu 22.04 | 11.3.1 |
45+
46+
### Macos
47+
| 操作系统 | JDK | ant|
48+
|---|---|---|
49+
| 10 | 8 | 1.10.14 |
50+
| 11 | 8 | 1.10.14 |
51+
| 12 | 8 | 1.10.14 |
52+
| 13 | 8 | 1.10.14 |
53+
54+
55+

0 commit comments

Comments
 (0)