Skip to content

Commit 3e2a532

Browse files
kadlerrichardlau
authored andcommitted
feat(gyp): update gyp to v0.13.0
1 parent c379a74 commit 3e2a532

File tree

13 files changed

+275
-48
lines changed

13 files changed

+275
-48
lines changed

gyp/.github/workflows/Python_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
max-parallel: 8
1212
matrix:
1313
os: [macos-latest, ubuntu-latest] # , windows-latest]
14-
python-version: [3.6, 3.7, 3.8, 3.9]
14+
python-version: ["3.7", "3.8", "3.9", "3.10"]
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v3
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies

gyp/.github/workflows/node-gyp.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ jobs:
88
fail-fast: false
99
matrix:
1010
os: [macos-latest, ubuntu-latest, windows-latest]
11-
python: [3.6, 3.9]
11+
python: ["3.7", "3.10"]
1212

1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- name: Clone gyp-next
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
path: gyp-next
1919
- name: Clone nodejs/node-gyp
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
with:
2222
repository: nodejs/node-gyp
2323
path: node-gyp
24-
- uses: actions/setup-node@v2
24+
- uses: actions/setup-node@v3
2525
with:
2626
node-version: 14.x
27-
- uses: actions/setup-python@v2
27+
- uses: actions/setup-python@v3
2828
with:
2929
python-version: ${{ matrix.python }}
3030
- name: Install dependencies

gyp/.github/workflows/nodejs-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
runs-on: windows-latest
88
steps:
99
- name: Clone gyp-next
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v3
1111
with:
1212
path: gyp-next
1313
- name: Clone nodejs/node
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515
with:
1616
repository: nodejs/node
1717
path: node

gyp/CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
# Changelog
22

3+
## [0.13.0](https://www.github.com/nodejs/gyp-next/compare/v0.12.1...v0.13.0) (2022-05-11)
4+
5+
6+
### Features
7+
8+
* add PRODUCT_DIR_ABS variable ([#151](https://www.github.com/nodejs/gyp-next/issues/151)) ([80d2626](https://www.github.com/nodejs/gyp-next/commit/80d26263581db829b61b312a7bdb5cc791df7824))
9+
10+
11+
### Bug Fixes
12+
13+
* execvp: printf: Argument list too long ([#147](https://www.github.com/nodejs/gyp-next/issues/147)) ([c4e14f3](https://www.github.com/nodejs/gyp-next/commit/c4e14f301673fadbac3ab7882d0b5f4d02530cb9))
14+
15+
### [0.12.1](https://www.github.com/nodejs/gyp-next/compare/v0.12.0...v0.12.1) (2022-04-06)
16+
17+
18+
### Bug Fixes
19+
20+
* **msvs:** avoid fixing path for arguments with "=" ([#143](https://www.github.com/nodejs/gyp-next/issues/143)) ([7e8f16e](https://www.github.com/nodejs/gyp-next/commit/7e8f16eb165e042e64bec98fa6c2a0232a42c26b))
21+
22+
## [0.12.0](https://www.github.com/nodejs/gyp-next/compare/v0.11.0...v0.12.0) (2022-04-04)
23+
24+
25+
### Features
26+
27+
* support building shared libraries on z/OS ([#137](https://www.github.com/nodejs/gyp-next/issues/137)) ([293bcfa](https://www.github.com/nodejs/gyp-next/commit/293bcfa4c25c6adb743377adafc45a80fee492c6))
28+
29+
## [0.11.0](https://www.github.com/nodejs/gyp-next/compare/v0.10.1...v0.11.0) (2022-03-04)
30+
31+
32+
### Features
33+
34+
* Add proper support for IBM i ([#140](https://www.github.com/nodejs/gyp-next/issues/140)) ([fdda4a3](https://www.github.com/nodejs/gyp-next/commit/fdda4a3038b8a7042ad960ce7a223687c24a21b1))
35+
36+
### [0.10.1](https://www.github.com/nodejs/gyp-next/compare/v0.10.0...v0.10.1) (2021-11-24)
37+
38+
39+
### Bug Fixes
40+
41+
* **make:** only generate makefile for multiple toolsets if requested ([#133](https://www.github.com/nodejs/gyp-next/issues/133)) ([f463a77](https://www.github.com/nodejs/gyp-next/commit/f463a77705973289ea38fec1b244c922ac438e26))
42+
343
## [0.10.0](https://www.github.com/nodejs/gyp-next/compare/v0.9.6...v0.10.0) (2021-08-26)
444

545

gyp/pylib/gyp/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,18 @@ def Load(
103103
for (key, val) in generator.generator_default_variables.items():
104104
default_variables.setdefault(key, val)
105105

106+
output_dir = params["options"].generator_output or params["options"].toplevel_dir
107+
if default_variables["GENERATOR"] == "ninja":
108+
default_variables.setdefault(
109+
"PRODUCT_DIR_ABS",
110+
os.path.join(output_dir, "out", default_variables["build_type"]),
111+
)
112+
else:
113+
default_variables.setdefault(
114+
"PRODUCT_DIR_ABS",
115+
os.path.join(output_dir, default_variables["CONFIGURATION_NAME"]),
116+
)
117+
106118
# Give the generator the opportunity to set additional variables based on
107119
# the params it will receive in the output phase.
108120
if getattr(generator, "CalculateVariables", None):

gyp/pylib/gyp/common.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,8 @@ def GetFlavor(params):
454454
return "aix"
455455
if sys.platform.startswith(("os390", "zos")):
456456
return "zos"
457+
if sys.platform == "os400":
458+
return "os400"
457459

458460
return "linux"
459461

@@ -463,9 +465,13 @@ def CopyTool(flavor, out_path, generator_flags={}):
463465
to |out_path|."""
464466
# aix and solaris just need flock emulation. mac and win use more complicated
465467
# support scripts.
466-
prefix = {"aix": "flock", "solaris": "flock", "mac": "mac", "win": "win"}.get(
467-
flavor, None
468-
)
468+
prefix = {
469+
"aix": "flock",
470+
"os400": "flock",
471+
"solaris": "flock",
472+
"mac": "mac",
473+
"win": "win",
474+
}.get(flavor, None)
469475
if not prefix:
470476
return
471477

gyp/pylib/gyp/flock_tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def ExecFlock(self, lockfile, *cmd_list):
4141
# with EBADF, that's why we use this F_SETLK
4242
# hack instead.
4343
fd = os.open(lockfile, os.O_WRONLY | os.O_NOCTTY | os.O_CREAT, 0o666)
44-
if sys.platform.startswith("aix"):
44+
if sys.platform.startswith("aix") or sys.platform == "os400":
4545
# Python on AIX is compiled with LARGEFILE support, which changes the
4646
# struct size.
4747
op = struct.pack("hhIllqq", fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)

0 commit comments

Comments
 (0)