Fix windows native module test

rogerwang · rogerwang · commit e386088858ee · 2017-11-28T14:03:30.000+08:00
diff --git a/test/sanity/native-module-buffer/test.py b/test/sanity/native-module-buffer/test.py
@@ -69,17 +69,26 @@ def find_executable(executable, path=None):
 
 nw_gyp_path = find_executable('nw-gyp')
 npm_path = find_executable('npm')
+npm_cmdline = [npm_path, 'install']
+
+if sys.platform in ('win32', 'cygwin'):
+    nw_gyp_path = os.path.join(os.path.dirname(nw_gyp_path),
+                               'node_modules', 'nw-gyp', 'bin', 'nw-gyp.js')
+    npm_cmdline = [npm_path, 'install', '--msvs_version=2015']
 
 print "nw_gyp: ", nw_gyp_path
 print "npm_path: ", npm_path
 print "header path: ", header_path
+print "command line: ", npm_cmdline
 
 npm_env = {'npm_config_nodedir': header_path, 'npm_config_target': nw_version,
            'npm_config_arch': arch, 'npm_config_target_arch': arch,
            'npm_config_runtime': 'node-webkit', 'npm_config_build_from_source': "true",
            'npm_config_node_gyp': nw_gyp_path, 'PATH': os.getenv('PATH')}
 
-proc = Popen([npm_path, 'install'], stdout=PIPE, stderr=PIPE, env=npm_env)
+os.environ.update(npm_env)
+
+proc = Popen(npm_cmdline, stdout=PIPE, stderr=PIPE, env=os.environ)
 out, err = proc.communicate()
 print out
 print err
diff --git a/tools/make-nw-headers.py b/tools/make-nw-headers.py
@@ -7,6 +7,15 @@
 import shutil
 import distutils.core
 import re
+import argparse
+
+parser = argparse.ArgumentParser(description='Package nw binaries.')
+parser.add_argument('-p','--path', help='Where to find the binaries, like out/Release', required=False)
+parser.add_argument('-n','--name', help='platform name.', required=False)
+args = parser.parse_args()
+
+binaries_location = args.path
+platform_name = args.name
 
 def update_uvh(tmp_dir, header_files):
   for file in header_files:
@@ -96,3 +105,12 @@ def update_uvh(tmp_dir, header_files):
   tar.add(os.path.join(tmp_dir, 'node'), arcname='node')
 
 print 'compress end'
+
+#copy over the nw.lib files so building native modules locally can work later in tests
+
+if platform_name == 'win':
+  release_dir = os.path.join(tmp_dir, 'node', 'Release')
+  if not os.path.exists(release_dir):
+    os.mkdir(release_dir)
+  shutil.copy(os.path.join(binaries_location, 'nw.lib'), release_dir)
+  shutil.copy(os.path.join(binaries_location, 'node.lib'), release_dir)
diff --git a/tools/package_binaries.py b/tools/package_binaries.py
@@ -295,7 +295,7 @@ def generate_target_headers(platform_name, arch, version):
     make_nw_header = os.path.join(os.path.dirname(__file__), \
                                   'make-nw-headers.py')
     print make_nw_header
-    res = call(['python', make_nw_header])
+    res = call(['python', make_nw_header, '-p', binaries_location, '-n', platform_name])
     if res == 0:
         print 'nw-headers generated'
         nw_headers_name = 'nw-headers-v' + version + '.tar.gz'
