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 b367d5a

Browse filesBrowse files
targosdanielleadams
targos
authored and
danielleadams
committed
tools: update gyp-next to v0.7.0
Refs: https://github.com/nodejs/gyp-next/releases/tag/v0.7.0 PR-URL: #36580 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
1 parent ec3e841 commit b367d5a
Copy full SHA for b367d5a

File tree

Expand file treeCollapse file tree

7 files changed

+62
-44
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

7 files changed

+62
-44
lines changed
Open diff view settings
Collapse file

‎tools/gyp/CHANGELOG.md‎

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

3+
## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* **msvs:** On Windows, arguments passed to the "action" commands are no longer transformed to replace slashes with backslashes.
9+
10+
### Features
11+
12+
* **xcode:** --cross-compiling overrides arch-specific settings ([973bae0](https://www.github.com/nodejs/gyp-next/commit/973bae0b7b08be7b680ecae9565fbd04b3e0787d))
13+
14+
15+
### Bug Fixes
16+
17+
* **msvs:** do not fix paths in action command arguments ([fc22f83](https://www.github.com/nodejs/gyp-next/commit/fc22f8335e2016da4aae4f4233074bd651d2faea))
18+
* cmake on python 3 ([fd61f5f](https://www.github.com/nodejs/gyp-next/commit/fd61f5faa5275ec8fc98e3c7868c0dd46f109540))
19+
* ValueError: invalid mode: 'rU' while trying to load binding.gyp ([d0504e6](https://www.github.com/nodejs/gyp-next/commit/d0504e6700ce48f44957a4d5891b142a60be946f))
20+
* xcode cmake parsing ([eefe8d1](https://www.github.com/nodejs/gyp-next/commit/eefe8d10e99863bc4ac7e2ed32facd608d400d4b))
21+
322
### [0.6.2](https://www.github.com/nodejs/gyp-next/compare/v0.6.1...v0.6.2) (2020-10-16)
423

524

Collapse file

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

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/cmake.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
try:
4242
# maketrans moved to str in python3.
4343
_maketrans = string.maketrans
44-
except NameError:
44+
except (NameError, AttributeError):
4545
_maketrans = str.maketrans
4646

4747
generator_default_variables = {
@@ -1047,7 +1047,7 @@ def WriteTarget(
10471047

10481048
# XCode settings
10491049
xcode_settings = config.get("xcode_settings", {})
1050-
for xcode_setting, xcode_value in xcode_settings.viewitems():
1050+
for xcode_setting, xcode_value in xcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
Collapse file

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

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/msvs.py
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,7 @@ def _BuildCommandLineForRuleRaw(
423423
# file out of the raw command string, and some commands (like python) are
424424
# actually batch files themselves.
425425
command.insert(0, "call")
426-
# Fix the paths
427-
# TODO(quote): This is a really ugly heuristic, and will miss path fixing
428-
# for arguments like "--arg=path" or "/opt:path".
429-
# If the argument starts with a slash or dash, it's probably a command line
430-
# switch
431-
arguments = [i if (i[:1] in "/-") else _FixPath(i) for i in cmd[1:]]
432-
arguments = [i.replace("$(InputDir)", "%INPUTDIR%") for i in arguments]
426+
arguments = [i.replace("$(InputDir)", "%INPUTDIR%") for i in cmd[1:]]
433427
arguments = [MSVSSettings.FixVCMacroSlashes(i) for i in arguments]
434428
if quote_cmd:
435429
# Support a mode for using cmd directly.
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
@@ -231,7 +231,7 @@ def LoadOneBuildFile(build_file_path, data, aux_data, includes, is_target, check
231231
# Open the build file for read ('r') with universal-newlines mode ('U')
232232
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
233233
# which otherwise will fail eval()
234-
if sys.platform == "zos":
234+
if PY3 or sys.platform == "zos":
235235
# On z/OS, universal-newlines mode treats the file as an ascii file.
236236
# But since node-gyp produces ebcdic files, do not use that mode.
237237
build_file_contents = open(build_file_path, "r").read()
Collapse file

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

Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/xcode_emulation.py
+37-32Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -654,28 +654,32 @@ def GetCflags(self, configname, arch=None):
654654
self._WarnUnimplemented("MACH_O_TYPE")
655655
self._WarnUnimplemented("PRODUCT_TYPE")
656656

657-
if arch is not None:
658-
archs = [arch]
659-
else:
660-
assert self.configname
661-
archs = self.GetActiveArchs(self.configname)
662-
if len(archs) != 1:
663-
# TODO: Supporting fat binaries will be annoying.
664-
self._WarnUnimplemented("ARCHS")
665-
archs = ["i386"]
666-
cflags.append("-arch " + archs[0])
667-
668-
if archs[0] in ("i386", "x86_64"):
669-
if self._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
if self._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
if self._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
if self._Test("GCC_ENABLE_SSE42_EXTENSIONS", "YES", default="NO"):
678-
cflags.append("-msse4.2")
657+
# If GYP_CROSSCOMPILE (--cross-compiling), disable architecture-specific
658+
# additions and assume these will be provided as required via CC_host,
659+
# CXX_host, CC_target and CXX_target.
660+
if not gyp.common.CrossCompileRequested():
661+
if arch is not None:
662+
archs = [arch]
663+
else:
664+
assert self.configname
665+
archs = self.GetActiveArchs(self.configname)
666+
if len(archs) != 1:
667+
# TODO: Supporting fat binaries will be annoying.
668+
self._WarnUnimplemented("ARCHS")
669+
archs = ["i386"]
670+
cflags.append("-arch " + archs[0])
671+
672+
if archs[0] in ("i386", "x86_64"):
673+
if self._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
if self._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
if self._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
if self._Test("GCC_ENABLE_SSE42_EXTENSIONS", "YES", default="NO"):
682+
cflags.append("-msse4.2")
679683

680684
cflags += self._Settings().get("WARNING_CFLAGS", [])
681685

@@ -938,16 +942,17 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
938942
+ gyp_to_build_path(self._Settings()["ORDER_FILE"])
939943
)
940944

941-
if arch is not None:
942-
archs = [arch]
943-
else:
944-
assert self.configname
945-
archs = self.GetActiveArchs(self.configname)
946-
if len(archs) != 1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs = ["i386"]
950-
ldflags.append("-arch " + archs[0])
945+
if not gyp.common.CrossCompileRequested():
946+
if arch is not None:
947+
archs = [arch]
948+
else:
949+
assert self.configname
950+
archs = self.GetActiveArchs(self.configname)
951+
if len(archs) != 1:
952+
# TODO: Supporting fat binaries will be annoying.
953+
self._WarnUnimplemented("ARCHS")
954+
archs = ["i386"]
955+
ldflags.append("-arch " + archs[0])
951956

952957
# Xcode adds the product directory by default.
953958
# Rewrite -L. to -L./ to work around http://www.openradar.me/25313838
Collapse file

‎tools/gyp/setup.py‎

Copy file name to clipboard
100755100644
Expand all lines: tools/gyp/setup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
setup(
1717
name="gyp-next",
18-
version="0.6.2",
18+
version="0.7.0",
1919
description="A fork of the GYP build system for use in the Node.js projects",
2020
long_description=long_description,
2121
long_description_content_type="text/markdown",
Collapse file

‎tools/js2c.py‎

Copy file name to clipboardExpand all lines: tools/js2c.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def AddModule(filename, definitions, initializers):
123123
initializers.append(initializer)
124124

125125
def NormalizeFileName(filename):
126-
split = filename.split(os.path.sep)
126+
split = filename.split('/')
127127
if split[0] == 'deps':
128128
split = ['internal'] + split
129129
else: # `lib/**/*.js` so drop the 'lib' part

0 commit comments

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