Merge pull request #13124 from nornagon/node-configure
refactor: [gn] Build node by calling ./configure
This commit is contained in:
Charles Kerr
GitHub
commit
6301582e77
3 changed files with 63 additions and 294 deletions
|
|
@ -1,10 +1,35 @@
|
||||||
|
action("configure_node") {
|
||||||
|
script = "//third_party/electron_node/configure"
|
||||||
|
args = [
|
||||||
|
"--enable-static",
|
||||||
|
"--openssl-no-asm",
|
||||||
|
"--release-urlbase=https://atom.io/download/electron",
|
||||||
|
"--shared",
|
||||||
|
"--without-npm",
|
||||||
|
"--without-bundled-v8",
|
||||||
|
"--without-dtrace",
|
||||||
|
"--without-etw",
|
||||||
|
"--without-perfctr",
|
||||||
|
"--without-v8-platform",
|
||||||
|
"--without-intl",
|
||||||
|
"--prefix=",
|
||||||
|
"--config-out-dir=" + rebase_path(target_gen_dir),
|
||||||
|
"--no-run-gyp",
|
||||||
|
]
|
||||||
|
outputs = [
|
||||||
|
"$target_gen_dir/config.gypi",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
action("gyp_node") {
|
action("gyp_node") {
|
||||||
script = "//tools/gyp/gyp_main.py"
|
script = "//tools/gyp/gyp_main.py"
|
||||||
|
deps = [ ":configure_node" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"//third_party/electron_node/common.gypi",
|
"//third_party/electron_node/common.gypi",
|
||||||
"//third_party/electron_node/node.gyp",
|
"//third_party/electron_node/node.gyp",
|
||||||
"//third_party/electron_node/node.gypi",
|
"//third_party/electron_node/node.gypi",
|
||||||
"node.gypi",
|
"$target_gen_dir/config.gypi",
|
||||||
|
"node_override.gypi",
|
||||||
]
|
]
|
||||||
outputs = [
|
outputs = [
|
||||||
"$target_out_dir/Release/build.ninja",
|
"$target_out_dir/Release/build.ninja",
|
||||||
|
|
@ -17,19 +42,13 @@ action("gyp_node") {
|
||||||
shlib_suffix = "so"
|
shlib_suffix = "so"
|
||||||
}
|
}
|
||||||
args = [
|
args = [
|
||||||
"-I", rebase_path("toolchain.gypi", root_build_dir),
|
"-I", rebase_path("$target_gen_dir/config.gypi", root_build_dir),
|
||||||
"-I", rebase_path("node.gypi", root_build_dir),
|
"-I", rebase_path("node_override.gypi", root_build_dir),
|
||||||
"-I", rebase_path("//third_party/electron_node/common.gypi", root_build_dir),
|
"-I", rebase_path("//third_party/electron_node/common.gypi", root_build_dir),
|
||||||
# TODO(jeremy): make these paths relative instead of absolute, to help
|
|
||||||
# caches.
|
|
||||||
"-D", "chromium_root_out_dir=" + rebase_path(root_out_dir),
|
|
||||||
"-D", "chromium_src_dir=" + rebase_path("//"),
|
|
||||||
"-D", "component=shared_library",
|
"-D", "component=shared_library",
|
||||||
"-D", "buildtype=Custom",
|
"-D", "target_arch=$target_cpu",
|
||||||
"-D", "target_arch=x64",
|
"-D", "host_arch=$host_cpu",
|
||||||
"-D", "host_arch=x64",
|
"-D", "config_gypi=" + rebase_path("$target_gen_dir/config.gypi"),
|
||||||
"-D", "shlib_suffix=$shlib_suffix",
|
|
||||||
"-D", "is_component_build=$is_component_build",
|
|
||||||
"-Goutput_dir=./$target_out_dir", # bizarrely, gyp generates from the build root instead of from cwd
|
"-Goutput_dir=./$target_out_dir", # bizarrely, gyp generates from the build root instead of from cwd
|
||||||
"-fninja",
|
"-fninja",
|
||||||
rebase_path("//third_party/electron_node/node.gyp", root_build_dir),
|
rebase_path("//third_party/electron_node/node.gyp", root_build_dir),
|
||||||
|
|
|
||||||
|
|
@ -1,282 +0,0 @@
|
||||||
{
|
|
||||||
#'includes': [ 'v8.gypi' ],
|
|
||||||
'variables': {
|
|
||||||
'openssl_fips': '',
|
|
||||||
'openssl_no_asm': 1,
|
|
||||||
'use_openssl_def': 0,
|
|
||||||
'openssl_product': 'libopenssl.a',
|
|
||||||
'clang': 1,
|
|
||||||
# XXX(alexeykuzmin): Must match the clang version we use. See `clang -v`.
|
|
||||||
'llvm_version': '6.0',
|
|
||||||
'node_release_urlbase': 'https://atom.io/download/electron',
|
|
||||||
'node_byteorder': '<!(node <(DEPTH)/electron/tools/get-endianness.js)',
|
|
||||||
'node_target_type': 'shared_library',
|
|
||||||
'library': 'static_library',
|
|
||||||
'node_install_npm': 'false',
|
|
||||||
'node_prefix': '',
|
|
||||||
'node_shared': 'true',
|
|
||||||
'node_shared_cares': 'false',
|
|
||||||
'node_shared_http_parser': 'false',
|
|
||||||
'node_shared_libuv': 'false',
|
|
||||||
'node_shared_openssl': 'false',
|
|
||||||
'node_shared_zlib': 'false',
|
|
||||||
'node_tag': '',
|
|
||||||
'node_use_dtrace': 'false',
|
|
||||||
'node_use_etw': 'false',
|
|
||||||
'node_use_mdb': 'false',
|
|
||||||
'node_use_openssl': 'true',
|
|
||||||
'node_use_perfctr': 'false',
|
|
||||||
'node_use_v8_platform': 'false',
|
|
||||||
'node_use_bundled_v8': 'false',
|
|
||||||
'node_enable_d8': 'false',
|
|
||||||
'uv_library': 'static_library',
|
|
||||||
'uv_parent_path': 'vendor/node/deps/uv',
|
|
||||||
'uv_use_dtrace': 'false',
|
|
||||||
'v8_base': '',
|
|
||||||
'v8_postmortem_support': 'false',
|
|
||||||
'v8_enable_i18n_support': 'false',
|
|
||||||
'v8_enable_inspector': '1',
|
|
||||||
'debug_http2': 0,
|
|
||||||
'debug_nghttp2': 0,
|
|
||||||
|
|
||||||
'node_module_version': '0',
|
|
||||||
},
|
|
||||||
# Settings to compile node under Windows.
|
|
||||||
'target_defaults': {
|
|
||||||
'target_conditions': [
|
|
||||||
['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node_lib", "zlib", "nghttp2"]', {
|
|
||||||
'msvs_disabled_warnings': [
|
|
||||||
4003, # not enough actual parameters for macro 'V'
|
|
||||||
4013, # 'free' undefined; assuming extern returning int
|
|
||||||
4018, # signed/unsigned mismatch
|
|
||||||
4054, #
|
|
||||||
4055, # 'type cast' : from data pointer 'void *' to function pointer
|
|
||||||
4057, # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
|
|
||||||
4065, # switch statement contains 'default' but no 'case' labels
|
|
||||||
4129, # unrecognized character escape sequence
|
|
||||||
4189, #
|
|
||||||
4131, # uses old-style declarator
|
|
||||||
4133, # incompatible types
|
|
||||||
4146, # unary minus operator applied to unsigned type, result still unsigned
|
|
||||||
4164, # intrinsic function not declared
|
|
||||||
4152, # function/data pointer conversion in expression
|
|
||||||
4206, # translation unit is empty
|
|
||||||
4204, # non-constant aggregate initializer
|
|
||||||
4210, # nonstandard extension used : function given file scope
|
|
||||||
4214, # bit field types other than int
|
|
||||||
4232, # address of dllimport 'free' is not static, identity not guaranteed
|
|
||||||
4291, # no matching operator delete found
|
|
||||||
4295, # array is too small to include a terminating null character
|
|
||||||
4309, # 'static_cast': truncation of constant value
|
|
||||||
4311, # 'type cast': pointer truncation from 'void *const ' to 'unsigned long'
|
|
||||||
4389, # '==' : signed/unsigned mismatch
|
|
||||||
4456, # declaration of 'm' hides previous local declaration
|
|
||||||
4457, # declaration of 'message' hides function parameter
|
|
||||||
4459, # declaration of 'wq' hides global declaration
|
|
||||||
4477, # format string '%.*s' requires an argument of type 'int'
|
|
||||||
4505, # unreferenced local function has been removed
|
|
||||||
4701, # potentially uninitialized local variable 'sizew' used
|
|
||||||
4703, # potentially uninitialized local pointer variable 'req' used
|
|
||||||
4706, # assignment within conditional expression
|
|
||||||
4804, # unsafe use of type 'bool' in operation
|
|
||||||
4996, # this function or variable may be unsafe.
|
|
||||||
],
|
|
||||||
'msvs_settings': {
|
|
||||||
'VCCLCompilerTool': {
|
|
||||||
'WarnAsError': 'false',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'xcode_settings': {
|
|
||||||
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
|
|
||||||
'WARNING_CFLAGS': [
|
|
||||||
'-Wno-unknown-warning-option',
|
|
||||||
'-Wno-parentheses-equality',
|
|
||||||
'-Wno-unused-function',
|
|
||||||
'-Wno-sometimes-uninitialized',
|
|
||||||
'-Wno-pointer-sign',
|
|
||||||
'-Wno-sign-compare',
|
|
||||||
'-Wno-string-plus-int',
|
|
||||||
'-Wno-unused-variable',
|
|
||||||
'-Wno-deprecated-declarations',
|
|
||||||
'-Wno-return-type',
|
|
||||||
'-Wno-gnu-folding-constant',
|
|
||||||
'-Wno-shift-negative-value',
|
|
||||||
'-Wno-varargs', # https://git.io/v6Olj
|
|
||||||
'-Wno-unused-private-field',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
'conditions': [
|
|
||||||
['OS=="linux"', {
|
|
||||||
'cflags': [
|
|
||||||
'-Wno-unused-function',
|
|
||||||
'-Wno-unused-variable',
|
|
||||||
'-Wno-unused-value',
|
|
||||||
'-Wno-deprecated-declarations',
|
|
||||||
'-Wno-return-type',
|
|
||||||
'-Wno-format',
|
|
||||||
'-Wno-varargs', # https://git.io/v6Olj
|
|
||||||
# Required when building as shared library.
|
|
||||||
'-fPIC',
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['OS=="linux" and clang==1', {
|
|
||||||
'cflags': [
|
|
||||||
'-Wno-pointer-sign',
|
|
||||||
'-Wno-parentheses-equality',
|
|
||||||
'-Wno-sometimes-uninitialized',
|
|
||||||
'-Wno-string-plus-int',
|
|
||||||
'-Wno-shift-negative-value',
|
|
||||||
'-Wno-reserved-user-defined-literal',
|
|
||||||
'-Wno-implicit-function-declaration',
|
|
||||||
'-Wno-long-long',
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['_target_name=="node_lib"', {
|
|
||||||
'include_dirs': [
|
|
||||||
'<(chromium_src_dir)/v8',
|
|
||||||
'<(chromium_src_dir)/v8/include',
|
|
||||||
'<(chromium_src_dir)/third_party/icu/source/common',
|
|
||||||
'<(chromium_src_dir)/third_party/icu/source/i18n',
|
|
||||||
],
|
|
||||||
'defines': [
|
|
||||||
# Export V8 symbols from node.dll / libnode.so
|
|
||||||
'BUILDING_V8_SHARED',
|
|
||||||
'BUILDING_V8_PLATFORM_SHARED',
|
|
||||||
'BUILDING_V8_BASE_SHARED',
|
|
||||||
],
|
|
||||||
'cflags_cc': [
|
|
||||||
'-std=gnu++14',
|
|
||||||
'-fno-rtti',
|
|
||||||
],
|
|
||||||
'xcode_settings': {
|
|
||||||
# apparently on mac, even if you're not generating xcode junk,
|
|
||||||
# cflags_cc is just flat out ignored, and this weirdo xcode_settings
|
|
||||||
# thing is used instead.
|
|
||||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
|
|
||||||
'OTHER_CFLAGS': ['-fno-rtti'],
|
|
||||||
},
|
|
||||||
'libraries': [
|
|
||||||
'<(chromium_root_out_dir)/libv8<(SHARED_LIB_SUFFIX)',
|
|
||||||
'<(chromium_root_out_dir)/libv8_libbase<(SHARED_LIB_SUFFIX)',
|
|
||||||
'<(chromium_root_out_dir)/libv8_libplatform<(SHARED_LIB_SUFFIX)',
|
|
||||||
'<(chromium_root_out_dir)/libicuuc<(SHARED_LIB_SUFFIX)',
|
|
||||||
],
|
|
||||||
'conditions': [
|
|
||||||
#['OS=="mac" and libchromiumcontent_component==0', {
|
|
||||||
## -all_load is the "whole-archive" on macOS.
|
|
||||||
#'xcode_settings': {
|
|
||||||
#'OTHER_LDFLAGS': [ '-Wl,-all_load' ],
|
|
||||||
#},
|
|
||||||
#}],
|
|
||||||
#[{
|
|
||||||
#'libraries': [
|
|
||||||
#'<@(libchromiumcontent_v8_libraries)',
|
|
||||||
#],
|
|
||||||
#}],
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['_target_name=="openssl"', {
|
|
||||||
'xcode_settings': {
|
|
||||||
'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip
|
|
||||||
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
|
|
||||||
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
|
|
||||||
},
|
|
||||||
'cflags': [
|
|
||||||
'-fvisibility=hidden',
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['_target_name=="openssl-cli"', {
|
|
||||||
'ldflags!': [
|
|
||||||
'-nostdlib++',
|
|
||||||
]
|
|
||||||
}],
|
|
||||||
['_target_name=="libuv"', {
|
|
||||||
'conditions': [
|
|
||||||
['OS=="win"', {
|
|
||||||
# Expose libuv's symbols.
|
|
||||||
'defines': [
|
|
||||||
'BUILDING_UV_SHARED=1',
|
|
||||||
],
|
|
||||||
}], # OS=="win"
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['_target_name.startswith("crashpad")', {
|
|
||||||
'conditions': [
|
|
||||||
['OS=="mac"', {
|
|
||||||
'xcode_settings': {
|
|
||||||
'WARNING_CFLAGS': [
|
|
||||||
'-Wno-unused-private-field',
|
|
||||||
'-Wno-address-of-packed-member',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}], # OS=="mac"
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['_target_name.startswith("breakpad") or _target_name in ["crash_report_sender", "dump_syms"]', {
|
|
||||||
'conditions': [
|
|
||||||
['OS=="mac"', {
|
|
||||||
'xcode_settings': {
|
|
||||||
'WARNING_CFLAGS': [
|
|
||||||
'-Wno-deprecated-declarations',
|
|
||||||
'-Wno-deprecated-register',
|
|
||||||
'-Wno-unused-private-field',
|
|
||||||
'-Wno-unused-function',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}], # OS=="mac"
|
|
||||||
['OS=="linux"', {
|
|
||||||
'cflags': [
|
|
||||||
'-Wno-empty-body',
|
|
||||||
],
|
|
||||||
}], # OS=="linux"
|
|
||||||
['OS=="win"', {
|
|
||||||
'msvs_disabled_warnings': [
|
|
||||||
# unreferenced local function has been removed.
|
|
||||||
4505,
|
|
||||||
],
|
|
||||||
}], # OS=="win"
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
['OS=="linux" and _toolset=="target" and _target_name in ["dump_syms", "node_lib"]', {
|
|
||||||
'conditions': [
|
|
||||||
['is_component_build==0', {
|
|
||||||
'libraries': [
|
|
||||||
'<(chromium_root_out_dir)/libc++.a',
|
|
||||||
],
|
|
||||||
'ldflags': [
|
|
||||||
'-lpthread',
|
|
||||||
],
|
|
||||||
}, {
|
|
||||||
'libraries': [
|
|
||||||
'<(chromium_root_out_dir)/libc++.so',
|
|
||||||
],
|
|
||||||
'ldflags': [
|
|
||||||
'-Wl,-rpath=\$$ORIGIN',
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
}]
|
|
||||||
],
|
|
||||||
'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
|
|
||||||
'msvs_disabled_warnings': [
|
|
||||||
4005, # (node.h) macro redefinition
|
|
||||||
4091, # (node_extern.h) '__declspec(dllimport)' : ignored on left of 'node::Environment' when no variable is declared
|
|
||||||
4099, # (pdf_render_settings.h) type name first seen using 'class' now seen using 'struct'
|
|
||||||
4189, # local variable is initialized but not referenced
|
|
||||||
4201, # (uv.h) nameless struct/union
|
|
||||||
4267, # conversion from 'size_t' to 'int', possible loss of data
|
|
||||||
4302, # (atldlgs.h) 'type cast': truncation from 'LPCTSTR' to 'WORD'
|
|
||||||
4458, # (atldlgs.h) declaration of 'dwCommonButtons' hides class member
|
|
||||||
4503, # decorated name length exceeded, name was truncated
|
|
||||||
4530, # C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
|
|
||||||
4577, # 'noexcept' used with no exception handling mode specified
|
|
||||||
4714, # (atomicstring.h) function marked as __forceinline not inlined
|
|
||||||
4800, # (v8.h) forcing value to bool 'true' or 'false'
|
|
||||||
4819, # The file contains a character that cannot be represented in the current code page
|
|
||||||
4838, # (atlgdi.h) conversion from 'int' to 'UINT' requires a narrowing conversion
|
|
||||||
4996, # (atlapp.h) 'GetVersionExW': was declared deprecated
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
32
build/node/node_override.gypi
Normal file
32
build/node/node_override.gypi
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
{
|
||||||
|
'variables': {
|
||||||
|
# Node disables the inspector unless icu is enabled. But node doesn't know
|
||||||
|
# that we're building v8 with icu, so force it on.
|
||||||
|
'v8_enable_inspector': 1,
|
||||||
|
|
||||||
|
# By default, node will build a dylib called something like
|
||||||
|
# libnode.$node_module_version.dylib, which is inconvenient for our
|
||||||
|
# purposes (since it makes the library's name unpredictable). This forces
|
||||||
|
# it to drop the module_version from the filename and just produce
|
||||||
|
# `libnode.dylib`.
|
||||||
|
'shlib_suffix': 'dylib',
|
||||||
|
},
|
||||||
|
'target_defaults': {
|
||||||
|
'target_conditions': [
|
||||||
|
['_target_name=="node_lib"', {
|
||||||
|
'include_dirs': [
|
||||||
|
'../../../v8',
|
||||||
|
'../../../v8/include',
|
||||||
|
'../../../third_party/icu/source/common',
|
||||||
|
'../../../third_party/icu/source/i18n',
|
||||||
|
],
|
||||||
|
'libraries': [
|
||||||
|
'../../../../../../libv8.dylib',
|
||||||
|
'../../../../../../libv8_libbase.dylib',
|
||||||
|
'../../../../../../libv8_libplatform.dylib',
|
||||||
|
'../../../../../../libicuuc.dylib',
|
||||||
|
],
|
||||||
|
}],
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue