tools: replace GYP with GYP3 (2/2) - node changes

refack · refack · commit aec215013f49 · 2019-05-30T19:14:46.000-04:00
diff --git a/LICENSE b/LICENSE
@@ -1064,9 +1064,10 @@ The externally maintained libraries used by Node.js are:
     --------
   """
 
-- GYP, located at tools/gyp, is licensed as follows:
+- GYP3, located at tools/gyp, is licensed as follows:
   """
     Copyright (c) 2009 Google Inc. All rights reserved.
+    Copyright (c) 2019 Refael Ackeramnn<refack@gmail.com>. All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
diff --git a/configure.py b/configure.py
@@ -24,7 +24,7 @@
 CC = os.environ.get('CC', 'cc' if sys.platform == 'darwin' else 'gcc')
 CXX = os.environ.get('CXX', 'c++' if sys.platform == 'darwin' else 'g++')
 
-sys.path.insert(0, os.path.join('tools', 'gyp', 'pylib'))
+sys.path.insert(0, os.path.join('tools', 'gyp'))
 from gyp.common import GetFlavor
 
 # imports in tools/configure.d
diff --git a/tools/gyp_node.py b/tools/gyp_node.py
@@ -6,7 +6,7 @@
 script_dir = os.path.dirname(__file__)
 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', 'gyp'))
 import gyp
 
 # Directory within which we want all generated files (including Makefiles)
@@ -34,13 +34,11 @@ def run_gyp(args):
 
   args.append('--depth=' + node_root)
 
-  # There's a bug with windows which doesn't allow this feature.
-  if sys.platform != 'win32' and 'ninja' not in args:
-    # Tell gyp to write the Makefiles into output_dir
-    args.extend(['--generator-output', output_dir])
+  # Tell gyp to write the Makefiles into output_dir
+  args.extend(['--generator-output', output_dir])
 
-    # Tell make to write its output into the same dir
-    args.extend(['-Goutput_dir=' + output_dir])
+  # Tell make to write its output into the same dir
+  args.extend(['-Goutput_dir=' + output_dir])
 
   args.append('-Dcomponent=static_library')
   args.append('-Dlibrary=static_library')
diff --git a/tools/license-builder.sh b/tools/license-builder.sh
@@ -74,7 +74,7 @@ addlicense "zlib" "deps/zlib" \
 addlicense "npm" "deps/npm" "$(cat ${rootdir}/deps/npm/LICENSE)"
 
 # Build tools
-addlicense "GYP" "tools/gyp" "$(cat ${rootdir}/tools/gyp/LICENSE)"
+addlicense "GYP3" "tools/gyp" "$(cat ${rootdir}/tools/gyp/LICENSE)"
 addlicense "inspector_protocol" "tools/inspector_protocol" "$(cat ${rootdir}/tools/inspector_protocol/LICENSE)"
 addlicense "jinja2" "tools/inspector_protocol/jinja2" "$(cat ${rootdir}/tools/inspector_protocol/jinja2/LICENSE)"
 addlicense "markupsafe" "tools/inspector_protocol/markupsafe" "$(cat ${rootdir}/tools/inspector_protocol/markupsafe/LICENSE)"
