Commit 4e02ea1
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,13 @@ | |||
| 1 | 1 | # Changelog | |
| 2 | 2 | ||
| 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 | + | ||
| 3 | 11 | ## [0.20.2](https://github.com/nodejs/gyp-next/compare/v0.20.1...v0.20.2) (2025-06-22) | |
| 4 | 12 | ||
| 5 | 13 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1880,7 +1880,7 @@ def WriteTarget( | |||
| 1880 | 1880 | self.flavor not in ("mac", "openbsd", "netbsd", "win") | |
| 1881 | 1881 | and not self.is_standalone_static_library | |
| 1882 | 1882 | ): | |
| 1883 | - if self.flavor in ("linux", "android"): | ||
| 1883 | + if self.flavor in ("linux", "android", "openharmony"): | ||
| 1884 | 1884 | self.WriteMakeRule( | |
| 1885 | 1885 | [self.output_binary], | |
| 1886 | 1886 | link_deps, | |
@@ -1894,7 +1894,7 @@ def WriteTarget( | |||
| 1894 | 1894 | part_of_all, | |
| 1895 | 1895 | postbuilds=postbuilds, | |
| 1896 | 1896 | ) | |
| 1897 | - elif self.flavor in ("linux", "android"): | ||
| 1897 | + elif self.flavor in ("linux", "android", "openharmony"): | ||
| 1898 | 1898 | self.WriteMakeRule( | |
| 1899 | 1899 | [self.output_binary], | |
| 1900 | 1900 | link_deps, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -521,7 +521,7 @@ def _GetSdkVersionInfoItem(self, sdk, infoitem): | |||
| 521 | 521 | # most sensible route and should still do the right thing. | |
| 522 | 522 | try: | |
| 523 | 523 | return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem]) | |
| 524 | - except GypError: | ||
| 524 | + except (GypError, OSError): | ||
| 525 | 525 | pass | |
| 526 | 526 | ||
| 527 | 527 | def _SdkRoot(self, configname): | |
@@ -1354,7 +1354,7 @@ def _DefaultSdkRoot(self): | |||
| 1354 | 1354 | return default_sdk_root | |
| 1355 | 1355 | try: | |
| 1356 | 1356 | all_sdks = GetStdout(["xcodebuild", "-showsdks"]) | |
| 1357 | - except GypError: | ||
| 1357 | + except (GypError, OSError): | ||
| 1358 | 1358 | # If xcodebuild fails, there will be no valid SDKs | |
| 1359 | 1359 | return "" | |
| 1360 | 1360 | for line in all_sdks.splitlines(): | |
@@ -1508,7 +1508,8 @@ def XcodeVersion(): | |||
| 1508 | 1508 | raise GypError("xcodebuild returned unexpected results") | |
| 1509 | 1509 | version = version_list[0].split()[-1] # Last word on first line | |
| 1510 | 1510 | 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 | ||
| 1512 | 1513 | version = CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322 | |
| 1513 | 1514 | if not version: | |
| 1514 | 1515 | raise GypError("No Xcode or CLT version detected!") | |
@@ -1541,14 +1542,14 @@ def CLTVersion(): | |||
| 1541 | 1542 | try: | |
| 1542 | 1543 | output = GetStdout(["/usr/sbin/pkgutil", "--pkg-info", key]) | |
| 1543 | 1544 | return re.search(regex, output).groupdict()["version"] | |
| 1544 | - except GypError: | ||
| 1545 | + except (GypError, OSError): | ||
| 1545 | 1546 | continue | |
| 1546 | 1547 | ||
| 1547 | 1548 | regex = re.compile(r"Command Line Tools for Xcode\s+(?P<version>\S+)") | |
| 1548 | 1549 | try: | |
| 1549 | 1550 | output = GetStdout(["/usr/sbin/softwareupdate", "--history"]) | |
| 1550 | 1551 | return re.search(regex, output).groupdict()["version"] | |
| 1551 | - except GypError: | ||
| 1552 | + except (GypError, OSError): | ||
| 1552 | 1553 | return None | |
| 1553 | 1554 | ||
| 1554 | 1555 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" | |||
| 4 | 4 | ||
| 5 | 5 | [project] | |
| 6 | 6 | name = "gyp-next" | |
| 7 | - version = "0.20.2" | ||
| 7 | + version = "0.20.3" | ||
| 8 | 8 | authors = [ | |
| 9 | 9 | { name="Node.js contributors", email="ryzokuken@disroot.org" }, | |
| 10 | 10 | ] | |
0 commit comments