1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: float fix on node-gyp in npm tree

Browse Source 
This is a fix for filenames that have spaces which currently breaks
node-gyp. npm has not yet updated the dependency to the latest version
in the mean time we should land this as a patch

PR-URL: https://github.com/nodejs/node/pull/21448
Refs: https://github.com/nodejs/node-gyp/pull/1436
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
This commit is contained in:
Myles Borins 2018-05-10 15:21:53 -04:00
parent 95205a6125
commit 8b4af64f50
No known key found for this signature in database
GPG Key ID: 933B01F40B5CA946
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py generated vendored
View File

@ -623,6 +623,9 @@ def Sourceify(path):
def QuoteSpaces(s, quote=r'\ '): def QuoteSpaces(s, quote=r'\ '):
return s.replace(' ', quote) return s.replace(' ', quote)
def SourceifyAndQuoteSpaces(path):
"""Convert a path to its source directory form and quote spaces."""
return QuoteSpaces(Sourceify(path))
# TODO: Avoid code duplication with _ValidateSourcesForMSVSProject in msvs.py. # TODO: Avoid code duplication with _ValidateSourcesForMSVSProject in msvs.py.
def _ValidateSourcesForOSX(spec, all_sources): def _ValidateSourcesForOSX(spec, all_sources):
@ -1945,7 +1948,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
"%(makefile_name)s: %(deps)s\n" "%(makefile_name)s: %(deps)s\n"
"\t$(call do_cmd,regen_makefile)\n\n" % { "\t$(call do_cmd,regen_makefile)\n\n" % {
'makefile_name': makefile_name, 'makefile_name': makefile_name,
'deps': ' '.join(map(Sourceify, build_files)), 'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
'cmd': gyp.common.EncodePOSIXShellList( 'cmd': gyp.common.EncodePOSIXShellList(
[gyp_binary, '-fmake'] + [gyp_binary, '-fmake'] +
gyp.RegenerateFlags(options) + gyp.RegenerateFlags(options) +