'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_libuv%': 'false',
'node_use_openssl%': 'true',
'node_shared_openssl%': 'false',
'node_v8_options%': '',
+ 'node_target_type%': 'executable',
'library_files': [
'src/node.js',
'lib/_debug_agent.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/v8.js',
'lib/vm.js',
'lib/zlib.js',
+ 'lib/internal/child_process.js',
+ 'lib/internal/freelist.js',
+ 'lib/internal/socket_list.js',
+ 'lib/internal/repl.js',
+ 'lib/internal/util.js',
+ 'lib/internal/streams/lazy_transform.js',
],
},
'targets': [
{
- 'target_name': 'iojs',
- 'type': 'executable',
+ 'target_name': 'node',
+ 'type': '<(node_target_type)',
'dependencies': [
'node_js2c#host',
- 'deps/cares/cares.gyp:cares'
+ 'deps/cares/cares.gyp:cares',
+ 'deps/v8/tools/gyp/v8.gyp:v8',
+ 'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
],
'include_dirs': [
'src',
'tools/msvs/genfiles',
'deps/uv/src/ares',
- '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
+ '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
+ 'deps/v8' # include/v8_platform.h
],
'sources': [
'src/debug-agent.cc',
'src/async-wrap.cc',
+ 'src/env.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/spawn_sync.cc',
'src/string_bytes.cc',
'src/stream_base.cc',
'src/node_wrap.h',
'src/node_i18n.h',
'src/pipe_wrap.h',
- 'src/smalloc.h',
'src/tty_wrap.h',
'src/tcp_wrap.h',
'src/udp_wrap.h',
'src/util-inl.h',
'src/util.cc',
'deps/http_parser/http_parser.h',
+ 'deps/v8/include/v8.h',
+ 'deps/v8/include/v8-debug.h',
'<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
# javascript files to make for an even more pleasant IDE experience
'<@(library_files)',
'defines': [
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
- 'NODE_TAG="<(node_tag)"',
- 'NODE_V8_OPTIONS="<(node_v8_options)"',
'NODE_WANT_INTERNALS=1',
+ # Warn when using deprecated V8 APIs.
+ 'V8_DEPRECATION_WARNINGS=1',
],
+
'conditions': [
+ [ 'node_tag!=""', {
+ 'defines': [ 'NODE_TAG="<(node_tag)"' ],
+ }],
+ [ 'node_v8_options!=""', {
+ 'defines': [ 'NODE_V8_OPTIONS="<(node_v8_options)"'],
+ }],
+ # No node_main.cc for anything except executable
+ [ 'node_target_type!="executable"', {
+ 'sources!': [
+ 'src/node_main.cc',
+ ],
+ }],
+ [ 'node_release_urlbase!=""', {
+ 'defines': [
+ 'NODE_RELEASE_URLBASE="<(node_release_urlbase)"',
+ ]
+ }],
[ 'v8_enable_i18n_support==1', {
'defines': [ 'NODE_HAVE_I18N_SUPPORT=1' ],
'dependencies': [
'./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',
+ # -force_load or --whole-archive are not applicable for
+ # the static library
+ [ 'node_target_type!="static_library"', {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
+ ],
+ },
+ 'conditions': [
+ ['OS in "linux freebsd"', {
+ 'ldflags': [
+ '-Wl,--whole-archive <(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
+ '-Wl,--no-whole-archive',
+ ],
+ }],
],
}],
],
} ],
[ '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',
- 'deps/v8/include/v8-debug.h',
+ 'conditions': [
+ # -force_load is not applicable for the static library
+ [ 'node_target_type!="static_library"', {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-Wl,-force_load,<(V8_BASE)',
+ ],
+ },
+ }],
],
- 'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
}],
-
[ 'node_shared_zlib=="false"', {
'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
}],
],
}],
[ 'OS=="freebsd" or OS=="linux"', {
- 'ldflags': [ '-Wl,-z,noexecstack' ],
+ 'ldflags': [ '-Wl,-z,noexecstack',
+ '-Wl,--whole-archive <(V8_BASE)',
+ '-Wl,--no-whole-archive' ]
}],
[ 'OS=="sunos"', {
'ldflags': [ '-Wl,-M,/usr/lib/ld/map.noexstk' ],
}],
- [
- 'OS in "linux freebsd" and node_shared_v8=="false"', {
- 'ldflags': [
- '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
- ],
- }],
],
'msvs_settings': {
'VCManifestTool': {
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
- '<(OBJ_DIR)/iojs/src/node_dtrace.o',
+ '<(OBJ_DIR)/node/src/node_dtrace.o',
],
'outputs': [
- '<(OBJ_DIR)/iojs/src/node_dtrace_provider.o'
+ '<(OBJ_DIR)/node/src/node_dtrace_provider.o'
],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
'<@(_inputs)', '-o', '<@(_outputs)' ]
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
],
'outputs': [
- '<(OBJ_DIR)/iojs/src/node_dtrace_ustack.o'
+ '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
],
'conditions': [
[ 'target_arch=="ia32"', {
],
} ],
]
+ },
+ {
+ 'target_name': 'cctest',
+ 'type': 'executable',
+ 'dependencies': [
+ 'deps/gtest/gtest.gyp:gtest',
+ 'deps/v8/tools/gyp/v8.gyp:v8',
+ 'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
+ ],
+ 'include_dirs': [
+ 'src',
+ 'deps/v8/include'
+ ],
+ 'defines': [
+ # gtest's ASSERT macros conflict with our own.
+ 'GTEST_DONT_DEFINE_ASSERT_EQ=1',
+ 'GTEST_DONT_DEFINE_ASSERT_GE=1',
+ 'GTEST_DONT_DEFINE_ASSERT_GT=1',
+ 'GTEST_DONT_DEFINE_ASSERT_LE=1',
+ 'GTEST_DONT_DEFINE_ASSERT_LT=1',
+ 'GTEST_DONT_DEFINE_ASSERT_NE=1',
+ ],
+ 'sources': [
+ 'test/cctest/util.cc',
+ ],
}
] # end targets
}
projects / platform / upstream / nodejs.git / blobdiff