Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 223c5e1

Browse filesBrowse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
tools: update gyp-next to 0.20.5
PR-URL: #60313 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent 43b9ea8 commit 223c5e1
Copy full SHA for 223c5e1

File tree

Expand file treeCollapse file tree

13 files changed

+35
-25
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

13 files changed

+35
-25
lines changed
Open diff view settings
Collapse file

‎tools/gyp/CHANGELOG.md‎

Copy file name to clipboardExpand all lines: tools/gyp/CHANGELOG.md
+8Lines changed: 8 additions & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [0.20.5](https://github.com/nodejs/gyp-next/compare/v0.20.4...v0.20.5) (2025-10-13)
4+
5+
6+
### Bug Fixes
7+
8+
* Fix ruff v0.13.0 adds ruff rule RUF059 ([bd4491a](https://github.com/nodejs/gyp-next/commit/bd4491a3ba641eeb040b785bbce367f72c3baf19))
9+
* handle `None` case in xcode_emulation regexes ([#311](https://github.com/nodejs/gyp-next/issues/311)) ([b21ee31](https://github.com/nodejs/gyp-next/commit/b21ee3150eea9fc1a8811e910e5ba64f42e1fb77))
10+
311
## [0.20.4](https://github.com/nodejs/gyp-next/compare/v0.20.3...v0.20.4) (2025-08-25)
412

513

Collapse file

‎tools/gyp/pylib/gyp/generator/android.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/android.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs):
378378
inputs = rule.get("inputs")
379379
for rule_source in rule.get("rule_sources", []):
380380
(rule_source_dirname, rule_source_basename) = os.path.split(rule_source)
381-
(rule_source_root, rule_source_ext) = os.path.splitext(
381+
(rule_source_root, _rule_source_ext) = os.path.splitext(
382382
rule_source_basename
383383
)
384384

Collapse file

‎tools/gyp/pylib/gyp/generator/compile_commands_json.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/compile_commands_json.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def resolve(filename):
100100
def GenerateOutput(target_list, target_dicts, data, params):
101101
per_config_commands = {}
102102
for qualified_target, target in target_dicts.items():
103-
build_file, target_name, toolset = gyp.common.ParseQualifiedTarget(
103+
build_file, _target_name, _toolset = gyp.common.ParseQualifiedTarget(
104104
qualified_target
105105
)
106106
if IsMac(params):
Collapse file

‎tools/gyp/pylib/gyp/generator/gypd.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/gypd.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
def GenerateOutput(target_list, target_dicts, data, params):
7474
output_files = {}
7575
for qualified_target in target_list:
76-
[input_file, target] = gyp.common.ParseQualifiedTarget(qualified_target)[0:2]
76+
[input_file, _target] = gyp.common.ParseQualifiedTarget(qualified_target)[0:2]
7777

7878
if input_file[-4:] != ".gyp":
7979
continue
Collapse file

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

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/make.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ def WriteRules(
11691169
for rule_source in rule.get("rule_sources", []):
11701170
dirs = set()
11711171
(rule_source_dirname, rule_source_basename) = os.path.split(rule_source)
1172-
(rule_source_root, rule_source_ext) = os.path.splitext(
1172+
(rule_source_root, _rule_source_ext) = os.path.splitext(
11731173
rule_source_basename
11741174
)
11751175

Collapse file

‎tools/gyp/pylib/gyp/generator/msvs.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/msvs.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,7 +1666,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
16661666
p.AddFileConfig(
16671667
source, _ConfigFullName(config_name, config), {}, tools=[tool]
16681668
)
1669-
basename, extension = os.path.splitext(source)
1669+
_basename, extension = os.path.splitext(source)
16701670
if extension == ".c":
16711671
extensions_excluded_from_precompile = [".cc", ".cpp", ".cxx"]
16721672
else:
@@ -1677,7 +1677,7 @@ def DisableForSourceTree(source_tree):
16771677
if isinstance(source, MSVSProject.Filter):
16781678
DisableForSourceTree(source.contents)
16791679
else:
1680-
basename, extension = os.path.splitext(source)
1680+
_basename, extension = os.path.splitext(source)
16811681
if extension in extensions_excluded_from_precompile:
16821682
for config_name, config in spec["configurations"].items():
16831683
tool = MSVSProject.Tool(
@@ -3579,7 +3579,7 @@ def _AddSources2(
35793579
# If the precompiled header is generated by a C source,
35803580
# we must not try to use it for C++ sources,
35813581
# and vice versa.
3582-
basename, extension = os.path.splitext(precompiled_source)
3582+
_basename, extension = os.path.splitext(precompiled_source)
35833583
if extension == ".c":
35843584
extensions_excluded_from_precompile = [
35853585
".cc",
Collapse file

‎tools/gyp/pylib/gyp/generator/xcode.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/xcode.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ def AddSourceToTarget(source, type, pbxp, xct):
531531
library_extensions = ["a", "dylib", "framework", "o"]
532532

533533
basename = posixpath.basename(source)
534-
(root, ext) = posixpath.splitext(basename)
534+
(_root, ext) = posixpath.splitext(basename)
535535
if ext:
536536
ext = ext[1:].lower()
537537

@@ -696,7 +696,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
696696
xcode_targets = {}
697697
xcode_target_to_target_dict = {}
698698
for qualified_target in target_list:
699-
[build_file, target_name, toolset] = gyp.common.ParseQualifiedTarget(
699+
[build_file, target_name, _toolset] = gyp.common.ParseQualifiedTarget(
700700
qualified_target
701701
)
702702

@@ -1215,7 +1215,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
12151215

12161216
# Add "sources".
12171217
for source in spec.get("sources", []):
1218-
(source_root, source_extension) = posixpath.splitext(source)
1218+
(_source_root, source_extension) = posixpath.splitext(source)
12191219
if source_extension[1:] not in rules_by_ext:
12201220
# AddSourceToTarget will add the file to a root group if it's not
12211221
# already there.
@@ -1227,7 +1227,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
12271227
# it's a bundle of any type.
12281228
if is_bundle:
12291229
for resource in tgt_mac_bundle_resources:
1230-
(resource_root, resource_extension) = posixpath.splitext(resource)
1230+
(_resource_root, resource_extension) = posixpath.splitext(resource)
12311231
if resource_extension[1:] not in rules_by_ext:
12321232
AddResourceToTarget(resource, pbxp, xct)
12331233
else:
Collapse file

‎tools/gyp/pylib/gyp/input.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/input.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2757,7 +2757,7 @@ def ValidateRulesInTarget(target, target_dict, extra_sources_for_rules):
27572757
source_keys.extend(extra_sources_for_rules)
27582758
for source_key in source_keys:
27592759
for source in target_dict.get(source_key, []):
2760-
(source_root, source_extension) = os.path.splitext(source)
2760+
(_source_root, source_extension) = os.path.splitext(source)
27612761
if source_extension.startswith("."):
27622762
source_extension = source_extension[1:]
27632763
if source_extension == rule_extension:
Collapse file

‎tools/gyp/pylib/gyp/xcode_emulation.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/xcode_emulation.py
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,18 +1534,20 @@ def CLTVersion():
15341534
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
15351535
MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables"
15361536

1537-
regex = re.compile("version: (?P<version>.+)")
1537+
regex = re.compile(r"version: (?P<version>.+)")
15381538
for key in [MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID]:
15391539
try:
15401540
output = GetStdout(["/usr/sbin/pkgutil", "--pkg-info", key])
1541-
return re.search(regex, output).groupdict()["version"]
1541+
if m := re.search(regex, output):
1542+
return m.groupdict()["version"]
15421543
except (GypError, OSError):
15431544
continue
15441545

15451546
regex = re.compile(r"Command Line Tools for Xcode\s+(?P<version>\S+)")
15461547
try:
15471548
output = GetStdout(["/usr/sbin/softwareupdate", "--history"])
1548-
return re.search(regex, output).groupdict()["version"]
1549+
if m := re.search(regex, output):
1550+
return m.groupdict()["version"]
15491551
except (GypError, OSError):
15501552
return None
15511553

Collapse file

‎tools/gyp/pylib/gyp/xcode_ninja.py‎

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/xcode_ninja.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
def _WriteWorkspace(main_gyp, sources_gyp, params):
2424
"""Create a workspace to wrap main and sources gyp paths."""
25-
(build_file_root, build_file_ext) = os.path.splitext(main_gyp)
25+
(build_file_root, _build_file_ext) = os.path.splitext(main_gyp)
2626
workspace_path = build_file_root + ".xcworkspace"
2727
options = params["options"]
2828
if options.generator_output:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.