Skip to content

Commit 9988310

Browse files
guoxianzhesda-rob
andauthored
feat: support 4.1.1.28 (#1170)
* chore: config terra to 4.1.1.28 * [AUTO] Generate codes by terra (#1169) Co-authored-by: guoxianzhe <[email protected]> --------- Co-authored-by: sda-rob <[email protected]> Co-authored-by: guoxianzhe <[email protected]>
1 parent d47f500 commit 9988310

21 files changed

+497
-4127
lines changed

.github/workflows/terra.yml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
generate-code: true
2424
generate-comment: true
2525
generate-code-command: |
26+
sh generate-prepare.sh
2627
sh generate-code.sh
2728
generate-comment-command: |
2829
sh generate-comment.sh

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"yuv-canvas": "1.2.6"
137137
},
138138
"agora_electron": {
139-
"iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.1.1.24-build.1_DCG_Windows_Video_20240108_0107.zip",
140-
"iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.1.1.24-build.1_DCG_Mac_Video_20240108_0107.zip"
139+
"iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.1.1.28-build.1_DCG_Windows_Video_20240314_0614.zip",
140+
"iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.1.1.28-build.1_DCG_Mac_Video_20240314_0614.zip"
141141
}
142142
}

scripts/terra/.yarnrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
nodeLinker: node-modules
2+
enableImmutableInstalls: false
23

34
yarnPath: .yarn/releases/yarn-4.0.1.cjs

scripts/terra/code_config.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ parsers:
33
package: '@agoraio-extensions/terra-legacy-cxx-parser'
44
args:
55
includeHeaderDirs:
6-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include'
6+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include'
77
parseFiles:
88
include:
9-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/*.h'
9+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/*.h'
1010
exclude:
11-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/AgoraRefPtr.h'
12-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/time_utils.h'
13-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/AgoraOptional.h'
14-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/AgoraRefPtr.h'
15-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/IAgoraH265Transcoder.h'
16-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/IAgoraMediaComponentFactory.h'
17-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/IAgoraParameter.h'
11+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/AgoraRefPtr.h'
12+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/time_utils.h'
13+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/AgoraOptional.h'
14+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/AgoraRefPtr.h'
15+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/IAgoraH265Transcoder.h'
16+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/IAgoraMediaComponentFactory.h'
17+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/IAgoraParameter.h'
1818
customHeaders:
19-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/custom_headers/*.h'
19+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/custom_headers/*.h'
2020
language: ts
2121
definesMacros:
2222
- __ELECTRON__

scripts/terra/generate-prepare.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
set -x
4+
5+
# treated as a completely separate project (not even a workspace), create an empty yarn.lock file in it.
6+
touch yarn.lock
7+
rm -rf node_modules
8+
rm -rf .terra
9+
yarn install
10+
rm yarn.lock

scripts/terra/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"@types/node": "^20.6.0"
1313
},
1414
"dependencies": {
15-
"@agoraio-extensions/terra": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra",
16-
"@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra-core",
17-
"@agoraio-extensions/terra-legacy-cxx-parser": "[email protected]:AgoraIO-Extensions/terra-legacy-cxx-parser.git#commit=5455afd2c5e29013d9a3cb8d06150c162450a5ed",
18-
"@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=122adde0def096fbd409c394774f1ecbe4d8b215",
15+
"@agoraio-extensions/terra-legacy-cxx-parser": "[email protected]:AgoraIO-Extensions/terra-legacy-cxx-parser.git",
16+
"@agoraio-extensions/terra": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=terra",
17+
"@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=terra-core",
18+
"@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#head=main",
1919
"ts-node": "^10.9.1",
2020
"typescript": "^5.1.6"
2121
},

0 commit comments

Comments
 (0)