'node_shared_v8%': 'false',
'node_shared_zlib%': 'false',
'node_shared_http_parser%': 'false',
- 'node_shared_cares%': 'false',
'node_shared_libuv%': 'false',
'node_use_openssl%': 'true',
- 'node_use_systemtap%': 'false',
'node_shared_openssl%': 'false',
+ 'node_use_mdb%': 'false',
+ 'node_v8_options%': '',
'library_files': [
'src/node.js',
+ 'lib/_debug_agent.js',
'lib/_debugger.js',
'lib/_linklist.js',
'lib/assert.js',
'lib/freelist.js',
'lib/fs.js',
'lib/http.js',
+ 'lib/_http_agent.js',
+ 'lib/_http_client.js',
+ 'lib/_http_common.js',
+ 'lib/_http_incoming.js',
+ 'lib/_http_outgoing.js',
+ 'lib/_http_server.js',
'lib/https.js',
'lib/module.js',
'lib/net.js',
'lib/os.js',
'lib/path.js',
+ 'lib/process.js',
'lib/punycode.js',
'lib/querystring.js',
'lib/readline.js',
'lib/repl.js',
+ 'lib/smalloc.js',
'lib/stream.js',
'lib/_stream_readable.js',
'lib/_stream_writable.js',
'lib/sys.js',
'lib/timers.js',
'lib/tls.js',
+ 'lib/_tls_common.js',
+ 'lib/_tls_legacy.js',
+ 'lib/_tls_wrap.js',
'lib/tty.js',
'lib/url.js',
'lib/util.js',
+ 'lib/v8.js',
'lib/vm.js',
'lib/zlib.js',
],
'dependencies': [
'node_js2c#host',
+ 'deps/cares/cares.gyp:cares'
],
'include_dirs': [
],
'sources': [
+ 'src/debug-agent.cc',
+ 'src/async-wrap.cc',
'src/fs_event_wrap.cc',
'src/cares_wrap.cc',
'src/handle_wrap.cc',
'src/node.cc',
'src/node_buffer.cc',
'src/node_constants.cc',
- 'src/node_extensions.cc',
+ 'src/node_contextify.cc',
'src/node_file.cc',
'src/node_http_parser.cc',
'src/node_javascript.cc',
'src/node_main.cc',
'src/node_os.cc',
- 'src/node_script.cc',
+ 'src/node_v8.cc',
+ 'src/node_v8_platform.cc',
'src/node_stat_watcher.cc',
- 'src/node_string.cc',
+ 'src/node_watchdog.cc',
'src/node_zlib.cc',
+ 'src/node_i18n.cc',
'src/pipe_wrap.cc',
'src/signal_wrap.cc',
+ 'src/smalloc.cc',
+ 'src/spawn_sync.cc',
'src/string_bytes.cc',
'src/stream_wrap.cc',
- 'src/slab_allocator.cc',
'src/tcp_wrap.cc',
'src/timer_wrap.cc',
'src/tty_wrap.cc',
'src/process_wrap.cc',
- 'src/v8_typed_array.cc',
'src/udp_wrap.cc',
+ 'src/uv.cc',
# headers to make for a more pleasant IDE experience
+ 'src/async-wrap.h',
+ 'src/async-wrap-inl.h',
+ 'src/base-object.h',
+ 'src/base-object-inl.h',
+ 'src/debug-agent.h',
+ 'src/env.h',
+ 'src/env-inl.h',
'src/handle_wrap.h',
'src/node.h',
'src/node_buffer.h',
'src/node_constants.h',
- 'src/node_crypto.h',
- 'src/node_extensions.h',
'src/node_file.h',
'src/node_http_parser.h',
+ 'src/node_internals.h',
'src/node_javascript.h',
- 'src/node_os.h',
'src/node_root_certs.h',
- 'src/node_script.h',
- 'src/node_string.h',
'src/node_version.h',
- 'src/ngx-queue.h',
+ 'src/node_watchdog.h',
+ 'src/node_wrap.h',
+ 'src/node_i18n.h',
'src/pipe_wrap.h',
+ 'src/queue.h',
+ 'src/smalloc.h',
'src/tty_wrap.h',
'src/tcp_wrap.h',
'src/udp_wrap.h',
'src/req_wrap.h',
- 'src/slab_allocator.h',
'src/string_bytes.h',
'src/stream_wrap.h',
'src/tree.h',
- 'src/v8_typed_array.h',
+ 'src/util.h',
+ 'src/util-inl.h',
+ 'src/util.cc',
'deps/http_parser/http_parser.h',
'<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
# javascript files to make for an even more pleasant IDE experience
],
'defines': [
- 'NODE_WANT_INTERNALS=1',
- 'ARCH="<(target_arch)"',
- 'PLATFORM="<(OS)"',
+ 'NODE_ARCH="<(target_arch)"',
+ 'NODE_PLATFORM="<(OS)"',
'NODE_TAG="<(node_tag)"',
+ 'NODE_V8_OPTIONS="<(node_v8_options)"',
+ 'NODE_WANT_INTERNALS=1',
],
'conditions': [
+ [ 'v8_enable_i18n_support==1', {
+ 'defines': [ 'NODE_HAVE_I18N_SUPPORT=1' ],
+ 'dependencies': [
+ '<(icu_gyp_path):icui18n',
+ '<(icu_gyp_path):icuuc',
+ ],
+ 'conditions': [
+ [ 'icu_small=="true"', {
+ 'defines': [ 'NODE_HAVE_SMALL_ICU=1' ],
+ }]],
+ }],
[ 'node_use_openssl=="true"', {
'defines': [ 'HAVE_OPENSSL=1' ],
- 'sources': [ 'src/node_crypto.cc' ],
+ 'sources': [
+ 'src/node_crypto.cc',
+ 'src/node_crypto_bio.cc',
+ 'src/node_crypto_clienthello.cc',
+ 'src/node_crypto.h',
+ 'src/node_crypto_bio.h',
+ 'src/node_crypto_clienthello.h',
+ 'src/tls_wrap.cc',
+ 'src/tls_wrap.h'
+ ],
'conditions': [
[ 'node_shared_openssl=="false"', {
- 'dependencies': [ './deps/openssl/openssl.gyp:openssl' ],
+ 'dependencies': [
+ './deps/openssl/openssl.gyp:openssl',
+
+ # For tests
+ './deps/openssl/openssl.gyp:openssl-cli',
+ ],
+ # Do not let unused OpenSSL symbols to slip away
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-Wl,-force_load,<(PRODUCT_DIR)/libopenssl.a',
+ ],
+ },
+ 'conditions': [
+ ['OS in "linux freebsd"', {
+ 'ldflags': [
+ '-Wl,--whole-archive <(PRODUCT_DIR)/libopenssl.a -Wl,--no-whole-archive',
+ ],
+ }],
+ ],
}]]
}, {
'defines': [ 'HAVE_OPENSSL=0' ]
'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
#
- # DTrace is supported on solaris, mac, and bsd. There are three
- # object files associated with DTrace support, but they're not all
- # used all the time:
+ # DTrace is supported on linux, solaris, mac, and bsd. There are
+ # three object files associated with DTrace support, but they're
+ # not all used all the time:
#
# node_dtrace.o all configurations
- # node_dtrace_ustack.o not supported on OS X
+ # node_dtrace_ustack.o not supported on mac and linux
# node_dtrace_provider.o All except OS X. "dtrace -G" is not
# used on OS X.
#
# below, and the GYP-generated Makefiles will properly build them when
# needed.
#
- 'sources': [
- 'src/node_dtrace.cc',
- ],
- 'conditions': [ [
- 'OS!="mac"', {
+ 'sources': [ 'src/node_dtrace.cc' ],
+ 'conditions': [
+ [ 'OS=="linux"', {
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
+ ],
+ }],
+ [ 'OS!="mac" and OS!="linux"', {
'sources': [
'src/node_dtrace_ustack.cc',
'src/node_dtrace_provider.cc',
}
] ]
} ],
- [ 'node_use_systemtap=="true"', {
- 'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ],
- 'dependencies': [ 'node_systemtap_header' ],
+ [ 'node_use_mdb=="true"', {
+ 'dependencies': [ 'node_mdb' ],
'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
'sources': [
- 'src/node_dtrace.cc',
- '<(SHARED_INTERMEDIATE_DIR)/node_systemtap.h',
+ 'src/node_mdb.cc',
],
} ],
[ 'node_use_etw=="true"', {
'tools/msvs/genfiles/node_perfctr_provider.rc',
]
} ],
+ [ 'v8_postmortem_support=="true"', {
+ 'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:postmortem-metadata' ],
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-Wl,-force_load,<(V8_BASE)',
+ ],
+ },
+ }],
[ 'node_shared_v8=="false"', {
'sources': [
'deps/v8/include/v8.h',
'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
}],
- [ 'node_shared_cares=="false"', {
- 'dependencies': [ 'deps/cares/cares.gyp:cares' ],
- }],
-
[ 'node_shared_libuv=="false"', {
'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
}],
'defines': [ '__POSIX__' ],
}],
[ 'OS=="mac"', {
- 'libraries': [ '-framework Carbon' ],
+ # linking Corefoundation is needed since certain OSX debugging tools
+ # like Instruments require it for some features
+ 'libraries': [ '-framework CoreFoundation' ],
'defines!': [
'PLATFORM="mac"',
],
'PLATFORM="sunos"',
],
}],
+ [ 'OS=="freebsd" or OS=="linux"', {
+ 'ldflags': [ '-Wl,-z,noexecstack' ],
+ }],
+ [ 'OS=="sunos"', {
+ 'ldflags': [ '-Wl,-M,/usr/lib/ld/map.noexstk' ],
+ }],
[
- 'OS=="linux" and node_shared_v8=="false"', {
+ 'OS in "linux freebsd" and node_shared_v8=="false"', {
'ldflags': [
'-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
],
'VCLinkerTool': {
'SubSystem': 1, # /subsystem:console
},
+ 'VCManifestTool': {
+ 'EmbedManifest': 'true',
+ 'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest'
+ }
},
},
# generate ETW header and resource files
'<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
],
'conditions': [
- [ 'node_use_dtrace=="false"'
- ' and node_use_etw=="false"'
- ' and node_use_systemtap=="false"',
- {
- 'inputs': ['src/macros.py']
- }
- ],
+ [ 'node_use_dtrace=="false" and node_use_etw=="false"', {
+ 'inputs': [ 'src/notrace_macros.py' ]
+ }],
[ 'node_use_perfctr=="false"', {
'inputs': [ 'src/perfctr_macros.py' ]
}]
],
- 'action': [
- '<(python)',
- 'tools/js2c.py',
- '<@(_outputs)',
- '<@(_inputs)',
- ],
+ 'action': [
+ '<(python)',
+ 'tools/js2c.py',
+ '<@(_outputs)',
+ '<@(_inputs)',
+ ],
},
],
}, # end node_js2c
'target_name': 'node_dtrace_header',
'type': 'none',
'conditions': [
- [ 'node_use_dtrace=="true"', {
+ [ 'node_use_dtrace=="true" and OS!="linux"', {
'actions': [
{
'action_name': 'node_dtrace_header',
'-o', '<@(_outputs)' ]
}
]
- } ]
- ]
- },
- {
- 'target_name': 'node_systemtap_header',
- 'type': 'none',
- 'conditions': [
- [ 'node_use_systemtap=="true"', {
+ } ],
+ [ 'node_use_dtrace=="true" and OS=="linux"', {
'actions': [
{
- 'action_name': 'node_systemtap_header',
- 'inputs': [ 'src/node_systemtap.d' ],
- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_systemtap.h' ],
- 'action': [ 'dtrace', '-h', '-C', '-s', '<@(_inputs)',
+ 'action_name': 'node_dtrace_header',
+ 'inputs': [ 'src/node_provider.d' ],
+ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
+ 'action': [ 'dtrace', '-h', '-s', '<@(_inputs)',
'-o', '<@(_outputs)' ]
}
]
- } ]
+ } ],
]
},
{
+ 'target_name': 'node_mdb',
+ 'type': 'none',
+ 'conditions': [
+ [ 'node_use_mdb=="true"',
+ {
+ 'dependencies': [ 'deps/mdb_v8/mdb_v8.gyp:mdb_v8' ],
+ 'actions': [
+ {
+ 'action_name': 'node_mdb',
+ 'inputs': [ '<(PRODUCT_DIR)/obj.target/deps/mdb_v8/mdb_v8.so' ],
+ 'outputs': [ '<(PRODUCT_DIR)/obj.target/node/src/node_mdb.o' ],
+ 'conditions': [
+ [ 'target_arch=="ia32"', {
+ 'action': [ 'elfwrap', '-o', '<@(_outputs)', '<@(_inputs)' ],
+ } ],
+ [ 'target_arch=="x64"', {
+ 'action': [ 'elfwrap', '-64', '-o', '<@(_outputs)', '<@(_inputs)' ],
+ } ],
+ ],
+ },
+ ],
+ },
+ ],
+ ],
+ },
+ {
'target_name': 'node_dtrace_provider',
'type': 'none',
'conditions': [
- [ 'node_use_dtrace=="true" and OS!="mac"', {
+ [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
'actions': [
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
- 'src/node_provider.d',
- '<(OBJ_DIR)/node/src/node_dtrace.o'
+ '<(OBJ_DIR)/node/src/node_dtrace.o',
],
'outputs': [
'<(OBJ_DIR)/node/src/node_dtrace_provider.o'
],
- 'action': [ 'dtrace', '-G', '-xnolibs', '-s', '<@(_inputs)',
- '-o', '<@(_outputs)' ]
+ 'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
+ '<@(_inputs)', '-o', '<@(_outputs)' ]
}
]
- } ]
+ }],
+ [ 'node_use_dtrace=="true" and OS=="linux"', {
+ 'actions': [
+ {
+ 'action_name': 'node_dtrace_provider_o',
+ 'inputs': [ 'src/node_provider.d' ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
+ ],
+ 'action': [
+ 'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
+ ],
+ }
+ ],
+ }],
]
},
{
'target_name': 'node_dtrace_ustack',
'type': 'none',
'conditions': [
- [ 'node_use_dtrace=="true" and OS!="mac"', {
+ [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
'actions': [
{
'action_name': 'node_dtrace_ustack_constants',
projects / platform / upstream / nodejs.git / blobdiff