diff --git a/atom.gyp b/atom.gyp index 31ac253b0ff4..6a4e7c861d76 100644 --- a/atom.gyp +++ b/atom.gyp @@ -627,36 +627,5 @@ }, ], }], # OS!="mac" - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'generate_node_lib', - 'type': 'none', - 'dependencies': [ - '<(project_name)', - ], - 'actions': [ - { - 'action_name': 'Create node.lib', - 'inputs': [ - '<(PRODUCT_DIR)/<(project_name).lib', - ], - 'outputs': [ - '<(PRODUCT_DIR)/node.lib', - ], - 'action': [ - 'lib.exe', - '/nologo', - # We can't use <(_outputs) here because that escapes the - # backslash in the path, which confuses lib.exe. - '/OUT:<(PRODUCT_DIR)\\node.lib', - '<@(_inputs)', - ], - 'msvs_cygwin_shell': 0, - }, - ], - }, # target generate_node_lib - ], - }], # OS==win ], } diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py index c8998a80054c..5b452363618d 100755 --- a/script/upload-node-headers.py +++ b/script/upload-node-headers.py @@ -110,12 +110,12 @@ def upload_node(bucket, access_key, secret_key, version): 'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz')) if TARGET_PLATFORM == 'win32': - # Generate the node.lib. - build = os.path.join(SOURCE_ROOT, 'script', 'build.py') - execute([sys.executable, build, '-c', 'Release', '-t', 'generate_node_lib']) + # Copy atom.lib to node.lib + node_lib = os.path.join(OUT_DIR, 'node.lib') + atom_lib = os.path.join(OUT_DIR, 'atom.lib') + shutil.copy2(atom_lib, node_lib) # Upload the 32bit node.lib. - node_lib = os.path.join(OUT_DIR, 'node.lib') s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist/{0}'.format(version), [node_lib])