mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update to node.gyp's changes

Browse source
This commit is contained in:
Cheng Zhao 2015-06-10 14:11:34 +08:00
commit 04d24f61fe
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common.gypi
View file

@ -9,6 +9,7 @@
'component%': 'static_library', 'component%': 'static_library',
'python': 'python', 'python': 'python',
'openssl_no_asm': 1, 'openssl_no_asm': 1,
'node_target_type': 'shared_library',
'node_install_npm': 'false', 'node_install_npm': 'false',
'node_prefix': '', 'node_prefix': '',
'node_shared_cares': 'false', 'node_shared_cares': 'false',
@ -99,7 +100,10 @@
], ],
}], }],
['_target_name=="node"', { ['_target_name=="node"', {
'include_dirs': [ '<(libchromiumcontent_src_dir)/v8/include' ], 'include_dirs': [
'<(libchromiumcontent_src_dir)/v8',
'<(libchromiumcontent_src_dir)/v8/include',
],
'conditions': [ 'conditions': [
['OS=="mac" and libchromiumcontent_component==0', { ['OS=="mac" and libchromiumcontent_component==0', {
# -all_load is the "whole-archive" on OS X. # -all_load is the "whole-archive" on OS X.

10
script/update.py
View file

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import platform
import subprocess import subprocess
import sys import sys
@ -43,10 +44,19 @@ def run_gyp(target_arch, component):
defines = [ defines = [
'-Dlibchromiumcontent_component={0}'.format(component), '-Dlibchromiumcontent_component={0}'.format(component),
'-Dtarget_arch={0}'.format(target_arch), '-Dtarget_arch={0}'.format(target_arch),
'-Dhost_arch={0}'.format(target_arch),
'-Dlibrary=static_library', '-Dlibrary=static_library',
] ]
return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.', return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.',
'atom.gyp', '-Icommon.gypi'] + defines) 'atom.gyp', '-Icommon.gypi'] + defines)
def get_host_arch():
if platform.architecture()[0] == '32bit':
return 'ia32'
else:
return 'x64'
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())