From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 18 May 2016 19:54:53 +0000 (-0700)
Subject: Make js2asar.py more robust
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=161bd89a24ca8ce30b91cdaf041965beda3dff9f;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git

Make js2asar.py more robust
---

diff --git a/tools/js2asar.py b/tools/js2asar.py
index 7860176..adad175 100755
--- a/tools/js2asar.py
+++ b/tools/js2asar.py
@@ -29,22 +29,10 @@ def copy_files(source_files, output_dir):
 
 
 def call_asar(archive, output_dir):
-  asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar')
-  subprocess.check_call([find_node(), asar, 'pack', output_dir, archive])
-
-
-def find_node():
-  WINDOWS_NODE_PATHs = [
-    'C:/Program Files (x86)/nodejs',
-    'C:/Program Files/nodejs',
-  ] + os.environ['PATH'].split(os.pathsep)
-
+  asar = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'asar')
   if sys.platform in ['win32', 'cygwin']:
-    for path in WINDOWS_NODE_PATHs:
-      full_path = os.path.join(path, 'node.exe')
-      if os.path.exists(full_path):
-        return full_path
-  return 'node'
+    asar += '.cmd'
+  subprocess.check_call([asar, 'pack', output_dir, archive])
 
 
 def safe_mkdir(path):