Skip to content

Commit 4e02ea1

Browse files
nodejs-github-bottargos
authored andcommitted
tools: update gyp-next to 0.20.3
PR-URL: #59603 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent b4f202c commit 4e02ea1

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

tools/gyp/CHANGELOG.md

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

3+
## [0.20.3](https://github.com/nodejs/gyp-next/compare/v0.20.2...v0.20.3) (2025-08-20)
4+
5+
6+
### Bug Fixes
7+
8+
* compilation failure on the OpenHarmony platform ([#301](https://github.com/nodejs/gyp-next/issues/301)) ([0cf7a14](https://github.com/nodejs/gyp-next/commit/0cf7a142be06f686b8b42849791de902f177cf9f))
9+
* make xcode_emulation handle `xcodebuild` not in the `PATH` ([#303](https://github.com/nodejs/gyp-next/issues/303)) ([8224dee](https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb))
10+
311
## [0.20.2](https://github.com/nodejs/gyp-next/compare/v0.20.1...v0.20.2) (2025-06-22)
412

513

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,7 @@ def WriteTarget(
18801880
self.flavor not in ("mac", "openbsd", "netbsd", "win")
18811881
and not self.is_standalone_static_library
18821882
):
1883-
if self.flavor in ("linux", "android"):
1883+
if self.flavor in ("linux", "android", "openharmony"):
18841884
self.WriteMakeRule(
18851885
[self.output_binary],
18861886
link_deps,
@@ -1894,7 +1894,7 @@ def WriteTarget(
18941894
part_of_all,
18951895
postbuilds=postbuilds,
18961896
)
1897-
elif self.flavor in ("linux", "android"):
1897+
elif self.flavor in ("linux", "android", "openharmony"):
18981898
self.WriteMakeRule(
18991899
[self.output_binary],
19001900
link_deps,

tools/gyp/pylib/gyp/xcode_emulation.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ def _GetSdkVersionInfoItem(self, sdk, infoitem):
521521
# most sensible route and should still do the right thing.
522522
try:
523523
return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
524-
except GypError:
524+
except (GypError, OSError):
525525
pass
526526

527527
def _SdkRoot(self, configname):
@@ -1354,7 +1354,7 @@ def _DefaultSdkRoot(self):
13541354
return default_sdk_root
13551355
try:
13561356
all_sdks = GetStdout(["xcodebuild", "-showsdks"])
1357-
except GypError:
1357+
except (GypError, OSError):
13581358
# If xcodebuild fails, there will be no valid SDKs
13591359
return ""
13601360
for line in all_sdks.splitlines():
@@ -1508,7 +1508,8 @@ def XcodeVersion():
15081508
raise GypError("xcodebuild returned unexpected results")
15091509
version = version_list[0].split()[-1] # Last word on first line
15101510
build = version_list[-1].split()[-1] # Last word on last line
1511-
except GypError: # Xcode not installed so look for XCode Command Line Tools
1511+
except (GypError, OSError):
1512+
# Xcode not installed so look for XCode Command Line Tools
15121513
version = CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
15131514
if not version:
15141515
raise GypError("No Xcode or CLT version detected!")
@@ -1541,14 +1542,14 @@ def CLTVersion():
15411542
try:
15421543
output = GetStdout(["/usr/sbin/pkgutil", "--pkg-info", key])
15431544
return re.search(regex, output).groupdict()["version"]
1544-
except GypError:
1545+
except (GypError, OSError):
15451546
continue
15461547

15471548
regex = re.compile(r"Command Line Tools for Xcode\s+(?P<version>\S+)")
15481549
try:
15491550
output = GetStdout(["/usr/sbin/softwareupdate", "--history"])
15501551
return re.search(regex, output).groupdict()["version"]
1551-
except GypError:
1552+
except (GypError, OSError):
15521553
return None
15531554

15541555

tools/gyp/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "gyp-next"
7-
version = "0.20.2"
7+
version = "0.20.3"
88
authors = [
99
{ name="Node.js contributors", email="ryzokuken@disroot.org" },
1010
]

0 commit comments

Comments
 (0)