diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-03-22 19:10:06 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-07-21 11:25:20 -0400 |
| commit | bb2f68f8c42c7649b33b4b3855386fc954bc8fd4 (patch) | |
| tree | dcc1b829c4263366ff5ac39932028b687ab5d76b /src/mongo | |
| parent | 2a6a8f7cf32465da072e63ee9e1272907b6bfa54 (diff) | |
| download | mongo-bb2f68f8c42c7649b33b4b3855386fc954bc8fd4.tar.gz | |
SERVER-9666 Collapse the low level cyclic libs into a new base lib
Diffstat (limited to 'src/mongo')
49 files changed, 357 insertions, 266 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index fd95187afea..1b5c3426cfd 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -45,6 +45,80 @@ env.SConscript( ], ) +# NOTE: This library does not really belong here. Its presence here is +# temporary. Do not add to this library, do not remove from it, and do +# not declare other libraries in this file. + +env.Library( + target='base', + source=[ + 'base/data_range.cpp', + 'base/data_range_cursor.cpp', + 'base/data_type.cpp', + 'base/data_type_string_data.cpp', + 'base/data_type_terminated.cpp', + 'base/error_codes.cpp', + 'base/global_initializer.cpp', + 'base/global_initializer_registerer.cpp', + 'base/init.cpp', + 'base/initializer.cpp', + 'base/initializer_context.cpp', + 'base/initializer_dependency_graph.cpp', + 'base/make_string_vector.cpp', + 'base/parse_number.cpp', + 'base/status.cpp', + 'base/string_data.cpp', + 'base/validate_locale.cpp', + 'bson/bson_validate.cpp', + 'bson/bsonelement.cpp', + 'bson/bsonmisc.cpp', + 'bson/bsonobj.cpp', + 'bson/bsonobjbuilder.cpp', + 'bson/bsontypes.cpp', + 'bson/json.cpp', + 'bson/oid.cpp', + 'bson/timestamp.cpp', + 'logger/component_message_log_domain.cpp', + 'logger/console.cpp', + 'logger/log_component.cpp', + 'logger/log_component_settings.cpp', + 'logger/log_manager.cpp', + 'logger/logger.cpp', + 'logger/log_severity.cpp', + 'logger/logstream_builder.cpp', + 'logger/message_event_utf8_encoder.cpp', + 'logger/message_log_domain.cpp', + 'logger/ramlog.cpp', + 'logger/rotatable_file_manager.cpp', + 'logger/rotatable_file_writer.cpp', + 'platform/random.cpp', + 'util/allocator.cpp', + 'util/assert_util.cpp', + 'util/base64.cpp', + 'util/concurrency/thread_name.cpp', + 'util/exception_filter_win32.cpp', + 'util/hex.cpp', + 'util/log.cpp', + 'util/signal_handlers_synchronous.cpp', + 'util/stacktrace_${TARGET_OS_FAMILY}.cpp', + 'util/static_observer.cpp', + 'util/stringutils.cpp', + 'util/system_tick_source.cpp', + 'util/text.cpp', + 'util/time_support.cpp', + 'util/version.cpp', + ], + LIBDEPS=[ + # NOTE: This library *must not* depend on any libraries than + # the ones declared here. Do not add to this list. + '$BUILD_DIR/third_party/murmurhash3/murmurhash3', + '$BUILD_DIR/third_party/shim_boost', + '$BUILD_DIR/third_party/shim_pcrecpp', + 'util/debugger', + 'util/quick_exit', + ] +) + def get_toolchain_ver(tool): # By default we don't know the version of each tool, and only report what # command gets executed (gcc vs /opt/mongodbtoolchain/bin/gcc). @@ -156,7 +230,6 @@ config_header_substs = ( ('@mongo_config_have_std_make_unique@', 'MONGO_CONFIG_HAVE_STD_MAKE_UNIQUE'), ('@mongo_config_optimized_build@', 'MONGO_CONFIG_OPTIMIZED_BUILD'), ('@mongo_config_ssl@', 'MONGO_CONFIG_SSL'), - ('@mongo_config_use_gdbserver@', 'MONGO_CONFIG_USE_GDBSERVER'), ) def makeConfigHeaderDefine(self, key): @@ -172,15 +245,6 @@ generateConfigHeaderFile = env.Substfile( ) env.Alias('generated-sources', generateConfigHeaderFile) -env.Library('version', - [ - 'util/version.cpp' - ], - LIBDEPS=[ - 'bson/bson', - '$BUILD_DIR/mongo/base/base' - ]) - mongod = env.Program( target="mongod", source=[ @@ -218,7 +282,6 @@ env.Install( "db/coredb", "db/serveronly", "util/ntservice_mock", - "util/signal_handlers_synchronous", ]), ]) @@ -262,7 +325,6 @@ if env.TargetOSIs('osx') or env["_HAVEPCAP"]: LIBDEPS = [ "db/serveronly", "db/coredb", - "util/signal_handlers_synchronous", ] ) ) # --- shell --- @@ -295,7 +357,13 @@ if not has_option('noshell') and (usev8 or usemozjs): # mongo shell options shell_core_env.Library("shell_options", ["shell/shell_options.cpp"], - LIBDEPS=['$BUILD_DIR/mongo/util/options_parser/options_parser_init']) + LIBDEPS=[ + '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/rpc/protocol', + '$BUILD_DIR/mongo/util/net/network', + '$BUILD_DIR/mongo/util/options_parser/options_parser_init', + 'shell_core', + ]) shellEnv = env.Clone() if env.TargetOSIs('windows'): diff --git a/src/mongo/base/SConscript b/src/mongo/base/SConscript index a3bd46b266b..3c1ab018744 100644 --- a/src/mongo/base/SConscript +++ b/src/mongo/base/SConscript @@ -8,29 +8,6 @@ generateErrorCodes = env.Command( action='$PYTHON $SOURCES $TARGETS') env.Alias('generated-sources', generateErrorCodes) -env.Library('base', - ['data_range.cpp', - 'data_range_cursor.cpp', - 'data_type.cpp', - 'data_type_string_data.cpp', - 'data_type_terminated.cpp', - 'error_codes.cpp', - 'global_initializer.cpp', - 'global_initializer_registerer.cpp', - 'init.cpp', - 'initializer.cpp', - 'initializer_context.cpp', - 'initializer_dependency_graph.cpp', - 'validate_locale.cpp', - 'make_string_vector.cpp', - 'parse_number.cpp', - 'status.cpp', - 'string_data.cpp', - ], - LIBDEPS=['$BUILD_DIR/mongo/util/quick_exit', - '$BUILD_DIR/third_party/murmurhash3/murmurhash3', - ]) - env.CppUnitTest('base_test', ['counter_test.cpp', 'data_cursor_test.cpp', diff --git a/src/mongo/bson/SConscript b/src/mongo/bson/SConscript index 60e2b72a8cf..d2f20e3fc1c 100644 --- a/src/mongo/bson/SConscript +++ b/src/mongo/bson/SConscript @@ -9,34 +9,13 @@ env.SConscript( ], ) -env.Library( - target='bson', - source=[ - 'bson_validate.cpp', - 'bsonelement.cpp', - 'bsonmisc.cpp', - 'bsonobj.cpp', - 'bsonobjbuilder.cpp', - 'bsontypes.cpp', - 'json.cpp', - 'oid.cpp', - 'timestamp.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/platform/platform', - '$BUILD_DIR/mongo/util/md5', - '$BUILD_DIR/mongo/util/stringutils', - ], -) - env.CppUnitTest( target='bson_field_test', source=[ 'bson_field_test.cpp', ], LIBDEPS=[ - 'bson', + '$BUILD_DIR/mongo/base', ], ) @@ -46,7 +25,7 @@ env.CppUnitTest( 'bson_obj_test.cpp', ], LIBDEPS=[ - 'bson', + '$BUILD_DIR/mongo/base', ], ) @@ -56,7 +35,7 @@ env.CppUnitTest( 'bson_obj_data_type_test.cpp', ], LIBDEPS=[ - 'bson', + '$BUILD_DIR/mongo/base', ] ) @@ -66,7 +45,7 @@ env.CppUnitTest( 'bson_validate_test.cpp', ], LIBDEPS=[ - 'bson', + '$BUILD_DIR/mongo/base', ], ) @@ -76,7 +55,7 @@ env.CppUnitTest( 'bsonobjbuilder_test.cpp', ], LIBDEPS=[ - 'bson', + '$BUILD_DIR/mongo/base', ], ) @@ -86,6 +65,6 @@ env.CppUnitTest( 'oid_test.cpp', ], LIBDEPS=[ - 'bson', + '$BUILD_DIR/mongo/base', ], ) diff --git a/src/mongo/bson/mutable/SConscript b/src/mongo/bson/mutable/SConscript index 9546d260f5f..ebac4bdf87e 100644 --- a/src/mongo/bson/mutable/SConscript +++ b/src/mongo/bson/mutable/SConscript @@ -10,7 +10,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/util/safe_num', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) @@ -20,6 +20,7 @@ env.Library( 'mutable_bson_test_utils.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/unittest/unittest', 'mutable_bson', ], ) diff --git a/src/mongo/bson/util/SConscript b/src/mongo/bson/util/SConscript index 8360fb10ed3..6c8ce51e012 100644 --- a/src/mongo/bson/util/SConscript +++ b/src/mongo/bson/util/SConscript @@ -8,7 +8,7 @@ env.Library( 'bson_extract.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) @@ -18,7 +18,7 @@ env.CppUnitTest( 'bson_extract_test.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', 'bson_extract', ], ) @@ -29,7 +29,7 @@ env.CppUnitTest( 'builder_test.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) @@ -39,6 +39,6 @@ env.CppUnitTest( 'bson_check_test.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript index 265dc22e2c2..cd3a0f95523 100644 --- a/src/mongo/client/SConscript +++ b/src/mongo/client/SConscript @@ -77,6 +77,7 @@ env.Library( '$BUILD_DIR/mongo/rpc/command_status', '$BUILD_DIR/mongo/rpc/rpc', '$BUILD_DIR/mongo/util/net/network', + '$BUILD_DIR/mongo/util/md5', 'cyrus_sasl_client_session', 'read_preference', ] @@ -99,14 +100,13 @@ env.Library( 'remote_command_runner_impl.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/query/command_request_response', '$BUILD_DIR/mongo/db/query/lite_parsed_query', '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/rpc/protocol', - '$BUILD_DIR/mongo/util/foundation', '$BUILD_DIR/mongo/util/net/hostandport', 'connection_pool', ] @@ -164,7 +164,6 @@ if env['MONGO_BUILD_SASL_CLIENT']: ], LIBDEPS=[ '$BUILD_DIR/mongo/util/foundation', - '$BUILD_DIR/mongo/util/signal_handlers_synchronous', ], SYSLIBDEPS=saslLibs, ) @@ -199,6 +198,8 @@ env.Library( 'parallel.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + 'clientdriver', ], ) @@ -210,7 +211,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/executor/task_executor_interface', - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/rpc/command_status', ], diff --git a/src/mongo/config.h.in b/src/mongo/config.h.in index b4b52231c15..1ae9c83b84e 100644 --- a/src/mongo/config.h.in +++ b/src/mongo/config.h.in @@ -66,7 +66,3 @@ // Defined if SSL support is enabled @mongo_config_ssl@ - -// Defined if gdbserver support is enabled -@mongo_config_use_gdbserver@ - diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript index d11ae9d6376..f66e88be2b3 100644 --- a/src/mongo/crypto/SConscript +++ b/src/mongo/crypto/SConscript @@ -17,8 +17,7 @@ env.Library('crypto_openssl', env.Library('scramauth', ['mechanism_scram.cpp'], - LIBDEPS=['$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/util/stringutils', + LIBDEPS=['$BUILD_DIR/mongo/base', 'crypto_${MONGO_CRYPTO}']) env.CppUnitTest('crypto_test', diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 920e08ca950..7c807526d90 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -42,7 +42,7 @@ env.Library( 'write_concern_options.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/index_names', '$BUILD_DIR/mongo/util/foundation', ] @@ -109,6 +109,7 @@ env.Library( 'startup_warnings_common.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', ] ) @@ -163,6 +164,9 @@ env.Library( source=[ "index_names.cpp", ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ] ) env.Library( @@ -170,6 +174,11 @@ env.Library( source=[ "hasher.cpp", ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/foundation', + '$BUILD_DIR/mongo/util/md5', + ] ) # Range arithmetic library, used by both mongod and mongos @@ -179,7 +188,7 @@ env.Library( 'range_arithmetic.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation', ], ) @@ -199,6 +208,9 @@ env.Library( source=[ 'global_timestamp.cpp', ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ] ) env.Library( @@ -227,7 +239,7 @@ env.Library( "server_parameters.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/util/foundation", ], ) @@ -259,7 +271,7 @@ env.CppUnitTest( 'update_index_data_test.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', 'common', 'update_index_data', ], @@ -275,7 +287,7 @@ env.Library( "server_options.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) @@ -285,7 +297,7 @@ env.Library( "server_options_helpers.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', # The dependency on network is a temporary crutch that should go away once the # networking library has separate options @@ -313,8 +325,8 @@ env.Library( 'range_deleter_mock_env.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/repl/repl_coordinator_global', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/concurrency/synchronization', @@ -344,9 +356,15 @@ env.Library( "server_extra_log_context.cpp", ], LIBDEPS=[ + "$BUILD_DIR/mongo/client/clientdriver", + "$BUILD_DIR/mongo/rpc/command_reply", + "$BUILD_DIR/mongo/rpc/command_request", + "$BUILD_DIR/mongo/rpc/metadata", "$BUILD_DIR/mongo/util/net/message_server_port", "$BUILD_DIR/mongo/util/net/miniwebserver", + "$BUILD_DIR/mongo/util/processinfo", "$BUILD_DIR/mongo/util/signal_handlers", + "auth/authorization_manager_global", ], ) @@ -664,7 +682,11 @@ env.Library( source=[ 'log_process_details.cpp', ], - LIBDEPS=[], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/net/network', + 'server_options', + ], ) env.Library( @@ -673,5 +695,9 @@ env.Library( 'conn_pool_options.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/client/clientdriver', + '$BUILD_DIR/mongo/db/server_parameters', + '$BUILD_DIR/mongo/s/client/sharding_client', ], ) diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index 4a9cb6d1a6d..7e89f8fff74 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -31,24 +31,22 @@ env.Library('authcore', ['action_set.cpp', 'user_name.cpp', 'user_set.cpp'], LIBDEPS=['sasl_options', - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/crypto/scramauth', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/ops/update_driver', '$BUILD_DIR/mongo/db/namespace_string', - '$BUILD_DIR/mongo/util/signal_handlers_synchronous', - '$BUILD_DIR/mongo/util/stringutils', '$BUILD_DIR/mongo/util/md5']) env.Library('authcommon', ['internal_user_auth.cpp'], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/db/server_options_core', ]) env.Library('authorization_manager_global', @@ -88,10 +86,20 @@ env.Library('authservercommon', ]) env.Library('security_file', - ['security_file.cpp']) + ['security_file.cpp'], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], +) env.Library('sasl_options', - ['sasl_options.cpp']) + ['sasl_options.cpp'], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/server_parameters', + '$BUILD_DIR/mongo/util/options_parser/options_parser', + ], +) env.Library('saslauth', ['native_sasl_authentication_session.cpp', @@ -101,6 +109,7 @@ env.Library('saslauth', 'sasl_server_conversation.cpp'], LIBDEPS=[ 'authcore', + 'authmocks', # Wat? 'sasl_options', '$BUILD_DIR/mongo/crypto/scramauth', '$BUILD_DIR/mongo/util/net/network']) @@ -133,6 +142,7 @@ env.Library( '$BUILD_DIR/mongo/db/matcher/expressions', '$BUILD_DIR/mongo/db/ops/update_driver', '$BUILD_DIR/mongo/db/service_context', + 'authcore' ] ) diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 118363ff1a7..e8f07ceb4d7 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -2,7 +2,7 @@ Import("env") -env.Library('collection_options', ['collection_options.cpp'], LIBDEPS=['$BUILD_DIR/mongo/bson/bson']) +env.Library('collection_options', ['collection_options.cpp'], LIBDEPS=['$BUILD_DIR/mongo/base']) env.CppUnitTest('collection_options_test', ['collection_options_test.cpp'], LIBDEPS=['collection_options']) @@ -13,7 +13,7 @@ env.Library( "index_key_validate.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/index_names', ], diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 2c617b8e56c..52fd1f95b9e 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -9,7 +9,7 @@ env.Library( 'server_status_metric.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson' + '$BUILD_DIR/mongo/base' ] ) diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index 32ac7a41570..ebe267a5d03 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -22,7 +22,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/util/background_job', - '$BUILD_DIR/mongo/base/base', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation', # Temporary crutch since the ssl cleanup is hard coded in background.cpp '$BUILD_DIR/mongo/util/net/network', diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript index 282a49887d5..268d032418e 100644 --- a/src/mongo/db/exec/SConscript +++ b/src/mongo/db/exec/SConscript @@ -9,7 +9,7 @@ env.Library( "working_set.cpp", ], LIBDEPS = [ - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", ], ) @@ -29,6 +29,7 @@ env.Library( "scoped_timer.cpp", ], LIBDEPS = [ + '$BUILD_DIR/mongo/util/net/network', ], ) @@ -75,7 +76,8 @@ env.Library( ], LIBDEPS = [ "scoped_timer", - "$BUILD_DIR/mongo/bson/bson", + "working_set", + "$BUILD_DIR/mongo/base", ], ) diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript index 564eb28ce0c..5c9c28dcd05 100644 --- a/src/mongo/db/fts/SConscript +++ b/src/mongo/db/fts/SConscript @@ -41,7 +41,7 @@ baseEnv.Library('base', [ 'stop_words.cpp', 'stop_words_list.cpp', 'tokenizer.cpp', - ], LIBDEPS=["$BUILD_DIR/mongo/base/base", + ], LIBDEPS=["$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/common", "$BUILD_DIR/mongo/platform/platform", "$BUILD_DIR/third_party/shim_stemmer" @@ -49,7 +49,12 @@ baseEnv.Library('base', [ env.Library( 'server_common', [ 'fts_enabled.cpp' - ] ) + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/server_parameters', + ], +) env.Library('ftsmongod', [ ], LIBDEPS=["base","server_common"]) diff --git a/src/mongo/db/geo/SConscript b/src/mongo/db/geo/SConscript index 518f52ec4e7..9c8e13d1268 100644 --- a/src/mongo/db/geo/SConscript +++ b/src/mongo/db/geo/SConscript @@ -7,14 +7,15 @@ env.Library("geometry", [ "hash.cpp", "shapes.cpp", "big_polygon.cpp", "r2_region_coverer.cpp" ], - LIBDEPS = [ "$BUILD_DIR/mongo/bson/bson", + LIBDEPS = [ "$BUILD_DIR/mongo/base", + "$BUILD_DIR/mongo/db/common", "$BUILD_DIR/third_party/s2/s2" ]) # Geometry / BSON parsing and wrapping env.Library("geoparser", [ "geoparser.cpp", "geometry_container.cpp" ], LIBDEPS = [ "geometry", - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", "$BUILD_DIR/third_party/s2/s2" ]) env.CppUnitTest("hash_test", [ "hash_test.cpp" ], diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index abe30cdf819..1eca5ca05e3 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -8,6 +8,7 @@ env.Library( 'index_descriptor.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', ], ) @@ -20,7 +21,7 @@ env.Library( LIBDEPS=[ 'expression_params', 's2_keys', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/fts/base', '$BUILD_DIR/mongo/db/geo/geoparser', '$BUILD_DIR/mongo/db/index_names', @@ -38,7 +39,7 @@ env.Library( LIBDEPS=[ 'key_generator', 'expression_params', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) @@ -49,7 +50,7 @@ env.Library( 's2_indexing_params.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/mongohasher', '$BUILD_DIR/third_party/s2/s2', @@ -71,4 +72,4 @@ env.Library('s2_keys', [ 's2_keys.cpp' ], LIBDEPS=[ '$BUILD_DIR/mongo/db/geo/geometry', ], -)
\ No newline at end of file +) diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript index 9d3dca01633..f91ca8b2b34 100644 --- a/src/mongo/db/matcher/SConscript +++ b/src/mongo/db/matcher/SConscript @@ -9,7 +9,7 @@ env.Library( 'path_internal.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', ], ) @@ -39,7 +39,7 @@ env.Library( "matcher.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/third_party/shim_pcrecpp', 'path', diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index c445a91a7a4..de1bd249580 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -10,7 +10,7 @@ env.Library( 'path_support.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/util/foundation', @@ -207,7 +207,7 @@ env.Library( 'update_driver.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/query/query_planner', '$BUILD_DIR/mongo/db/update_index_data', diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index f84f7a20a40..19776fa8321 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -27,7 +27,7 @@ env.Library( ], LIBDEPS=[ 'field_path', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation', '$BUILD_DIR/mongo/util/intrusive_counter', ] diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 8dc72cdc256..98497eeceee 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -26,7 +26,7 @@ env.Library( "command_request_response", "index_bounds", "lite_parsed_query", - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/matcher/expression_algo", "$BUILD_DIR/mongo/db/matcher/expressions", "$BUILD_DIR/mongo/db/matcher/expressions_text", @@ -80,7 +80,7 @@ env.Library( "interval.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/index_names", "$BUILD_DIR/mongo/db/index/expression_params", "$BUILD_DIR/mongo/db/index/s2_keys", @@ -96,7 +96,7 @@ env.Library( "explain_common.cpp" ], LIBDEPS=[ - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", ], ) @@ -112,7 +112,7 @@ env.Library( 'killcursors_response.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/rpc/command_status', @@ -140,6 +140,9 @@ env.Library( "internal_plans.cpp" ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/exec/exec', + '$BUILD_DIR/mongo/db/exec/working_set', ], ) @@ -149,7 +152,7 @@ env.Library( "lite_parsed_query.cpp" ], LIBDEPS=[ - "$BUILD_DIR/mongo/bson/bson", + "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/repl/read_concern_args", ], ) diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index f3e9a5a196b..f82cae2ec44 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -24,14 +24,14 @@ env.Library( env.Library('repl_settings', 'repl_settings.cpp', LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/server_parameters' ]) env.Library('rslog', 'rslog.cpp', LIBDEPS=[ - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', ]) env.Library('storage_interface', @@ -109,6 +109,7 @@ env.Library( 'oplog_interface_mock.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', ], ) @@ -157,7 +158,7 @@ env.Library( 'rollback_source_impl.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/clientdriver', ], ) @@ -168,8 +169,12 @@ env.Library( 'sync_tail.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', + '$BUILD_DIR/mongo/db/curop', + '$BUILD_DIR/mongo/util/concurrency/thread_pool', + 'repl_coordinator_global', ], ) @@ -204,6 +209,7 @@ env.Library('topology_coordinator_impl', ], LIBDEPS=[ 'replication_executor', + 'replica_set_messages', 'repl_settings', 'rslog', 'topology_coordinator', @@ -255,9 +261,10 @@ env.Library('repl_coordinator_test_fixture', 'replication_coordinator_test_fixture.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/unittest/unittest', 'repl_coordinator_impl', 'replmocks', - 'topology_coordinator_impl', + 'topology_coordinator_impl',\ ]) env.CppUnitTest('repl_coordinator_impl_test', @@ -334,6 +341,7 @@ env.Library('repl_coordinator_interface', ['replication_coordinator.cpp', 'replication_coordinator_external_state.cpp'], LIBDEPS=[ + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/net/hostandport', 'optime', ]) @@ -363,7 +371,7 @@ env.Library('read_concern_args', 'read_concern_args.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', 'optime', ]) @@ -388,7 +396,7 @@ env.Library('replica_set_messages', ], LIBDEPS=[ 'read_concern_args', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/util/net/hostandport', '$BUILD_DIR/mongo/db/common', @@ -426,7 +434,8 @@ env.Library( 'repl_set_declare_election_winner.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/coredb', ], ) @@ -437,7 +446,7 @@ env.Library( ], LIBDEPS=[ 'replication_executor', - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/rpc/command_status', ], @@ -471,7 +480,7 @@ env.Library( 'replication_executor', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/client/fetcher', - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', ], ) @@ -523,6 +532,7 @@ env.Library( '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/unittest/concurrency', '$BUILD_DIR/mongo/util/decorable', + '$BUILD_DIR/mongo/unittest/unittest', ], ) @@ -577,7 +587,7 @@ env.Library(target='optime', 'optime.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ]) env.Library( @@ -609,6 +619,7 @@ env.Library( 'applier', 'collection_cloner', 'database_cloner', + 'optime', 'reporter', '$BUILD_DIR/mongo/client/fetcher', ], @@ -633,8 +644,7 @@ env.Library( 'roll_back_local_operations.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation', ], ) diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index dd07491dcf8..5fd7ae83820 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -9,8 +9,7 @@ env.Library( 'metadata_loader.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/range_arithmetic', '$BUILD_DIR/mongo/s/catalog/catalog_types', @@ -27,8 +26,7 @@ env.Library( 'sharding_state.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/s/sharding_initialization', @@ -51,4 +49,4 @@ env.CppUnitTest( '$BUILD_DIR/mongo/s/coreshard', '$BUILD_DIR/mongo/s/mongoscore', ] -)
\ No newline at end of file +) diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index af46ba98832..0dea68e45da 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -8,7 +8,7 @@ env.Library( 'timer_stats.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation', '$BUILD_DIR/mongo/util/concurrency/spin_lock', ], @@ -50,5 +50,7 @@ env.Library( 'counters.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/concurrency/spin_lock', ], ) diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index d77d3c5351d..d564a784e06 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -16,7 +16,9 @@ env.Library( source=[ 'index_entry_comparison.cpp', ], - LIBDEPS=[] + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], ) env.Library( @@ -24,7 +26,9 @@ env.Library( source=[ 'key_string.cpp', ], - LIBDEPS=[] + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], ) @@ -45,7 +49,7 @@ env.Library( 'oplog_hack.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ] ) @@ -55,6 +59,7 @@ env.Library( 'paths.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', ], ) @@ -80,6 +85,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/unittest/unittest', 'index_entry_comparison', ], ) @@ -105,6 +111,7 @@ env.Library( 'record_store_test_validate.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/unittest/unittest', '$BUILD_DIR/mongo/db/service_context', ] ) @@ -115,6 +122,7 @@ env.Library( 'storage_engine_lock_file_${TARGET_OS_FAMILY}.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/platform/platform', 'paths', ] ) @@ -133,7 +141,7 @@ env.Library( 'storage_engine_metadata.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ] ) @@ -150,6 +158,6 @@ env.CppUnitTest( source='key_string_test.cpp', LIBDEPS=[ 'key_string', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ] ) diff --git a/src/mongo/db/storage/devnull/SConscript b/src/mongo/db/storage/devnull/SConscript index 3c64dc8108d..e3355801c3c 100644 --- a/src/mongo/db/storage/devnull/SConscript +++ b/src/mongo/db/storage/devnull/SConscript @@ -7,6 +7,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/storage/in_memory/in_memory_record_store', + '$BUILD_DIR/mongo/db/storage/kv/kv_storage_engine', ], ) diff --git a/src/mongo/db/storage/in_memory/SConscript b/src/mongo/db/storage/in_memory/SConscript index 70676b463d1..b077784f505 100644 --- a/src/mongo/db/storage/in_memory/SConscript +++ b/src/mongo/db/storage/in_memory/SConscript @@ -6,7 +6,7 @@ env.Library( 'in_memory_record_store.cpp' ], LIBDEPS= [ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/storage/oplog_hack', '$BUILD_DIR/mongo/util/foundation', ] @@ -21,7 +21,7 @@ env.Library( ], LIBDEPS= [ 'in_memory_record_store', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/index/index_descriptor', diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript index 2e1b78fc748..15635a09912 100644 --- a/src/mongo/db/storage/kv/SConscript +++ b/src/mongo/db/storage/kv/SConscript @@ -9,6 +9,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/index/index_descriptor', + '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry', ] ) @@ -17,15 +18,23 @@ env.Library( env.Library( target='kv_database_catalog_entry_core', source=['kv_database_catalog_entry.cpp'], - LIBDEPS=[] - ) + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry', + '$BUILD_DIR/mongo/db/storage/kv/kv_engine_core', + ], +) # Should not be referenced outside this SConscript file. env.Library( target='kv_storage_engine', source=['kv_storage_engine.cpp'], - LIBDEPS=[] - ) + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/storage/kv/kv_engine_core', + 'kv_database_catalog_entry_core', + ], +) # KVDatabaseCatalogEntry::getIndex() depends on index access methods # in $BUILD_DIR/mongo/serveronly. @@ -62,6 +71,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/unittest/unittest', 'kv_engine_core', ] ) diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript index 841e8f9ce48..d12321d6e15 100644 --- a/src/mongo/db/storage/mmap_v1/SConscript +++ b/src/mongo/db/storage/mmap_v1/SConscript @@ -36,6 +36,7 @@ env.Library( 'file_allocator', 'logfile', 'compress', + '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/storage/paths', ] ) @@ -50,6 +51,7 @@ compressEnv.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/storage/paths', + '$BUILD_DIR/third_party/shim_snappy', ], ) @@ -60,7 +62,7 @@ env.Library( 'extent_manager.cpp', ], LIBDEPS= [ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation', ] ) @@ -72,6 +74,9 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/storage/paths', + '$BUILD_DIR/mongo/util/fail_point', + '$BUILD_DIR/mongo/util/foundation', + '$BUILD_DIR/mongo/util/processinfo', ], ) @@ -82,6 +87,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/storage/paths', + 'mmap', ], ) @@ -94,6 +100,7 @@ env.Library( LIBDEPS=[ 'file_allocator', '$BUILD_DIR/mongo/util/foundation', + '$BUILD_DIR/mongo/util/progress_meter', ], ) @@ -121,6 +128,7 @@ env.Library( source=['record_store_v1_test_help.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/unittest/unittest', 'record_store_v1' ] ) @@ -130,6 +138,9 @@ env.Library( source=['record_access_tracker.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/net/network', + '$BUILD_DIR/mongo/util/processinfo', ] ) @@ -196,8 +207,9 @@ env.Library( 'btree/key.cpp' ], LIBDEPS= [ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/service_context', + 'record_store_v1', ] ) diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 8247ea0ddde..92f8f59258d 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -22,11 +22,12 @@ if wiredtiger: 'wiredtiger_util.cpp', ], LIBDEPS= [ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', '$BUILD_DIR/mongo/db/index/index_descriptor', + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/storage/index_entry_comparison', '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/mongo/db/storage/oplog_hack', diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index ec7ef40d575..b87e4f5672c 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -9,6 +9,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/util/options_parser/options_parser_init', + '$BUILD_DIR/mongo/unittest/unittest', ], ) @@ -110,7 +111,6 @@ dbtest = env.Program( "$BUILD_DIR/mongo/s/cluster_ops_impl", "$BUILD_DIR/mongo/db/serveronly", "$BUILD_DIR/mongo/util/concurrency/rwlock", - "$BUILD_DIR/mongo/util/signal_handlers_synchronous", "mocklib", "testframework", ], diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript index 38f4a6dc9c3..2339743ffa1 100644 --- a/src/mongo/executor/SConscript +++ b/src/mongo/executor/SConscript @@ -36,7 +36,11 @@ env.Library('network_interface_mock', 'thread_pool_mock.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/rpc/metadata', + '$BUILD_DIR/mongo/util/net/network', 'network_interface', + 'task_executor_interface', ]) env.Library(target='network_test_env', @@ -82,6 +86,7 @@ env.Library( 'task_executor_test_fixture.cpp' ], LIBDEPS=[ + '$BUILD_DIR/mongo/unittest/unittest', 'network_interface_mock', 'task_executor_interface', ] diff --git a/src/mongo/logger/SConscript b/src/mongo/logger/SConscript index c3ac2279fb7..6d3a61b3cac 100644 --- a/src/mongo/logger/SConscript +++ b/src/mongo/logger/SConscript @@ -2,47 +2,28 @@ Import("env") -env.Library('logger', - [ - 'console.cpp', - 'log_manager.cpp', - 'log_severity.cpp', - 'log_component.cpp', - 'log_component_settings.cpp', - 'logger.cpp', - 'logstream_builder.cpp', - 'message_event_utf8_encoder.cpp', - 'message_log_domain.cpp', - 'component_message_log_domain.cpp', - 'ramlog.cpp', - 'rotatable_file_manager.cpp', - 'rotatable_file_writer.cpp', - ], - LIBDEPS=['$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/util/concurrency/thread_name']) - env.Library('parse_log_component_settings', ['parse_log_component_settings.cpp'], - LIBDEPS=['logger', '$BUILD_DIR/mongo/bson/bson']) + LIBDEPS=['$BUILD_DIR/mongo/base',]) # writes multi-byte sequences to console # to support manual testing of console stream under Windows # output should be visually verified under Command Prompt or Power Shell env.Program('console_test', 'console_test.cpp', - LIBDEPS=['logger', + LIBDEPS=['$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/unittest/unittest_crutch', '$BUILD_DIR/mongo/unittest/unittest_main']) env.CppUnitTest('log_test', 'log_test.cpp', - LIBDEPS=['logger', '$BUILD_DIR/mongo/util/foundation']) + LIBDEPS=['$BUILD_DIR/mongo/base']) env.CppUnitTest('log_function_test', 'log_function_test.cpp', - LIBDEPS=['logger', '$BUILD_DIR/mongo/util/foundation']) + LIBDEPS=['$BUILD_DIR/mongo/base']) env.CppUnitTest('rotatable_file_writer_test', 'rotatable_file_writer_test.cpp', - LIBDEPS=['logger']) + LIBDEPS=['$BUILD_DIR/mongo/base']) env.CppUnitTest(target='parse_log_component_settings_test', source='parse_log_component_settings_test.cpp', - LIBDEPS=['logger', 'parse_log_component_settings']) + LIBDEPS=['$BUILD_DIR/mongo/base', 'parse_log_component_settings']) diff --git a/src/mongo/platform/SConscript b/src/mongo/platform/SConscript index 865f5a62275..01509076777 100644 --- a/src/mongo/platform/SConscript +++ b/src/mongo/platform/SConscript @@ -5,14 +5,17 @@ Import("env") env.Library('platform', [ 'posix_fadvise.cpp', 'process_id.cpp', - 'random.cpp', "shared_library.cpp", "shared_library_${TARGET_OS_FAMILY}.cpp", 'strcasestr.cpp', - ]) + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ] +) env.CppUnitTest('atomic_word_test', 'atomic_word_test.cpp') env.CppUnitTest('bits_test', 'bits_test.cpp') env.CppUnitTest('endian_test', 'endian_test.cpp') env.CppUnitTest('process_id_test', 'process_id_test.cpp', LIBDEPS=['platform']) -env.CppUnitTest('random_test', 'random_test.cpp', LIBDEPS=['platform']) +env.CppUnitTest('random_test', 'random_test.cpp', LIBDEPS=['$BUILD_DIR/mongo/base']) diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript index 97da684dd2d..87132b6fed2 100644 --- a/src/mongo/rpc/SConscript +++ b/src/mongo/rpc/SConscript @@ -10,7 +10,7 @@ env.Library( 'get_status_from_command_result.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/foundation' ], ) @@ -22,6 +22,9 @@ env.Library( source=[ 'document_range.cpp' ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], ) env.Library( @@ -31,6 +34,10 @@ env.Library( source=[ 'protocol.cpp', ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/bson/util/bson_extract', + ], ) env.Library( @@ -76,6 +83,7 @@ env.Library( ], LIBDEPS=[ 'document_range', + 'metadata', '$BUILD_DIR/mongo/util/net/network', ], ) @@ -105,6 +113,7 @@ env.Library( ], LIBDEPS=[ 'document_range', + 'metadata', '$BUILD_DIR/mongo/util/net/network', ], ) diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 47d58ee02e6..6f922cc48a9 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -52,7 +52,11 @@ env.CppUnitTest( 'chunk_version_test.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/client/clientdriver', '$BUILD_DIR/mongo/db/common', + '$BUILD_DIR/mongo/db/range_arithmetic', + 'catalog/catalog_types', ] ) @@ -88,8 +92,8 @@ env.Library( 'write_ops/write_error_detail.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/common', ], ) @@ -123,7 +127,7 @@ env.Library( 'write_ops/batch_write_exec.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/clientdriver', 'batch_write_types', '$BUILD_DIR/mongo/util/concurrency/synchronization' @@ -152,7 +156,7 @@ env.Library( 'write_ops/batch_downconvert.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', # for Message '$BUILD_DIR/mongo/db/lasterror', 'cluster_ops', @@ -188,7 +192,7 @@ env.Library( 'dbclient_shard_resolver.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', 'cluster_ops', 'cluster_write_op_conversion', 'client/sharding_client', diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript index db2fed22e2e..170f22d1727 100644 --- a/src/mongo/s/catalog/SConscript +++ b/src/mongo/s/catalog/SConscript @@ -27,8 +27,7 @@ env.Library( ], LIBDEPS=[ 'mongo_version_range', - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/common', ] @@ -40,8 +39,7 @@ env.Library( 'mongo_version_range.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ] ) @@ -52,8 +50,7 @@ env.Library( 'catalog_manager.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/s/batch_write_types', '$BUILD_DIR/mongo/s/catalog/catalog_types', @@ -100,7 +97,7 @@ env.Library( 'dist_lock_ping_info.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', + '$BUILD_DIR/mongo/base', ], ) @@ -111,6 +108,7 @@ env.Library( ], LIBDEPS=[ 'dist_lock_manager', + '$BUILD_DIR/mongo/unittest/unittest', ], ) @@ -130,7 +128,7 @@ env.Library( ], LIBDEPS=[ 'catalog_types', - '$BUILD_DIR/mongo/base/base', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/read_preference', '$BUILD_DIR/mongo/client/remote_command_targeter', '$BUILD_DIR/mongo/db/common', @@ -164,8 +162,8 @@ env.Library( 'dist_lock_catalog_mock.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/unittest/unittest', 'catalog_types', 'dist_lock_catalog_interface', ] ) - diff --git a/src/mongo/s/catalog/replset/SConscript b/src/mongo/s/catalog/replset/SConscript index 4119f1cffd8..fe1d0e307c9 100644 --- a/src/mongo/s/catalog/replset/SConscript +++ b/src/mongo/s/catalog/replset/SConscript @@ -8,6 +8,8 @@ env.Library( 'replset_dist_lock_manager.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/s/catalog/catalog_types', '$BUILD_DIR/mongo/s/catalog/dist_lock_catalog_interface', '$BUILD_DIR/mongo/s/catalog/dist_lock_manager' ], diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript index 9f5323f53a7..08847e9e8c1 100644 --- a/src/mongo/s/commands/SConscript +++ b/src/mongo/s/commands/SConscript @@ -9,7 +9,7 @@ env.Library( 'cluster_get_shard_map_cmd.cpp', ], LIBDEPS=[ - + '$BUILD_DIR/mongo/s/client/sharding_client', ] ) diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript index 89ab61a04f3..ce636c78c7e 100644 --- a/src/mongo/s/query/SConscript +++ b/src/mongo/s/query/SConscript @@ -8,6 +8,7 @@ env.Library( "cluster_find.cpp", ], LIBDEPS=[ + "$BUILD_DIR/mongo/s/coreshard", "cluster_client_cursor", ], ) diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript index f3c3d9a05fd..f2e51237543 100644 --- a/src/mongo/scripting/SConscript +++ b/src/mongo/scripting/SConscript @@ -15,7 +15,11 @@ env.Library( 'utils.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/client/clientdriver', '$BUILD_DIR/mongo/shell/mongojs', + '$BUILD_DIR/mongo/util/foundation', + '$BUILD_DIR/mongo/util/md5', ], ) @@ -25,7 +29,7 @@ env.Library( "bson_template_evaluator.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) diff --git a/src/mongo/tools/SConscript b/src/mongo/tools/SConscript index 47978407466..537fad79ed7 100644 --- a/src/mongo/tools/SConscript +++ b/src/mongo/tools/SConscript @@ -14,7 +14,6 @@ mongobridge = env.Program( "$BUILD_DIR/mongo/util/net/network", "$BUILD_DIR/mongo/util/ntservice_mock", "$BUILD_DIR/mongo/util/options_parser/options_parser_init", - "$BUILD_DIR/mongo/util/signal_handlers_synchronous", ], ) diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript index 9815734cc9f..e393f022ca5 100644 --- a/src/mongo/unittest/SConscript +++ b/src/mongo/unittest/SConscript @@ -16,11 +16,10 @@ env.Library(target="unittest", env.Library("unittest_main", ['unittest_main.cpp'], LIBDEPS=[ 'unittest', - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/util/signal_handlers_synchronous', + '$BUILD_DIR/mongo/base', ]) -env.Library("unittest_crutch", ['crutch.cpp']) +env.Library("unittest_crutch", ['crutch.cpp'], LIBDEPS=['$BUILD_DIR/mongo/base']) env.CppUnitTest('unittest_test', 'unittest_test.cpp') @@ -33,5 +32,6 @@ env.Library( 'barrier.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', ], ) diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index a5221d2867f..3e382a0b564 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -33,8 +33,10 @@ debuggerEnv.Library( source=[ 'debugger.cpp', ], - LIBDEPS=[] - ) + LIBDEPS=[ + # NOTE: You *must not* add any library dependencies to the debugger library + ], +) env.Library( target='decorable', @@ -61,7 +63,8 @@ env.Library( 'progress_meter.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/foundation', ], ) @@ -99,26 +102,15 @@ env.Library( source=[ "startup_test.cpp", "touch_pages.cpp", - 'assert_util.cpp', - 'exception_filter_win32.cpp', 'file.cpp', - 'log.cpp', 'platform_init.cpp', - 'static_observer.cpp', - 'system_tick_source.cpp', - 'text.cpp', 'thread_safe_string.cpp', - 'time_support.cpp', 'timer.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/logger/logger', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/platform/platform', - '$BUILD_DIR/mongo/util/stacktrace', '$BUILD_DIR/mongo/util/concurrency/synchronization', - '$BUILD_DIR/mongo/util/concurrency/thread_name', - '$BUILD_DIR/mongo/util/debugger', '$BUILD_DIR/third_party/shim_allocator', '$BUILD_DIR/third_party/shim_boost', '$BUILD_DIR/third_party/shim_tz', @@ -152,22 +144,13 @@ env.CppUnitTest( ], ) -env.Library( - target='stringutils', - source=[ - 'base64.cpp', - 'hex.cpp', - 'stringutils.cpp', - ], -) - env.CppUnitTest( target="stringutils_test", source=[ "stringutils_test.cpp", ], LIBDEPS=[ - "stringutils", + "$BUILD_DIR/mongo/base", ], ) @@ -178,8 +161,9 @@ env.Library( "processinfo_${TARGET_OS}.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/bson/bson", - "foundation", + "$BUILD_DIR/mongo/base", + "$BUILD_DIR/mongo/platform/platform", + "$BUILD_DIR/mongo/util/foundation", ], ) @@ -201,8 +185,7 @@ env.Library( "fail_point_service.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/bson/bson", - "foundation", + "$BUILD_DIR/mongo/base", ], ) @@ -222,7 +205,9 @@ env.Library( "background.cpp", ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', 'concurrency/spin_lock', + 'foundation', ], ) @@ -261,7 +246,9 @@ if get_option('allocator') == 'tcmalloc': 'tcmalloc_set_parameter.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/coredb', '$BUILD_DIR/mongo/db/server_parameters', + '$BUILD_DIR/mongo/util/net/network', ], LIBDEPS_DEPENDENTS=[ '$BUILD_DIR/mongo/${PROGPREFIX}mongod${PROGSUFFIX}', @@ -315,19 +302,6 @@ env.Library( ], ) -env.Library( - target='stacktrace', - source=[ - 'stacktrace_${TARGET_OS_FAMILY}.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/mongo/bson/bson', - '$BUILD_DIR/mongo/version', - 'stringutils', - ], -) - quick_exit_env = env.Clone() if has_option('gcov'): quick_exit_env.Append( @@ -335,23 +309,15 @@ if has_option('gcov'): 'MONGO_GCOV', ], ) + quick_exit_env.Library( target='quick_exit', source=[ 'quick_exit.cpp', ], -) - -env.Library( - target="signal_handlers_synchronous", - source=[ - 'allocator.cpp', - 'signal_handlers_synchronous.cpp', - ], LIBDEPS=[ - "foundation", - "stacktrace", - ], + # NOTE: You *must not* add any library dependencies to the quick_exit library + ] ) if not env.TargetOSIs('windows'): @@ -361,7 +327,7 @@ if not env.TargetOSIs('windows'): 'signal_handlers_synchronous_test.cpp', ], LIBDEPS=[ - 'signal_handlers_synchronous', + '$BUILD_DIR/mongo/base', ], ) @@ -373,8 +339,9 @@ env.Library( ], LIBDEPS=[ "foundation", - "signal_handlers_synchronous", + "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/service_context", + "$BUILD_DIR/mongo/db/server_options_core", ], ) @@ -394,7 +361,7 @@ env.Library( 'safe_num.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', ], ) @@ -404,7 +371,7 @@ env.CppUnitTest( 'safe_num_test.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', 'safe_num', ], ) @@ -415,7 +382,7 @@ env.CppUnitTest( 'string_map_test.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/bson', + '$BUILD_DIR/mongo/base', 'foundation', ], ) @@ -426,5 +393,6 @@ env.Library( 'password.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', ], ) diff --git a/src/mongo/util/cmdline_utils/SConscript b/src/mongo/util/cmdline_utils/SConscript index 1309f693195..8aa54db18c6 100644 --- a/src/mongo/util/cmdline_utils/SConscript +++ b/src/mongo/util/cmdline_utils/SConscript @@ -3,7 +3,7 @@ Import("env") env.Library('cmdline_utils', ['censor_cmdline.cpp'], - LIBDEPS=['$BUILD_DIR/mongo/bson/bson']) + LIBDEPS=['$BUILD_DIR/mongo/base']) env.CppUnitTest('censor_cmdline_test', 'censor_cmdline_test.cpp', diff --git a/src/mongo/util/concurrency/SConscript b/src/mongo/util/concurrency/SConscript index 0dbc9c232d9..c040a4c8bb2 100644 --- a/src/mongo/util/concurrency/SConscript +++ b/src/mongo/util/concurrency/SConscript @@ -2,11 +2,6 @@ Import("env") -env.Library('thread_name', - ['thread_name.cpp'], - LIBDEPS=['$BUILD_DIR/mongo/base/base', - '$BUILD_DIR/third_party/shim_boost']) - env.Library( target='thread_pool', source=[ @@ -25,7 +20,7 @@ env.CppUnitTest( env.Library('ticketholder', ['ticketholder.cpp'], - LIBDEPS=['$BUILD_DIR/mongo/base/base', + LIBDEPS=['$BUILD_DIR/mongo/base', '$BUILD_DIR/third_party/shim_boost']) env.Library( @@ -33,6 +28,9 @@ env.Library( source=[ 'synchronization.cpp' ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], ) env.Library( @@ -59,6 +57,7 @@ env.Library( 'task.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/util/background_job', ], ) @@ -68,5 +67,6 @@ env.Library( 'rwlockimpl.cpp', ], LIBDEPS=[ + '$BUILD_DIR/third_party/shim_boost', ], ) diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index b72027e970d..64465a7a642 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -65,6 +65,7 @@ env.Library( "message_port_mock.cpp", ], LIBDEPS=[ + 'network', ], ) @@ -85,6 +86,7 @@ env.Library( "message_server_port.cpp", ], LIBDEPS=[ + 'network', '$BUILD_DIR/mongo/db/stats/counters', ], ) @@ -95,5 +97,6 @@ env.Library( 'miniwebserver.cpp', ], LIBDEPS=[ + 'network', ], ) diff --git a/src/mongo/util/options_parser/SConscript b/src/mongo/util/options_parser/SConscript index bdc543da685..099098408c0 100644 --- a/src/mongo/util/options_parser/SConscript +++ b/src/mongo/util/options_parser/SConscript @@ -14,7 +14,8 @@ optsEnv.Library('options_parser', ['environment.cpp', 'startup_option_init.cpp', 'startup_options.cpp', ], - LIBDEPS=['$BUILD_DIR/mongo/bson/bson', + LIBDEPS=['$BUILD_DIR/mongo/base', + '$BUILD_DIR/third_party/shim_boost', '$BUILD_DIR/third_party/shim_yaml', '$BUILD_DIR/third_party/shim_pcrecpp' ]) diff --git a/src/mongo/util/quick_exit.cpp b/src/mongo/util/quick_exit.cpp index 6c2104bc4f8..afdd268dc75 100644 --- a/src/mongo/util/quick_exit.cpp +++ b/src/mongo/util/quick_exit.cpp @@ -26,6 +26,8 @@ * it in the license file. */ +// NOTE: This file *must not* depend on any mongo symbols. + #include "mongo/platform/basic.h" #include "mongo/config.h" |