{
'variables': {
- 'v8_use_snapshot%': 'true',
+ 'v8_use_snapshot%': 'false',
'node_use_dtrace%': 'false',
+ 'node_use_lttng%': 'false',
'node_use_etw%': 'false',
'node_use_perfctr%': 'false',
'node_has_winsdk%': 'false',
'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_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/net.js',
'lib/os.js',
'lib/path.js',
+ 'lib/process.js',
'lib/punycode.js',
'lib/querystring.js',
'lib/readline.js',
'lib/string_decoder.js',
'lib/sys.js',
'lib/timers.js',
- 'lib/tracing.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',
],
'targets': [
{
- 'target_name': 'node',
+ 'target_name': 'iojs',
'type': 'executable',
'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_main.cc',
'src/node_os.cc',
'src/node_v8.cc',
+ 'src/node_v8_platform.cc',
'src/node_stat_watcher.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/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_contextify.h',
'src/node_file.h',
'src/node_http_parser.h',
'src/node_internals.h',
'src/node_version.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/req-wrap.h',
+ 'src/req-wrap-inl.h',
'src/string_bytes.h',
'src/stream_wrap.h',
'src/tree.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': [
'./deps/openssl/openssl.gyp:openssl',
# For tests
- './deps/openssl/openssl.gyp:openssl-cli'
+ './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',
+ ],
+ }],
],
}]]
}, {
}],
[ 'node_use_dtrace=="true"', {
'defines': [ 'HAVE_DTRACE=1' ],
- 'dependencies': [ 'node_dtrace_header' ],
+ 'dependencies': [
+ 'node_dtrace_header',
+ 'specialize_node_d',
+ ],
'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
+
#
# DTrace is supported on linux, solaris, mac, and bsd. There are
# three object files associated with DTrace support, but they're
'conditions': [
[ 'OS=="linux"', {
'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
- '<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o',
+ '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
],
}],
[ 'OS!="mac" and OS!="linux"', {
}
] ]
} ],
+ [ 'node_use_lttng=="true"', {
+ 'defines': [ 'HAVE_LTTNG=1' ],
+ 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
+ 'libraries': [ '-llttng-ust' ],
+ 'sources': [
+ 'src/node_lttng.cc'
+ ],
+ } ],
[ 'node_use_mdb=="true"', {
'dependencies': [ 'node_mdb' ],
'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
} ],
[ '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': [
'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' ],
}],
'sources': [
'src/res/node.rc',
],
+ 'defines!': [
+ 'NODE_PLATFORM="win"',
+ ],
'defines': [
'FD_SETSIZE=1024',
# we need to use node's preferred "win32" rather than gyp's preferred "win"
- 'PLATFORM="win32"',
+ 'NODE_PLATFORM="win32"',
'_UNICODE=1',
],
'libraries': [ '-lpsapi.lib' ]
'defines': [ '__POSIX__' ],
}],
[ 'OS=="mac"', {
+ # linking Corefoundation is needed since certain OSX debugging tools
+ # like Instruments require it for some features
+ 'libraries': [ '-framework CoreFoundation' ],
'defines!': [
- 'PLATFORM="mac"',
+ 'NODE_PLATFORM="mac"',
],
'defines': [
# we need to use node's preferred "darwin" rather than gyp's preferred "mac"
- 'PLATFORM="darwin"',
+ 'NODE_PLATFORM="darwin"',
],
}],
[ 'OS=="freebsd"', {
'-lumem',
],
'defines!': [
- 'PLATFORM="solaris"',
+ 'NODE_PLATFORM="solaris"',
],
'defines': [
# we need to use node's preferred "sunos"
# rather than gyp's preferred "solaris"
- 'PLATFORM="sunos"',
+ 'NODE_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',
],
}],
],
'msvs_settings': {
- 'VCLinkerTool': {
- 'SubSystem': 1, # /subsystem:console
- },
+ 'VCManifestTool': {
+ 'EmbedManifest': 'true',
+ 'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest'
+ }
},
},
# generate ETW header and resource files
[ 'node_use_dtrace=="false" and node_use_etw=="false"', {
'inputs': [ 'src/notrace_macros.py' ]
}],
+ ['node_use_lttng=="false"', {
+ 'inputs': [ 'src/nolttng_macros.py' ]
+ }],
[ 'node_use_perfctr=="false"', {
'inputs': [ 'src/perfctr_macros.py' ]
}]
'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)' ]
}
]
- } ]
+ } ],
+ [ 'node_use_dtrace=="true" and OS=="linux"', {
+ 'actions': [
+ {
+ 'action_name': 'node_dtrace_header',
+ 'inputs': [ 'src/node_provider.d' ],
+ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
+ 'action': [ 'dtrace', '-h', '-s', '<@(_inputs)',
+ '-o', '<@(_outputs)' ]
+ }
+ ]
+ } ],
]
},
{
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
- '<(OBJ_DIR)/libuv/deps/uv/src/unix/core.o',
- '<(OBJ_DIR)/node/src/node_dtrace.o',
+ '<(OBJ_DIR)/iojs/src/node_dtrace.o',
],
'outputs': [
- '<(OBJ_DIR)/node/src/node_dtrace_provider.o'
+ '<(OBJ_DIR)/iojs/src/node_dtrace_provider.o'
],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
- '-s', 'deps/uv/src/unix/uv-dtrace.d', '<@(_inputs)',
- '-o', '<@(_outputs)' ]
+ '<@(_inputs)', '-o', '<@(_outputs)' ]
}
]
}],
'action': [
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
],
- },
- {
- 'action_name': 'libuv_dtrace_provider_o',
- 'inputs': [ 'deps/uv/src/unix/uv-dtrace.d' ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o'
- ],
- 'action': [
- 'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
- ],
- },
+ }
],
}],
]
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
],
'outputs': [
- '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
+ '<(OBJ_DIR)/iojs/src/node_dtrace_ustack.o'
],
'conditions': [
[ 'target_arch=="ia32"', {
]
} ],
]
- }
+ },
]
} ],
]
+ },
+ {
+ 'target_name': 'specialize_node_d',
+ 'type': 'none',
+ 'conditions': [
+ [ 'node_use_dtrace=="true"', {
+ 'actions': [
+ {
+ 'action_name': 'specialize_node_d',
+ 'inputs': [
+ 'src/node.d'
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/node.d',
+ ],
+ 'action': [
+ 'tools/specialize_node_d.py',
+ '<@(_outputs)',
+ '<@(_inputs)',
+ '<@(OS)',
+ '<@(target_arch)',
+ ],
+ },
+ ],
+ } ],
+ ]
}
] # end targets
}
projects / platform / upstream / nodejs.git / blobdiff