Commit 9e1397c

Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c

6 files changed

Lines changed: 61 additions & 43 deletions

File tree

‎gyp/CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
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

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

Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,

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

Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.

‎gyp/pylib/gyp/input.py‎

Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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

‎gyp/setup.py‎

Lines 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",

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 9e1397c
Browse files
gengjiawengengjiawen
authored
gyp: update gyp to v0.7.0 (#2284)
PR-URL: #2284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
1 parent 6287118 commit 9e1397c
6 files changed
Lines changed: 61 additions & 43 deletions
File tree
‎gyp/CHANGELOG.md‎
Lines changed: 19 additions & 0 deletions
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

‎gyp/pylib/gyp/generator/cmake.py‎
Lines 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-
exceptNameError:
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-
forxcode_setting, xcode_valueinxcode_settings.viewitems():
1050+
forxcode_setting, xcode_valueinxcode_settings.items():
10511051
SetTargetProperty(
10521052
output,
10531053
cmake_target_name,
‎gyp/pylib/gyp/generator/msvs.py‎
Lines 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= [iif (i[:1] in"/-") else_FixPath(i) foriincmd[1:]]
432-
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriinarguments]
426+
arguments= [i.replace("$(InputDir)", "%INPUTDIR%") foriincmd[1:]]
433427
arguments= [MSVSSettings.FixVCMacroSlashes(i) foriinarguments]
434428
ifquote_cmd:
435429
# Support a mode for using cmd directly.
‎gyp/pylib/gyp/input.py‎
Lines 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-
ifsys.platform=="zos":
234+
ifPY3orsys.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()
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines 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-
ifarchisnotNone:
658-
archs= [arch]
659-
else:
660-
assertself.configname
661-
archs=self.GetActiveArchs(self.configname)
662-
iflen(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-
ifarchs[0] in ("i386", "x86_64"):
669-
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
670-
cflags.append("-msse3")
671-
ifself._Test(
672-
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
673-
 ):
674-
cflags.append("-mssse3") # Note 3rd 's'.
675-
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
676-
cflags.append("-msse4.1")
677-
ifself._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+
ifnotgyp.common.CrossCompileRequested():
661+
ifarchisnotNone:
662+
archs= [arch]
663+
else:
664+
assertself.configname
665+
archs=self.GetActiveArchs(self.configname)
666+
iflen(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+
ifarchs[0] in ("i386", "x86_64"):
673+
ifself._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"):
674+
cflags.append("-msse3")
675+
ifself._Test(
676+
"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO"
677+
 ):
678+
cflags.append("-mssse3") # Note 3rd 's'.
679+
ifself._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"):
680+
cflags.append("-msse4.1")
681+
ifself._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-
ifarchisnotNone:
942-
archs= [arch]
943-
else:
944-
assertself.configname
945-
archs=self.GetActiveArchs(self.configname)
946-
iflen(archs) !=1:
947-
# TODO: Supporting fat binaries will be annoying.
948-
self._WarnUnimplemented("ARCHS")
949-
archs= ["i386"]
950-
ldflags.append("-arch "+archs[0])
945+
ifnotgyp.common.CrossCompileRequested():
946+
ifarchisnotNone:
947+
archs= [arch]
948+
else:
949+
assertself.configname
950+
archs=self.GetActiveArchs(self.configname)
951+
iflen(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
‎gyp/setup.py‎
Lines 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",
0 commit comments
Comments
 (0)