Skip to content

Commit d31ea02

Browse files
gengjiawenRafaelGSS
authored andcommitted
tools: update gyp-next to v0.13.0
PR-URL: #44605 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
1 parent 99ad732 commit d31ea02

File tree

7 files changed

+90
-60
lines changed

7 files changed

+90
-60
lines changed

tools/gyp/.github/workflows/Python_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ 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", "3.10"]
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 }}
1818
uses: actions/setup-python@v3
1919
with:

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ jobs:
88
fail-fast: false
99
matrix:
1010
os: [macos-latest, ubuntu-latest, windows-latest]
11-
python: ["3.6", "3.10"]
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

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

+2-2
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

tools/gyp/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
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+
315
### [0.12.1](https://www.github.com/nodejs/gyp-next/compare/v0.12.0...v0.12.1) (2022-04-06)
416

517

tools/gyp/pylib/gyp/__init__.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,16 @@ def Load(
104104
default_variables.setdefault(key, val)
105105

106106
output_dir = params["options"].generator_output or params["options"].toplevel_dir
107-
if (default_variables['GENERATOR'] == 'ninja'):
108-
default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir,
109-
'out', default_variables['build_type']))
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+
)
110112
else:
111-
default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir,
112-
default_variables['build_type']))
113+
default_variables.setdefault(
114+
"PRODUCT_DIR_ABS",
115+
os.path.join(output_dir, default_variables["CONFIGURATION_NAME"]),
116+
)
113117

114118
# Give the generator the opportunity to set additional variables based on
115119
# the params it will receive in the output phase.

tools/gyp/pylib/gyp/generator/make.py

+61-47
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def CalculateVariables(default_variables, params):
106106
default_variables.setdefault("SHARED_LIB_DIR", "$(builddir)/lib.$(TOOLSET)")
107107
default_variables.setdefault("LIB_DIR", "$(obj).$(TOOLSET)")
108108

109+
109110
def CalculateGeneratorInputInfo(params):
110111
"""Calculate the generator specific info that gets fed to input (called by
111112
gyp)."""
@@ -157,12 +158,12 @@ def CalculateGeneratorInputInfo(params):
157158
158159
# Note: this does not handle spaces in paths
159160
define xargs
160-
$(1) $(word 1,$(2))
161+
$(1) $(word 1,$(2))
161162
$(if $(word 2,$(2)),$(call xargs,$(1),$(wordlist 2,$(words $(2)),$(2))))
162163
endef
163164
164165
define write-to-file
165-
@: >$(1)
166+
@: >$(1)
166167
$(call xargs,@printf "%s\\n" >>$(1),$(2))
167168
endef
168169
@@ -226,12 +227,12 @@ def CalculateGeneratorInputInfo(params):
226227
227228
# Note: this does not handle spaces in paths
228229
define xargs
229-
$(1) $(word 1,$(2))
230+
$(1) $(word 1,$(2))
230231
$(if $(word 2,$(2)),$(call xargs,$(1),$(wordlist 2,$(words $(2)),$(2))))
231232
endef
232233
233234
define write-to-file
234-
@: >$(1)
235+
@: >$(1)
235236
$(call xargs,@printf "%s\\n" >>$(1),$(2))
236237
endef
237238
@@ -1858,35 +1859,35 @@ def WriteTarget(
18581859
self.flavor not in ("mac", "openbsd", "netbsd", "win")
18591860
and not self.is_standalone_static_library
18601861
):
1861-
if self.flavor in ('linux', 'android'):
1862-
self.WriteMakeRule(
1863-
[self.output_binary],
1864-
link_deps,
1865-
actions = ['$(call create_thin_archive,$@,$^)']
1866-
)
1862+
if self.flavor in ("linux", "android"):
1863+
self.WriteMakeRule(
1864+
[self.output_binary],
1865+
link_deps,
1866+
actions=["$(call create_thin_archive,$@,$^)"],
1867+
)
18671868
else:
1868-
self.WriteDoCmd(
1869-
[self.output_binary],
1870-
link_deps,
1871-
"alink_thin",
1872-
part_of_all,
1873-
postbuilds=postbuilds,
1874-
)
1869+
self.WriteDoCmd(
1870+
[self.output_binary],
1871+
link_deps,
1872+
"alink_thin",
1873+
part_of_all,
1874+
postbuilds=postbuilds,
1875+
)
18751876
else:
1876-
if self.flavor in ('linux', 'android'):
1877-
self.WriteMakeRule(
1878-
[self.output_binary],
1879-
link_deps,
1880-
actions = ['$(call create_archive,$@,$^)']
1881-
)
1882-
else:
1883-
self.WriteDoCmd(
1884-
[self.output_binary],
1885-
link_deps,
1886-
"alink",
1887-
part_of_all,
1888-
postbuilds=postbuilds,
1889-
)
1877+
if self.flavor in ("linux", "android"):
1878+
self.WriteMakeRule(
1879+
[self.output_binary],
1880+
link_deps,
1881+
actions=["$(call create_archive,$@,$^)"],
1882+
)
1883+
else:
1884+
self.WriteDoCmd(
1885+
[self.output_binary],
1886+
link_deps,
1887+
"alink",
1888+
part_of_all,
1889+
postbuilds=postbuilds,
1890+
)
18901891
elif self.type == "shared_library":
18911892
self.WriteLn(
18921893
"%s: LD_INPUTS := %s"
@@ -1904,9 +1905,15 @@ def WriteTarget(
19041905
)
19051906
# z/OS has a .so target as well as a sidedeck .x target
19061907
if self.flavor == "zos":
1907-
self.WriteLn('%s: %s' % (
1908-
QuoteSpaces(self.GetSharedObjectFromSidedeck(self.output_binary)),
1909-
QuoteSpaces(self.output_binary)))
1908+
self.WriteLn(
1909+
"%s: %s"
1910+
% (
1911+
QuoteSpaces(
1912+
self.GetSharedObjectFromSidedeck(self.output_binary)
1913+
),
1914+
QuoteSpaces(self.output_binary),
1915+
)
1916+
)
19101917
elif self.type == "loadable_module":
19111918
for link_dep in link_deps:
19121919
assert " " not in link_dep, (
@@ -1993,35 +2000,42 @@ def WriteTarget(
19932000
)
19942001
if self.flavor != "zos":
19952002
installable_deps.append(install_path)
1996-
if self.flavor == 'zos' and self.type == 'shared_library':
2003+
if self.flavor == "zos" and self.type == "shared_library":
19972004
# lib.target/libnode.so has a dependency on $(obj).target/libnode.so
1998-
self.WriteDoCmd([self.GetSharedObjectFromSidedeck(install_path)],
1999-
[self.GetSharedObjectFromSidedeck(self.output)], 'copy',
2000-
comment='Copy this to the %s output path.' %
2001-
file_desc, part_of_all=part_of_all)
2005+
self.WriteDoCmd(
2006+
[self.GetSharedObjectFromSidedeck(install_path)],
2007+
[self.GetSharedObjectFromSidedeck(self.output)],
2008+
"copy",
2009+
comment="Copy this to the %s output path." % file_desc,
2010+
part_of_all=part_of_all,
2011+
)
20022012
# Create a symlink of libnode.x to libnode.version.x
2003-
self.WriteDoCmd([self.GetUnversionedSidedeckFromSidedeck(install_path)],
2004-
[install_path], 'symlink',
2005-
comment='Symlnk this to the %s output path.' %
2006-
file_desc, part_of_all=part_of_all)
2013+
self.WriteDoCmd(
2014+
[self.GetUnversionedSidedeckFromSidedeck(install_path)],
2015+
[install_path],
2016+
"symlink",
2017+
comment="Symlnk this to the %s output path." % file_desc,
2018+
part_of_all=part_of_all,
2019+
)
20072020
# Place libnode.version.so and libnode.x symlink in lib.target dir
20082021
installable_deps.append(self.GetSharedObjectFromSidedeck(install_path))
20092022
installable_deps.append(
2010-
self.GetUnversionedSidedeckFromSidedeck(install_path))
2023+
self.GetUnversionedSidedeckFromSidedeck(install_path)
2024+
)
20112025
if self.output != self.alias and self.alias != self.target:
20122026
self.WriteMakeRule(
20132027
[self.alias],
20142028
installable_deps,
20152029
comment="Short alias for building this %s." % file_desc,
20162030
phony=True,
20172031
)
2018-
if self.flavor == 'zos' and self.type == 'shared_library':
2032+
if self.flavor == "zos" and self.type == "shared_library":
20192033
# Make sure that .x symlink target is run
20202034
self.WriteMakeRule(
2021-
['all'],
2035+
["all"],
20222036
[
20232037
self.GetUnversionedSidedeckFromSidedeck(install_path),
2024-
self.GetSharedObjectFromSidedeck(install_path)
2038+
self.GetSharedObjectFromSidedeck(install_path),
20252039
],
20262040
comment='Add %s to "all" target.' % file_desc,
20272041
phony=True,

tools/gyp/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
setup(
1717
name="gyp-next",
18-
version="0.12.1",
18+
version="0.13.0",
1919
description="A fork of the GYP build system for use in the Node.js projects",
2020
long_description=long_description,
2121
long_description_content_type="text/markdown",

0 commit comments

Comments
 (0)