Simplify how we build node.lib
This commit is contained in:
parent
21014614fc
commit
9a458785b6
2 changed files with 4 additions and 35 deletions
31
atom.gyp
31
atom.gyp
|
@ -627,36 +627,5 @@
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}], # OS!="mac"
|
}], # 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
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,12 +110,12 @@ def upload_node(bucket, access_key, secret_key, version):
|
||||||
'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz'))
|
'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz'))
|
||||||
|
|
||||||
if TARGET_PLATFORM == 'win32':
|
if TARGET_PLATFORM == 'win32':
|
||||||
# Generate the node.lib.
|
# Copy atom.lib to node.lib
|
||||||
build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
|
node_lib = os.path.join(OUT_DIR, 'node.lib')
|
||||||
execute([sys.executable, build, '-c', 'Release', '-t', 'generate_node_lib'])
|
atom_lib = os.path.join(OUT_DIR, 'atom.lib')
|
||||||
|
shutil.copy2(atom_lib, node_lib)
|
||||||
|
|
||||||
# Upload the 32bit node.lib.
|
# Upload the 32bit node.lib.
|
||||||
node_lib = os.path.join(OUT_DIR, 'node.lib')
|
|
||||||
s3put(bucket, access_key, secret_key, OUT_DIR,
|
s3put(bucket, access_key, secret_key, OUT_DIR,
|
||||||
'atom-shell/dist/{0}'.format(version), [node_lib])
|
'atom-shell/dist/{0}'.format(version), [node_lib])
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue