Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: third_party/WebKit/Source/devtools/scripts/install_node_deps.py

Issue 2554573010: DevTools: fix presubmit hooks for windows (Closed)
Patch Set: include utils.py in BUILD.gn isolate target Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/scripts/install_node_deps.py
diff --git a/third_party/WebKit/Source/devtools/scripts/install_node_deps.py b/third_party/WebKit/Source/devtools/scripts/install_node_deps.py
index ab8eeab8c9f89e1d0faf59c9c7fd6fa767d9d20c..6dd474eb599ff1fe4cb911d15c64e801e0f319be 100755
--- a/third_party/WebKit/Source/devtools/scripts/install_node_deps.py
+++ b/third_party/WebKit/Source/devtools/scripts/install_node_deps.py
@@ -14,6 +14,8 @@ import shutil
import subprocess
import sys
+import utils
+
MIN_NODE_VERSION = 4
LOCAL_NODE_VERSION = '4.5.0'
@@ -31,7 +33,9 @@ def main():
def resolve_node_paths():
if has_valid_global_node():
- return (which('node'), which('npm'))
+ if sys.platform == "win32":
+ return (utils.which('node'), utils.which('npm.cmd'))
+ return (utils.which('node'), utils.which('npm'))
has_installed_local_node = path.isfile(local_node_binary_path)
if has_installed_local_node:
return (local_node_binary_path, local_npm_binary_path)
@@ -46,7 +50,7 @@ def resolve_node_paths():
def has_valid_global_node():
- node_path = which('node')
+ node_path = utils.which('node')
if not node_path:
return False
node_process = popen([node_path, '--version'])
@@ -79,24 +83,6 @@ def npm_install(npm_path):
print(npm_process_out)
-# Based on http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python.
-def which(program):
- def is_exe(fpath):
- return path.isfile(fpath) and os.access(fpath, os.X_OK)
-
- fpath, fname = path.split(program)
- if fpath:
- if is_exe(program):
- return program
- else:
- for part in os.environ['PATH'].split(os.pathsep):
- part = part.strip('\"')
- exe_file = path.join(part, program)
- if is_exe(exe_file):
- return exe_file
- return None
-
-
def popen(arguments, env=None):
return subprocess.Popen(
arguments, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)

Powered by Google App Engine
This is Rietveld 408576698