From 4b2344f19619907b0e74469146a7612fed5cf4a3 Mon Sep 17 00:00:00 2001
From: himself65 <himself65@mask.io>
Date: Thu, 8 Jul 2021 00:19:00 +0800
Subject: [PATCH] build: using `pymod_do_main` in `node.gyp`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GYP uses the system path when parsing node.gyp;
However, if system python is different from our
gyp runtime python, like '2.7', gyp would crash.

Co-authored-by: Michaël Zasso <targos@protonmail.com>
---
 node.gyp              |  2 +-
 tools/gyp_node.py     |  1 +
 tools/search_files.py | 12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/node.gyp b/node.gyp
index 691ce22ff3d664..540029e2b75fb0 100644
--- a/node.gyp
+++ b/node.gyp
@@ -33,7 +33,7 @@
     # Windows command length limit or there would be an error.
     # See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation
     'library_files': [
-      '<!@(python tools/search_files.py --ext js lib)',
+      '<!@pymod_do_main(search_files --ext js lib)',
     ],
     'deps_files': [
       'deps/v8/tools/splaytree.mjs',
diff --git a/tools/gyp_node.py b/tools/gyp_node.py
index 8c7493f3292e83..f0d633a0477086 100755
--- a/tools/gyp_node.py
+++ b/tools/gyp_node.py
@@ -7,6 +7,7 @@
 node_root  = os.path.normpath(os.path.join(script_dir, os.pardir))
 
 sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib'))
+sys.path.insert(0, os.path.join(node_root, 'tools', 'search_files'))
 import gyp
 
 # Directory within which we want all generated files (including Makefiles)
diff --git a/tools/search_files.py b/tools/search_files.py
index e236eee47dc852..f22c6161c0c7ad 100644
--- a/tools/search_files.py
+++ b/tools/search_files.py
@@ -7,16 +7,18 @@
 
 import argparse
 import utils
+import sys
 
-def main():
+def DoMain(args = []):
   parser = argparse.ArgumentParser(
     description='Search files with a specific extension under a directory',
     fromfile_prefix_chars='@'
   )
   parser.add_argument('--ext', required=True, help='extension to search for')
   parser.add_argument('directory', help='input directory')
-  options = parser.parse_args()
-  print('\n'.join(utils.SearchFiles(options.directory, options.ext)))
+  options = parser.parse_args(args)
+  return '\n'.join(utils.SearchFiles(options.directory, options.ext))
 
-if __name__ == "__main__":
-  main()
+
+if __name__ == '__main__':
+  DoMain(sys.argv[1:])