From a48d98ef0426e01fbfed7ed9ae44a8d6a4ffd352 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Thu, 10 May 2018 15:21:53 -0400 Subject: [PATCH] deps: float fix on node-gyp in npm tree 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 Reviewed-By: Minwoo Jung --- .../node_modules/node-gyp/gyp/pylib/gyp/generator/make.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py index 64b9dd267b7492..6fc5d6b563cabf 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py @@ -623,6 +623,9 @@ def Sourceify(path): def QuoteSpaces(s, quote=r'\ '): 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. def _ValidateSourcesForOSX(spec, all_sources): @@ -1945,7 +1948,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name, "%(makefile_name)s: %(deps)s\n" "\t$(call do_cmd,regen_makefile)\n\n" % { 'makefile_name': makefile_name, - 'deps': ' '.join(map(Sourceify, build_files)), + 'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)), 'cmd': gyp.common.EncodePOSIXShellList( [gyp_binary, '-fmake'] + gyp.RegenerateFlags(options) +