OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 00:20:08 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

tools: update gyp-next to 0.20.5

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/60313
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
This commit is contained in:
Node.js GitHub Bot 2025-10-22 16:16:45 +01:00 committed by GitHub
parent 5c50445dfc
commit f0679db554
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/gyp/CHANGELOG.md
View File

@ -1,5 +1,13 @@
# Changelog # Changelog
## [0.20.5](https://github.com/nodejs/gyp-next/compare/v0.20.4...v0.20.5) (2025-10-13)
### Bug Fixes
* Fix ruff v0.13.0 adds ruff rule RUF059 ([bd4491a](https://github.com/nodejs/gyp-next/commit/bd4491a3ba641eeb040b785bbce367f72c3baf19))
* 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))
## [0.20.4](https://github.com/nodejs/gyp-next/compare/v0.20.3...v0.20.4) (2025-08-25) ## [0.20.4](https://github.com/nodejs/gyp-next/compare/v0.20.3...v0.20.4) (2025-08-25)

2
tools/gyp/pylib/gyp/generator/android.py
View File

@ -378,7 +378,7 @@ class AndroidMkWriter:
inputs = rule.get("inputs") inputs = rule.get("inputs")
for rule_source in rule.get("rule_sources", []): for rule_source in rule.get("rule_sources", []):
(rule_source_dirname, rule_source_basename) = os.path.split(rule_source) (rule_source_dirname, rule_source_basename) = os.path.split(rule_source)
(rule_source_root, rule_source_ext) = os.path.splitext( (rule_source_root, _rule_source_ext) = os.path.splitext(
rule_source_basename rule_source_basename
) )

2
tools/gyp/pylib/gyp/generator/compile_commands_json.py
View File

@ -100,7 +100,7 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
def GenerateOutput(target_list, target_dicts, data, params): def GenerateOutput(target_list, target_dicts, data, params):
per_config_commands = {} per_config_commands = {}
for qualified_target, target in target_dicts.items(): for qualified_target, target in target_dicts.items():
build_file, target_name, toolset = gyp.common.ParseQualifiedTarget( build_file, _target_name, _toolset = gyp.common.ParseQualifiedTarget(
qualified_target qualified_target
) )
if IsMac(params): if IsMac(params):

2
tools/gyp/pylib/gyp/generator/gypd.py
View File

@ -73,7 +73,7 @@ for v in _generator_identity_variables:
def GenerateOutput(target_list, target_dicts, data, params): def GenerateOutput(target_list, target_dicts, data, params):
output_files = {} output_files = {}
for qualified_target in target_list: for qualified_target in target_list:
[input_file, target] = gyp.common.ParseQualifiedTarget(qualified_target)[0:2] [input_file, _target] = gyp.common.ParseQualifiedTarget(qualified_target)[0:2]
if input_file[-4:] != ".gyp": if input_file[-4:] != ".gyp":
continue continue

2
tools/gyp/pylib/gyp/generator/make.py
View File

@ -1169,7 +1169,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
for rule_source in rule.get("rule_sources", []): for rule_source in rule.get("rule_sources", []):
dirs = set() dirs = set()
(rule_source_dirname, rule_source_basename) = os.path.split(rule_source) (rule_source_dirname, rule_source_basename) = os.path.split(rule_source)
(rule_source_root, rule_source_ext) = os.path.splitext( (rule_source_root, _rule_source_ext) = os.path.splitext(
rule_source_basename rule_source_basename
) )

6
tools/gyp/pylib/gyp/generator/msvs.py
View File

@ -1666,7 +1666,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
p.AddFileConfig( p.AddFileConfig(
source, _ConfigFullName(config_name, config), {}, tools=[tool] source, _ConfigFullName(config_name, config), {}, tools=[tool]
) )
basename, extension = os.path.splitext(source) _basename, extension = os.path.splitext(source)
if extension == ".c": if extension == ".c":
extensions_excluded_from_precompile = [".cc", ".cpp", ".cxx"] extensions_excluded_from_precompile = [".cc", ".cpp", ".cxx"]
else: else:
@ -1677,7 +1677,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
if isinstance(source, MSVSProject.Filter): if isinstance(source, MSVSProject.Filter):
DisableForSourceTree(source.contents) DisableForSourceTree(source.contents)
else: else:
basename, extension = os.path.splitext(source) _basename, extension = os.path.splitext(source)
if extension in extensions_excluded_from_precompile: if extension in extensions_excluded_from_precompile:
for config_name, config in spec["configurations"].items(): for config_name, config in spec["configurations"].items():
tool = MSVSProject.Tool( tool = MSVSProject.Tool(
@ -3579,7 +3579,7 @@ def _AddSources2(
# If the precompiled header is generated by a C source, # If the precompiled header is generated by a C source,
# we must not try to use it for C++ sources, # we must not try to use it for C++ sources,
# and vice versa. # and vice versa.
basename, extension = os.path.splitext(precompiled_source) _basename, extension = os.path.splitext(precompiled_source)
if extension == ".c": if extension == ".c":
extensions_excluded_from_precompile = [ extensions_excluded_from_precompile = [
".cc", ".cc",

8
tools/gyp/pylib/gyp/generator/xcode.py
View File

@ -531,7 +531,7 @@ def AddSourceToTarget(source, type, pbxp, xct):
library_extensions = ["a", "dylib", "framework", "o"] library_extensions = ["a", "dylib", "framework", "o"]
basename = posixpath.basename(source) basename = posixpath.basename(source)
(root, ext) = posixpath.splitext(basename) (_root, ext) = posixpath.splitext(basename)
if ext: if ext:
ext = ext[1:].lower() ext = ext[1:].lower()
@ -696,7 +696,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
xcode_targets = {} xcode_targets = {}
xcode_target_to_target_dict = {} xcode_target_to_target_dict = {}
for qualified_target in target_list: for qualified_target in target_list:
[build_file, target_name, toolset] = gyp.common.ParseQualifiedTarget( [build_file, target_name, _toolset] = gyp.common.ParseQualifiedTarget(
qualified_target qualified_target
) )
@ -1215,7 +1215,7 @@ exit 1
# Add "sources". # Add "sources".
for source in spec.get("sources", []): for source in spec.get("sources", []):
(source_root, source_extension) = posixpath.splitext(source) (_source_root, source_extension) = posixpath.splitext(source)
if source_extension[1:] not in rules_by_ext: if source_extension[1:] not in rules_by_ext:
# AddSourceToTarget will add the file to a root group if it's not # AddSourceToTarget will add the file to a root group if it's not
# already there. # already there.
@ -1227,7 +1227,7 @@ exit 1
# it's a bundle of any type. # it's a bundle of any type.
if is_bundle: if is_bundle:
for resource in tgt_mac_bundle_resources: for resource in tgt_mac_bundle_resources:
(resource_root, resource_extension) = posixpath.splitext(resource) (_resource_root, resource_extension) = posixpath.splitext(resource)
if resource_extension[1:] not in rules_by_ext: if resource_extension[1:] not in rules_by_ext:
AddResourceToTarget(resource, pbxp, xct) AddResourceToTarget(resource, pbxp, xct)
else: else:

2
tools/gyp/pylib/gyp/input.py
View File

@ -2757,7 +2757,7 @@ def ValidateRulesInTarget(target, target_dict, extra_sources_for_rules):
source_keys.extend(extra_sources_for_rules) source_keys.extend(extra_sources_for_rules)
for source_key in source_keys: for source_key in source_keys:
for source in target_dict.get(source_key, []): for source in target_dict.get(source_key, []):
(source_root, source_extension) = os.path.splitext(source) (_source_root, source_extension) = os.path.splitext(source)
if source_extension.startswith("."): if source_extension.startswith("."):
source_extension = source_extension[1:] source_extension = source_extension[1:]
if source_extension == rule_extension: if source_extension == rule_extension:

8
tools/gyp/pylib/gyp/xcode_emulation.py
View File

@ -1534,18 +1534,20 @@ def CLTVersion():
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI" FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables" MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables"
regex = re.compile("version: (?P<version>.+)") regex = re.compile(r"version: (?P<version>.+)")
for key in [MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID]: for key in [MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID]:
try: try:
output = GetStdout(["/usr/sbin/pkgutil", "--pkg-info", key]) output = GetStdout(["/usr/sbin/pkgutil", "--pkg-info", key])
return re.search(regex, output).groupdict()["version"] if m := re.search(regex, output):
return m.groupdict()["version"]
except (GypError, OSError): except (GypError, OSError):
continue continue
regex = re.compile(r"Command Line Tools for Xcode\s+(?P<version>\S+)") regex = re.compile(r"Command Line Tools for Xcode\s+(?P<version>\S+)")
try: try:
output = GetStdout(["/usr/sbin/softwareupdate", "--history"]) output = GetStdout(["/usr/sbin/softwareupdate", "--history"])
return re.search(regex, output).groupdict()["version"] if m := re.search(regex, output):
return m.groupdict()["version"]
except (GypError, OSError): except (GypError, OSError):
return None return None

2
tools/gyp/pylib/gyp/xcode_ninja.py
View File

@ -22,7 +22,7 @@ import gyp.generator.ninja
def _WriteWorkspace(main_gyp, sources_gyp, params): def _WriteWorkspace(main_gyp, sources_gyp, params):
"""Create a workspace to wrap main and sources gyp paths.""" """Create a workspace to wrap main and sources gyp paths."""
(build_file_root, build_file_ext) = os.path.splitext(main_gyp) (build_file_root, _build_file_ext) = os.path.splitext(main_gyp)
workspace_path = build_file_root + ".xcworkspace" workspace_path = build_file_root + ".xcworkspace"
options = params["options"] options = params["options"]
if options.generator_output: if options.generator_output:

10
tools/gyp/pylib/gyp/xcodeproj_file.py
View File

@ -487,7 +487,7 @@ class XCObject:
children = [] children = []
for property, attributes in self._schema.items(): for property, attributes in self._schema.items():
(is_list, property_type, is_strong) = attributes[0:3] (is_list, _property_type, is_strong) = attributes[0:3]
if is_strong and property in self._properties: if is_strong and property in self._properties:
if not is_list: if not is_list:
children.append(self._properties[property]) children.append(self._properties[property])
@ -913,7 +913,7 @@ class XCObject:
# TODO(mark): A stronger verification mechanism is needed. Some # TODO(mark): A stronger verification mechanism is needed. Some
# subclasses need to perform validation beyond what the schema can enforce. # subclasses need to perform validation beyond what the schema can enforce.
for property, attributes in self._schema.items(): for property, attributes in self._schema.items():
(is_list, property_type, is_strong, is_required) = attributes[0:4] (_is_list, _property_type, _is_strong, is_required) = attributes[0:4]
if is_required and property not in self._properties: if is_required and property not in self._properties:
raise KeyError(self.__class__.__name__ + " requires " + property) raise KeyError(self.__class__.__name__ + " requires " + property)
@ -923,7 +923,7 @@ class XCObject:
defaults = {} defaults = {}
for property, attributes in self._schema.items(): for property, attributes in self._schema.items():
(is_list, property_type, is_strong, is_required) = attributes[0:4] (_is_list, _property_type, _is_strong, is_required) = attributes[0:4]
if ( if (
is_required is_required
and len(attributes) >= 5 and len(attributes) >= 5
@ -1616,7 +1616,7 @@ class PBXFileReference(XCFileLikeElement, XCContainerPortal, XCRemoteObject):
prop_name = "lastKnownFileType" prop_name = "lastKnownFileType"
else: else:
basename = posixpath.basename(self._properties["path"]) basename = posixpath.basename(self._properties["path"])
(root, ext) = posixpath.splitext(basename) (_root, ext) = posixpath.splitext(basename)
# Check the map using a lowercase extension. # Check the map using a lowercase extension.
# TODO(mark): Maybe it should try with the original case first and fall # TODO(mark): Maybe it should try with the original case first and fall
# back to lowercase, in case there are any instances where case # back to lowercase, in case there are any instances where case
@ -2010,7 +2010,7 @@ class PBXFrameworksBuildPhase(XCBuildPhase):
return "Frameworks" return "Frameworks"
def FileGroup(self, path): def FileGroup(self, path):
(root, ext) = posixpath.splitext(path) (_root, ext) = posixpath.splitext(path)
if ext != "": if ext != "":
ext = ext[1:].lower() ext = ext[1:].lower()
if ext == "o": if ext == "o":

2
tools/gyp/pyproject.toml
View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "gyp-next" name = "gyp-next"
version = "0.20.4" version = "0.20.5"
authors = [ authors = [
{ name="Node.js contributors", email="ryzokuken@disroot.org" }, { name="Node.js contributors", email="ryzokuken@disroot.org" },
] ]

6
tools/gyp/tools/graphviz.py
View File

@ -47,7 +47,7 @@ def WriteGraph(edges):
# Bucket targets by file. # Bucket targets by file.
files = collections.defaultdict(list) files = collections.defaultdict(list)
for src, dst in edges.items(): for src, dst in edges.items():
build_file, target_name, toolset = ParseTarget(src) build_file, target_name, _toolset = ParseTarget(src)
files[build_file].append(src) files[build_file].append(src)
print("digraph D {") print("digraph D {")
@ -62,14 +62,14 @@ def WriteGraph(edges):
# If there's only one node for this file, simplify # If there's only one node for this file, simplify
# the display by making it a box without an internal node. # the display by making it a box without an internal node.
target = targets[0] target = targets[0]
build_file, target_name, toolset = ParseTarget(target) build_file, target_name, _toolset = ParseTarget(target)
print(f' "{target}" [shape=box, label="{filename}\\n{target_name}"]') print(f' "{target}" [shape=box, label="{filename}\\n{target_name}"]')
else: else:
# Group multiple nodes together in a subgraph. # Group multiple nodes together in a subgraph.
print(' subgraph "cluster_%s" {' % filename) print(' subgraph "cluster_%s" {' % filename)
print(' label = "%s"' % filename) print(' label = "%s"' % filename)
for target in targets: for target in targets:
build_file, target_name, toolset = ParseTarget(target) build_file, target_name, _toolset = ParseTarget(target)
print(f' "{target}" [label="{target_name}"]') print(f' "{target}" [label="{target_name}"]')
print(" }") print(" }")