Skip to content

Commit

Permalink
Merge branch 'flatbuffers' into flatbuffer-fix-missing-create-webrtc-…
Browse files Browse the repository at this point in the history
…transport-options
  • Loading branch information
ibc committed Oct 19, 2023
2 parents 5c9291e + 1e30046 commit 51a6c62
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 17 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
* Add pause/resume API in `DataProducer` and `DataConsumer` ([PR #1104](https://github.com/versatica/mediasoup/pull/1104)).
* DataChannel subchannels feature ([PR #1152](https://github.com/versatica/mediasoup/pull/1152)).
* `Worker`: Make DTLS fragment stay within MTU size range ([PR #1156](https://github.com/versatica/mediasoup/pull/1156), based on [PR #1143](https://github.com/versatica/mediasoup/pull/1143) by @vpnts-se).


### 3.12.14

* CI: Use Node.js version 20 ([PR #1177](https://github.com/versatica/mediasoup/pull/1177)).
* Use given `PYTHON` environment variable (if given) when running `worker/scripts/getmake.py` ([PR #1186](https://github.com/versatica/mediasoup/pull/1186)).


### 3.12.13
Expand Down
25 changes: 19 additions & 6 deletions npm-scripts.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -474,21 +474,34 @@ function installMsysMake()
{
logInfo('installMsysMake()');

let res = spawnSync('where', [ 'python3.exe' ]);
let pythonPath;

if (res.status !== 0)
// If PYTHON environment variable is given, use it.
if (process.env.PYTHON)
{
res = spawnSync('where', [ 'python.exe' ]);
pythonPath = process.env.PYTHON;
}
// Otherwise ensure python3.exe is available in the PATH.
else
{
let res = spawnSync('where', [ 'python3.exe' ]);

if (res.status !== 0)
{
logError('`installMsysMake() | cannot find Python executable');
res = spawnSync('where', [ 'python.exe' ]);

exitWithError();
if (res.status !== 0)
{
logError('`installMsysMake() | cannot find Python executable');

exitWithError();
}
}

pythonPath = String(res.stdout).trim();
}

executeCmd(`${String(res.stdout).trim()} worker\\scripts\\getmake.py`);
executeCmd(`${pythonPath} worker\\scripts\\getmake.py`);
}

function ensureDir(dir)
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mediasoup",
"version": "3.12.13",
"version": "3.12.14",
"description": "Cutting Edge WebRTC Video Conferencing",
"contributors": [
"Iñaki Baz Castillo <[email protected]> (https://inakibaz.me)",
Expand Down Expand Up @@ -108,7 +108,7 @@
"@types/debug": "^4.1.10",
"@types/jest": "^29.5.6",
"@types/node": "^20.8.7",
"@types/uuid": "^9.0.5",
"@types/uuid": "^9.0.6",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"eslint": "^8.51.0",
Expand Down

0 comments on commit 51a6c62

Please sign in to comment.