tools: update gyp-next to 0.19.0

nodejs-github-bot · aduh95 · commit e20eef659f28 · 2024-12-10T20:30:58.000+01:00
PR-URL: #56158 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
diff --git a/tools/gyp/CHANGELOG.md b/tools/gyp/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.19.0](https://github.com/nodejs/gyp-next/compare/v0.18.3...v0.19.0) (2024-12-03)
+
+
+### Features
+
+* provide escaped version of `PRODUCT_DIR_ABS` ([#271](https://github.com/nodejs/gyp-next/issues/271)) ([3bf3b1c](https://github.com/nodejs/gyp-next/commit/3bf3b1cda26f16c645e0fdd5582ffbf49d9a2580))
+
 ## [0.18.3](https://github.com/nodejs/gyp-next/compare/v0.18.2...v0.18.3) (2024-10-08)
 
 
diff --git a/tools/gyp/pylib/gyp/MSVSSettings.py b/tools/gyp/pylib/gyp/MSVSSettings.py
@@ -171,7 +171,7 @@ def ValidateMSBuild(self, value):
 int(value, self._msbuild_base)
 
 def ConvertToMSBuild(self, value):
- msbuild_format = (self._msbuild_base == 10) and "%d" or "0x%04x"
+ msbuild_format = ((self._msbuild_base == 10) and "%d") or "0x%04x"
 return msbuild_format % int(value)
 
 
diff --git a/tools/gyp/pylib/gyp/MSVSVersion.py b/tools/gyp/pylib/gyp/MSVSVersion.py
@@ -69,7 +69,7 @@ def UsesVcxproj(self):
 
 def ProjectExtension(self):
 """Returns the file extension for the project."""
- return self.uses_vcxproj and ".vcxproj" or ".vcproj"
+ return (self.uses_vcxproj and ".vcxproj") or ".vcproj"
 
 def Path(self):
 """Returns the path to Visual Studio installation."""
diff --git a/tools/gyp/pylib/gyp/__init__.py b/tools/gyp/pylib/gyp/__init__.py
@@ -4,7 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-
+from __future__ import annotations
 import copy
 import gyp.input
 import argparse
@@ -24,6 +24,18 @@
 DEBUG_VARIABLES = "variables"
 DEBUG_INCLUDES = "includes"
 
+def EscapeForCString(string: bytes | str) -> str:
+ if isinstance(string, str):
+ string = string.encode(encoding='utf8')
+
+ backslash_or_double_quote = {ord('\\'), ord('"')}
+ result = []
+ for char in string:
+ if char in backslash_or_double_quote or not 32 <= char < 127:
+ result += '\\%03o' % char
+ else:
+ result += chr(char)
+ return result
 
 def DebugOutput(mode, message, *args):
 if "all" in gyp.debug or mode in gyp.debug:
@@ -106,18 +118,19 @@ def Load(
 
 output_dir = params["options"].generator_output or params["options"].toplevel_dir
 if default_variables["GENERATOR"] == "ninja":
- default_variables.setdefault(
- "PRODUCT_DIR_ABS",
- os.path.join(
- output_dir, "out", default_variables.get("build_type", "default")
- ),
+ product_dir_abs = os.path.join(
+ output_dir, "out", default_variables.get("build_type", "default")
 )
 else:
- default_variables.setdefault(
- "PRODUCT_DIR_ABS",
- os.path.join(output_dir, default_variables["CONFIGURATION_NAME"]),
+ product_dir_abs = os.path.join(
+ output_dir, default_variables["CONFIGURATION_NAME"]
 )
 
+ default_variables.setdefault("PRODUCT_DIR_ABS", product_dir_abs)
+ default_variables.setdefault(
+ "PRODUCT_DIR_ABS_CSTR", EscapeForCString(product_dir_abs)
+ )
+
 # Give the generator the opportunity to set additional variables based on
 # the params it will receive in the output phase.
 if getattr(generator, "CalculateVariables", None):
@@ -253,7 +266,7 @@ def Noop(value):
 for name, metadata in options._regeneration_metadata.items():
 opt = metadata["opt"]
 value = getattr(options, name)
- value_predicate = metadata["type"] == "path" and FixPath or Noop
+ value_predicate = (metadata["type"] == "path" and FixPath) or Noop
 action = metadata["action"]
 env_name = metadata["env_name"]
 if action == "append":
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
@@ -788,7 +788,7 @@ def __init__(self, generator_flags, flavor):
 self.suffix_rules_objdir2 = {}
 
 # Generate suffix rules for all compilable extensions.
- for ext in COMPILABLE_EXTENSIONS:
+ for ext, value in COMPILABLE_EXTENSIONS.items():
 # Suffix rules for source folder.
 self.suffix_rules_srcdir.update(
 {
@@ -797,7 +797,7 @@ def __init__(self, generator_flags, flavor):
 $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(srcdir)/%%%s FORCE_DO_CMD
 \t@$(call do_cmd,%s,1)
 """
- % (ext, COMPILABLE_EXTENSIONS[ext])
+ % (ext, value)
 )
 }
 )
@@ -810,7 +810,7 @@ def __init__(self, generator_flags, flavor):
 $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj).$(TOOLSET)/%%%s FORCE_DO_CMD
 \t@$(call do_cmd,%s,1)
 """
- % (ext, COMPILABLE_EXTENSIONS[ext])
+ % (ext, value)
 )
 }
 )
@@ -821,7 +821,7 @@ def __init__(self, generator_flags, flavor):
 $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
 \t@$(call do_cmd,%s,1)
 """
- % (ext, COMPILABLE_EXTENSIONS[ext])
+ % (ext, value)
 )
 }
 )
@@ -1779,13 +1779,13 @@ def WriteTarget(
 # using ":=".
 self.WriteSortedXcodeEnv(self.output, self.GetSortedXcodePostbuildEnv())
 
- for configname in target_postbuilds:
+ for configname, value in target_postbuilds.items():
 self.WriteLn(
 "%s: TARGET_POSTBUILDS_%s := %s"
 % (
 QuoteSpaces(self.output),
 configname,
- gyp.common.EncodePOSIXShellList(target_postbuilds[configname]),
+ gyp.common.EncodePOSIXShellList(value),
 )
 )
 
diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
@@ -2469,11 +2469,8 @@ def SetUpConfigurations(target, target_dict):
 merged_configurations[configuration] = new_configuration_dict
 
 # Put the new configurations back into the target dict as a configuration.
- for configuration in merged_configurations:
- target_dict["configurations"][configuration] = merged_configurations[
- configuration
- ]
-
+ for configuration, value in merged_configurations.items():
+ target_dict["configurations"][configuration] = value
 # Now drop all the abstract ones.
 configs = target_dict["configurations"]
 target_dict["configurations"] = {
@@ -3020,8 +3017,8 @@ def Load(
 del target_dict[key]
 ProcessListFiltersInDict(target_name, tmp_dict)
 # Write the results back to |target_dict|.
- for key in tmp_dict:
- target_dict[key] = tmp_dict[key]
+ for key, value in tmp_dict.items():
+ target_dict[key] = value
 
 # Make sure every dependency appears at most once.
 RemoveDuplicateDependencies(targets)
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1127,8 +1127,8 @@ def _GetIOSPostbuilds(self, configname, output_binary):
 be deployed to a device. This should be run as the very last step of the
 build."""
 if not (
- self.isIOS
- and (self.spec["type"] == "executable" or self._IsXCTest())
+ (self.isIOS
+ and (self.spec["type"] == "executable" or self._IsXCTest()))
 or self.IsIosFramework()
 ):
 return []
diff --git a/tools/gyp/pylib/gyp/xcodeproj_file.py b/tools/gyp/pylib/gyp/xcodeproj_file.py
@@ -3017,10 +3017,10 @@ def _AllSymrootsUnique(self, target, inherit_unique_symroot):
 symroots = self._DefinedSymroots(target)
 for s in self._DefinedSymroots(target):
 if (
- s is not None
- and not self._IsUniqueSymrootForTarget(s)
- or s is None
- and not inherit_unique_symroot
+ (s is not None
+ and not self._IsUniqueSymrootForTarget(s))
+ or (s is None
+ and not inherit_unique_symroot)
 ):
 return False
 return True if symroots else inherit_unique_symroot
diff --git a/tools/gyp/pyproject.toml b/tools/gyp/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gyp-next"
-version = "0.18.3"
+version = "0.19.0"
 authors = [
 { name="Node.js contributors", email="ryzokuken@disroot.org" },
 ]
diff --git a/tools/gyp/tools/pretty_sln.py b/tools/gyp/tools/pretty_sln.py
@@ -93,10 +93,10 @@ def ParseSolution(solution_file):
 continue
 
 # Change all dependencies clsid to name instead.
- for project in dependencies:
+ for project, deps in dependencies.items():
 # For each dependencies in this project
 new_dep_array = []
- for dep in dependencies[project]:
+ for dep in deps:
 # Look for the project name matching this cldis
 for project_info in projects:
 if projects[project_info][1] == dep:
diff --git a/tools/gyp/tools/pretty_vcproj.py b/tools/gyp/tools/pretty_vcproj.py
@@ -118,8 +118,8 @@ def FixFilenames(filenames, current_directory):
 new_list = []
 for filename in filenames:
 if filename:
- for key in REPLACEMENTS:
- filename = filename.replace(key, REPLACEMENTS[key])
+ for key, value in REPLACEMENTS.items():
+ filename = filename.replace(key, value)
 os.chdir(current_directory)
 filename = filename.strip("\"' ")
 if filename.startswith("$"):

-Original file line number
+Diff line change
 int(value, self._msbuild_base)
 defConvertToMSBuild(self, value):
 -msbuild_format= (self._msbuild_base==10) and"%d"or"0x%04x"
 +msbuild_format= ((self._msbuild_base==10) and"%d")or"0x%04x"
 returnmsbuild_format%int(value)
-Original file line number
+Diff line change
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+-
 +from __future__ importannotations
 importcopy
 importgyp.input
 importargparse
 DEBUG_VARIABLES="variables"
 DEBUG_INCLUDES="includes"
 +defEscapeForCString(string: bytes|str) ->str:
 +ifisinstance(string, str):
 +string=string.encode(encoding='utf8')
++
 +backslash_or_double_quote= {ord('\\'), ord('"')}
 +result= []
 +forcharinstring:
 +ifcharinbackslash_or_double_quoteornot32<=char<127:
 +result+='\\%03o'%char
 +else:
 +result+=chr(char)
 +returnresult
 defDebugOutput(mode, message, *args):
 if"all"ingyp.debugormodeingyp.debug:
 output_dir=params["options"].generator_outputorparams["options"].toplevel_dir
 ifdefault_variables["GENERATOR"] =="ninja":
 -default_variables.setdefault(
 -"PRODUCT_DIR_ABS",
 -os.path.join(
 -output_dir, "out", default_variables.get("build_type", "default")
 - ),
 +product_dir_abs=os.path.join(
 +output_dir, "out", default_variables.get("build_type", "default")
+ )
 else:
 -default_variables.setdefault(
 -"PRODUCT_DIR_ABS",
 -os.path.join(output_dir, default_variables["CONFIGURATION_NAME"]),
 +product_dir_abs=os.path.join(
 +output_dir, default_variables["CONFIGURATION_NAME"]
+ )
 +default_variables.setdefault("PRODUCT_DIR_ABS", product_dir_abs)
 +default_variables.setdefault(
 +"PRODUCT_DIR_ABS_CSTR", EscapeForCString(product_dir_abs)
 + )
++
 # Give the generator the opportunity to set additional variables based on
 # the params it will receive in the output phase.
 ifgetattr(generator, "CalculateVariables", None):
 forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata["opt"]
 value=getattr(options, name)
 -value_predicate=metadata["type"] =="path"andFixPathorNoop
 +value_predicate=(metadata["type"] =="path"andFixPath)orNoop
 action=metadata["action"]
 env_name=metadata["env_name"]
 ifaction=="append":
Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,7 @@ def __init__(self, generator_flags, flavor):`
`788`	`788`	`self.suffix_rules_objdir2= {}`
`789`	`789`
`790`	`790`	`# Generate suffix rules for all compilable extensions.`
`791`		`-forextinCOMPILABLE_EXTENSIONS:`
	`791`	`+forext, valueinCOMPILABLE_EXTENSIONS.items():`
`792`	`792`	`# Suffix rules for source folder.`
`793`	`793`	`self.suffix_rules_srcdir.update(`
`794`	`794`	`{`
`@@ -797,7 +797,7 @@ def __init__(self, generator_flags, flavor):`
`797`	`797`	`$(obj).$(TOOLSET)/$(TARGET)/%%.o: $(srcdir)/%%%s FORCE_DO_CMD`
`798`	`798`	`\t@$(call do_cmd,%s,1)`
`799`	`799`	`"""`
`800`		`-% (ext, COMPILABLE_EXTENSIONS[ext])`
	`800`	`+% (ext, value)`
`801`	`801`	`)`
`802`	`802`	`}`
`803`	`803`	`)`
`@@ -810,7 +810,7 @@ def __init__(self, generator_flags, flavor):`
`810`	`810`	`$(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj).$(TOOLSET)/%%%s FORCE_DO_CMD`
`811`	`811`	`\t@$(call do_cmd,%s,1)`
`812`	`812`	`"""`
`813`		`-% (ext, COMPILABLE_EXTENSIONS[ext])`
	`813`	`+% (ext, value)`
`814`	`814`	`)`
`815`	`815`	`}`
`816`	`816`	`)`
`@@ -821,7 +821,7 @@ def __init__(self, generator_flags, flavor):`
`821`	`821`	`$(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD`
`822`	`822`	`\t@$(call do_cmd,%s,1)`
`823`	`823`	`"""`
`824`		`-% (ext, COMPILABLE_EXTENSIONS[ext])`
	`824`	`+% (ext, value)`
`825`	`825`	`)`
`826`	`826`	`}`
`827`	`827`	`)`
`@@ -1779,13 +1779,13 @@ def WriteTarget(`
`1779`	`1779`	`# using ":=".`
`1780`	`1780`	`self.WriteSortedXcodeEnv(self.output, self.GetSortedXcodePostbuildEnv())`
`1781`	`1781`
`1782`		`-forconfignameintarget_postbuilds:`
	`1782`	`+forconfigname, valueintarget_postbuilds.items():`
`1783`	`1783`	`self.WriteLn(`
`1784`	`1784`	`"%s: TARGET_POSTBUILDS_%s := %s"`
`1785`	`1785`	`% (`
`1786`	`1786`	`QuoteSpaces(self.output),`
`1787`	`1787`	`configname,`
`1788`		`-gyp.common.EncodePOSIXShellList(target_postbuilds[configname]),`
	`1788`	`+gyp.common.EncodePOSIXShellList(value),`
`1789`	`1789`	`)`
`1790`	`1790`	`)`
`1791`	`1791`
-Original file line number
+Diff line change
 merged_configurations[configuration] =new_configuration_dict
 # Put the new configurations back into the target dict as a configuration.
 -forconfigurationinmerged_configurations:
 -target_dict["configurations"][configuration] =merged_configurations[
 -configuration
 - ]
+-
 +forconfiguration, valueinmerged_configurations.items():
 +target_dict["configurations"][configuration] =value
 # Now drop all the abstract ones.
 configs=target_dict["configurations"]
 target_dict["configurations"] = {
 deltarget_dict[key]
 ProcessListFiltersInDict(target_name, tmp_dict)
 # Write the results back to |target_dict|.
 -forkeyintmp_dict:
 -target_dict[key] =tmp_dict[key]
 +forkey, valueintmp_dict.items():
 +target_dict[key] =value
 # Make sure every dependency appears at most once.
 RemoveDuplicateDependencies(targets)
-Original file line number
+Diff line change
 symroots=self._DefinedSymroots(target)
 forsinself._DefinedSymroots(target):
 if (
 -sisnotNone
 -andnotself._IsUniqueSymrootForTarget(s)
 -orsisNone
 -andnotinherit_unique_symroot
 +(sisnotNone
 +andnotself._IsUniqueSymrootForTarget(s))
 +or(sisNone
 +andnotinherit_unique_symroot)
  ):
 returnFalse
 returnTrueifsymrootselseinherit_unique_symroot
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.18.3"`
	`7`	`+version = "0.19.0"`
`8`	`8`	`authors = [`
`9`	`9`	`{ name="Node.js contributors", email="ryzokuken@disroot.org" },`
`10`	`10`	`]`
-Original file line number
+Diff line change
 continue
 # Change all dependencies clsid to name instead.
 -forprojectindependencies:
 +forproject, depsindependencies.items():
 # For each dependencies in this project
 new_dep_array= []
 -fordepindependencies[project]:
 +fordepindeps:
 # Look for the project name matching this cldis
 forproject_infoinprojects:
 ifprojects[project_info][1] ==dep: