diff options
41 files changed, 232 insertions, 228 deletions
diff --git a/SConstruct b/SConstruct index cf4dc21742d..14cc7e23f0b 100644 --- a/SConstruct +++ b/SConstruct @@ -1476,6 +1476,10 @@ env['BUILDERS']['SharedArchive'] = SCons.Builder.Builder( src_suffix=env['BUILDERS']['SharedLibrary'].src_suffix, ) +# Teach builders how to build idl files +for builder in ['SharedObject', 'StaticObject']: + env['BUILDERS'][builder].add_src_builder("Idlc") + if link_model.startswith("dynamic"): if link_model == "dynamic" and get_option('experimental-visibility-support') == 'on': diff --git a/site_scons/site_tools/idl_tool.py b/site_scons/site_tools/idl_tool.py index c20e7ec34bd..8d214c5d148 100755 --- a/site_scons/site_tools/idl_tool.py +++ b/site_scons/site_tools/idl_tool.py @@ -89,7 +89,7 @@ idl_scanner = SCons.Scanner.Scanner(function=idl_scanner, skeys=[".idl"]) IDLCBuilder = SCons.Builder.Builder( action=IDLCAction, emitter=idlc_emitter, - srcsuffx=".idl", + src_suffix=".idl", suffix=".cpp", source_scanner=idl_scanner, ) diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript index 2b20792e5ed..3c1c33f58d4 100644 --- a/src/mongo/client/SConscript +++ b/src/mongo/client/SConscript @@ -32,8 +32,8 @@ env.Library( ], source=[ 'read_preference.cpp', - env.Idlc('hedging_mode.idl')[0], - env.Idlc('read_preference.idl')[0], + 'hedging_mode.idl', + 'read_preference.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/bson/util/bson_extract', @@ -48,7 +48,7 @@ if get_option('ssl') == 'on': 'sasl_aws_common', ], source=[ - env.Idlc('sasl_aws_protocol_common.idl')[0], + 'sasl_aws_protocol_common.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -67,7 +67,7 @@ if get_option('ssl') == 'on': ], source=[ 'sasl_aws_client_protocol.cpp', - env.Idlc('sasl_aws_client_protocol.idl')[0], + 'sasl_aws_client_protocol.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -93,7 +93,7 @@ saslClientSource = [ if get_option('ssl') == 'on': saslClientSource.extend([ 'sasl_aws_client_conversation.cpp', - env.Idlc('sasl_aws_client_options.idl')[0], + 'sasl_aws_client_options.idl', ]) # Add in actual sasl dependencies if sasl is enabled, otherwise @@ -104,7 +104,7 @@ if env['MONGO_BUILD_SASL_CLIENT']: 'cyrus_sasl_client_session.cpp', 'sasl_sspi.cpp', 'sasl_sspi_options.cpp', - env.Idlc('sasl_sspi_options.idl')[0], + 'sasl_sspi_options.idl', ]) saslLibs.extend(['sasl2']) @@ -184,7 +184,7 @@ clientDriverEnv.Library( 'dbclient_base.cpp', 'dbclient_cursor.cpp', 'index_spec.cpp', - env.Idlc('client_api_version_parameters.idl')[0], + 'client_api_version_parameters.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/dbmessage', @@ -214,7 +214,7 @@ clientDriverEnv.Library( 'dbclient_connection.cpp', 'dbclient_rs.cpp', 'global_conn_pool.cpp', - env.Idlc('global_conn_pool.idl')[0], + 'global_conn_pool.idl', 'replica_set_change_notifier.cpp', 'replica_set_monitor.cpp', 'replica_set_monitor_manager.cpp', @@ -252,7 +252,7 @@ env.Library( target='replica_set_monitor_server_parameters', source=[ 'replica_set_monitor_server_parameters.cpp', - env.Idlc('replica_set_monitor_server_parameters.idl')[0], + 'replica_set_monitor_server_parameters.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', diff --git a/src/mongo/client/sdam/SConscript b/src/mongo/client/sdam/SConscript index aaefcf028ca..edc6b44bcd2 100644 --- a/src/mongo/client/sdam/SConscript +++ b/src/mongo/client/sdam/SConscript @@ -7,7 +7,7 @@ env = env.Clone() env.Library( target='sdam_configuration_parameters', source=[ - env.Idlc('sdam_configuration_parameters.idl')[0], + 'sdam_configuration_parameters.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -74,7 +74,7 @@ env.Library( target='json_test', source=[ 'json_test_arg_parser.cpp', - env.Idlc('json_test_runner_cli_options.idl')[0], + 'json_test_runner_cli_options.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 5396676a42d..c2e5b0bd567 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -264,7 +264,7 @@ env.Library( target="server_options", source=[ "server_options_helpers.cpp", - env.Idlc('server_options_helpers.idl')[0], + 'server_options_helpers.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -282,7 +282,7 @@ if env.TargetOSIs('windows'): env.Library( target='windows_options', source=[ - env.Idlc('windows_options.idl')[0], + 'windows_options.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/options_parser/options_parser', @@ -293,11 +293,11 @@ env.Library( target='server_options_base', source=[ 'server_options_base.cpp', - env.Idlc('cluster_auth_mode_option.idl')[0], - env.Idlc('keyfile_option.idl')[0], - env.Idlc('server_options_base.idl')[0], - env.Idlc('server_options_general.idl')[0], - env.Idlc('server_options_nongeneral.idl')[0], + 'cluster_auth_mode_option.idl', + 'keyfile_option.idl', + 'server_options_base.idl', + 'server_options_general.idl', + 'server_options_nongeneral.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -349,7 +349,7 @@ env.Library( target="serverinit", source=[ "initialize_server_global_state.cpp", - env.Idlc("initialize_server_global_state.idl")[0], + "initialize_server_global_state.idl", "server_options_init.cpp", ], LIBDEPS_PRIVATE=[ @@ -373,11 +373,11 @@ env.Library( target="mongod_options", source=[ "mongod_options.cpp", - env.Idlc('mongod_options_general.idl')[0], - env.Idlc('mongod_options_legacy.idl')[0], - env.Idlc('mongod_options_replication.idl')[0], - env.Idlc('mongod_options_sharding.idl')[0], - env.Idlc('mongod_options_storage.idl')[0], + 'mongod_options_general.idl', + 'mongod_options_legacy.idl', + 'mongod_options_replication.idl', + 'mongod_options_sharding.idl', + 'mongod_options_storage.idl', ], LIBDEPS=[ 'repl/repl_settings', @@ -396,7 +396,7 @@ env.Library( target="read_write_concern_provenance", source=[ "read_write_concern_provenance.cpp", - env.Idlc('read_write_concern_provenance_base.idl')[0], + 'read_write_concern_provenance_base.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -422,7 +422,7 @@ env.Library( target='read_write_concern_defaults', source=[ 'read_write_concern_defaults.cpp', - env.Idlc('read_write_concern_defaults.idl')[0], + 'read_write_concern_defaults.idl', ], LIBDEPS=[ 'repl/read_concern_args', @@ -530,7 +530,7 @@ env.Library( target='mirror_maestro', source=[ 'mirror_maestro.cpp', - env.Idlc('mirror_maestro.idl')[0], + 'mirror_maestro.idl', 'mirroring_sampler.cpp', ], LIBDEPS=[ @@ -673,9 +673,9 @@ env.Library( 'transaction_history_iterator.cpp', 'transaction_metrics_observer.cpp', 'transaction_participant.cpp', - env.Idlc('session_txn_record.idl')[0], - env.Idlc('transaction_participant.idl')[0], - env.Idlc('transactions_stats.idl')[0], + 'session_txn_record.idl', + 'transaction_participant.idl', + 'transactions_stats.idl', ], LIBDEPS=[ 'commands/txn_cmd_request', @@ -890,7 +890,7 @@ env.Library( env.Library( target='resumable_index_builds_idl', source=[ - env.Idlc('resumable_index_builds.idl')[0], + 'resumable_index_builds.idl', ], LIBDEPS=[ "$BUILD_DIR/mongo/base", @@ -981,7 +981,7 @@ env.Library( target="cloner", source=[ "cloner.cpp", - env.Idlc("cloner.idl")[0], + "cloner.idl", ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1053,7 +1053,7 @@ env.Library( target="read_concern_d_impl", source=[ "read_concern_mongod.cpp", - env.Idlc('read_concern_mongod.idl')[0], + 'read_concern_mongod.idl', ], LIBDEPS_PRIVATE=[ "$BUILD_DIR/mongo/idl/server_parameter", @@ -1109,7 +1109,7 @@ env.Library( target="ttl_d", source=[ "ttl.cpp", - env.Idlc("ttl.idl")[0], + "ttl.idl", ], LIBDEPS=[ 'db_raii', @@ -1289,7 +1289,7 @@ env.Library( target='logical_session_id', source=[ 'logical_session_id.cpp', - env.Idlc('logical_session_id.idl')[0], + 'logical_session_id.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1375,7 +1375,7 @@ env.Library( target='sessions_collection', source=[ 'sessions_collection.cpp', - env.Idlc('create_indexes.idl')[0], + 'create_indexes.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1430,8 +1430,8 @@ env.Library( target='logical_session_cache', source=[ 'logical_session_cache.cpp', - env.Idlc('logical_session_cache_stats.idl')[0], - env.Idlc('logical_session_cache.idl')[0], + 'logical_session_cache_stats.idl', + 'logical_session_cache.idl', ], LIBDEPS=[ 'logical_session_id', @@ -1490,7 +1490,7 @@ env.Library( target='api_parameters', source=[ 'api_parameters.cpp', - env.Idlc('api_parameters.idl')[0], + 'api_parameters.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/idl_parser', @@ -1527,7 +1527,7 @@ env.Library( 'kill_sessions.cpp', 'kill_sessions_common.cpp', 'session_killer.cpp', - env.Idlc('kill_sessions.idl')[0], + 'kill_sessions.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1585,7 +1585,7 @@ env.Library( env.Library( target='snapshot_window_options', source=[ - env.Idlc('snapshot_window_options.idl')[0], + 'snapshot_window_options.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -1672,9 +1672,9 @@ env.Library( 'keys_collection_manager.cpp', 'logical_time_validator.cpp', 'vector_clock.cpp', - env.Idlc('keys_collection_manager.idl')[0], - env.Idlc('logical_clock.idl')[0], - env.Idlc('vector_clock_document.idl')[0], + 'keys_collection_manager.idl', + 'logical_clock.idl', + 'vector_clock_document.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/transport/transport_layer_common', @@ -1839,7 +1839,7 @@ env.Library( target='cursor_server_params', source=[ 'cursor_server_params.cpp', - env.Idlc('cursor_server_params.idl')[0], + 'cursor_server_params.idl', ], LIBDEPS_PRIVATE=[ "$BUILD_DIR/mongo/idl/server_parameter", @@ -1849,7 +1849,7 @@ env.Library( env.Library( target='generic_cursor', source=[ - env.Idlc('generic_cursor.idl')[0], + 'generic_cursor.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/repl/optime', @@ -1890,8 +1890,8 @@ env.Library( 'ops/insert.cpp', 'ops/update.cpp', 'ops/write_ops_retryability.cpp', - env.Idlc('ops/single_write_result.idl')[0], - env.Idlc('ops/delete_request.idl')[0], + 'ops/single_write_result.idl', + 'ops/delete_request.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1912,7 +1912,7 @@ env.Library( source=[ 'traffic_recorder.cpp', 'traffic_recorder_validators.cpp', - env.Idlc('traffic_recorder.idl')[0], + 'traffic_recorder.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -2270,7 +2270,7 @@ envWithAsio.CppUnitTest( 'vector_clock_test.cpp', 'write_concern_options_test.cpp', 'error_labels_test.cpp', - env.Idlc('commands_test_example.idl')[0], + 'commands_test_example.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index eaab17c1073..01817351d97 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -68,7 +68,7 @@ env.Library( env.Library( target='auth_impl_internal_local', source=[ - env.Idlc('auth_types.idl')[0], + 'auth_types.idl', 'authz_manager_external_state_local.cpp', ], LIBDEPS=[ @@ -111,7 +111,7 @@ env.Library( env.Library( target='auth_options', source=[ - env.Idlc("auth_options.idl")[0], + "auth_options.idl", ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -126,7 +126,7 @@ env.Library( 'authz_manager_external_state.cpp', 'authz_session_external_state.cpp', 'user_set.cpp', - env.Idlc('authorization_manager_impl_parameters.idl')[0], + 'authorization_manager_impl_parameters.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -185,7 +185,7 @@ env.Library( target='authorization_manager_global', source=[ 'authorization_manager_global.cpp', - env.Idlc('authorization_manager_global_parameters.idl')[0], + 'authorization_manager_global_parameters.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -223,7 +223,7 @@ env.Library( source=[ 'authz_session_external_state_server_common.cpp', 'sasl_commands.cpp', - env.Idlc('enable_localhost_auth_bypass_parameter.idl')[0], + 'enable_localhost_auth_bypass_parameter.idl', ], LIBDEPS=[ 'auth', @@ -273,7 +273,7 @@ env.Library( target='sasl_options_init', source=[ 'sasl_options_init.cpp', - env.Idlc('sasl_options.idl')[0], + 'sasl_options.idl', ], LIBDEPS=[ 'sasl_options' @@ -331,7 +331,7 @@ env.Library( 'authz_manager_external_state_s.cpp', 'authz_session_external_state_s.cpp', 'user_cache_invalidator_job.cpp', - env.Idlc('user_cache_invalidator_job_parameters.idl')[0], + 'user_cache_invalidator_job_parameters.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/s/catalog/dist_lock_manager', @@ -363,7 +363,7 @@ env.Library( target='address_restriction', source=[ 'address_restriction.cpp', - env.Idlc('address_restriction.idl')[0], + 'address_restriction.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index e9b90a65aa7..f608ee8c1f8 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -64,7 +64,7 @@ env.Library( env.Library( target='commit_quorum_idl', source=[ - env.Idlc('commit_quorum.idl')[0], + 'commit_quorum.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -76,7 +76,7 @@ env.Library( env.Library( target='validate_idl', source=[ - env.Idlc('validate.idl')[0], + 'validate.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -86,7 +86,7 @@ env.Library( env.Library( target='index_build_entry_idl', source=[ - env.Idlc('index_build_entry.idl')[0], + 'index_build_entry.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/util/net/network', @@ -98,7 +98,7 @@ env.Library( target='health_log', source=[ "health_log.cpp", - env.Idlc("health_log.idl")[0], + "health_log.idl", ], LIBDEPS=[ "$BUILD_DIR/mongo/base", @@ -230,7 +230,7 @@ env.Library( target='multi_index_block', source=[ 'multi_index_block.cpp', - env.Idlc('multi_index_block.idl')[0], + 'multi_index_block.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -470,7 +470,7 @@ env.Library( env.Library( target='import_collection_oplog_entry', source=[ - env.Idlc('import_collection_oplog_entry.idl')[0], + 'import_collection_oplog_entry.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index d451c3cd4f3..8103d17b935 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -9,7 +9,7 @@ env.Library( target="test_commands_enabled", source=[ "test_commands_enabled.cpp", - env.Idlc('test_commands_enabled.idl')[0], + 'test_commands_enabled.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -83,7 +83,7 @@ env.Library( target="feature_compatibility_parsers", source=[ "feature_compatibility_version_parser.cpp", - env.Idlc('feature_compatibility_version_document.idl')[0], + 'feature_compatibility_version_document.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -114,9 +114,9 @@ env.Library( 'rename_collection_common.cpp', 'start_session_command.cpp', 'update_metrics.cpp', - env.Idlc('parameters.idl')[0], - env.Idlc('sessions_commands.idl')[0], - env.Idlc('generic.idl')[0], + 'parameters.idl', + 'sessions_commands.idl', + 'generic.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/bson/mutable/mutable_bson', @@ -155,10 +155,10 @@ env.Library( 'test_deprecation_command.cpp', 'traffic_recording_cmds.cpp', 'user_management_commands_common.cpp', - env.Idlc('drop_connections.idl')[0], - env.Idlc('rotate_certificates.idl')[0], - env.Idlc('rwc_defaults_commands.idl')[0], - env.Idlc('user_management_commands.idl')[0], + 'drop_connections.idl', + 'rotate_certificates.idl', + 'rwc_defaults_commands.idl', + 'user_management_commands.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/read_write_concern_defaults', @@ -229,7 +229,7 @@ env.Library( target="mongod_fcv", source=[ "feature_compatibility_version.cpp", - env.Idlc('feature_compatibility_version.idl')[0], + 'feature_compatibility_version.idl', ], LIBDEPS=[ 'feature_compatibility_parsers', @@ -256,7 +256,7 @@ env.Library( env.Library( target='list_databases_command', source=[ - env.Idlc('list_databases.idl')[0], + 'list_databases.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -280,7 +280,7 @@ env.Library( "get_last_error.cpp", "getmore_cmd.cpp", "http_client.cpp", - env.Idlc('http_client.idl')[0], + 'http_client.idl', "index_filter_commands.cpp", "kill_op.cpp", "killcursors_cmd.cpp", @@ -298,7 +298,7 @@ env.Library( "validate.cpp", "whats_my_sni_command.cpp", "write_commands/write_commands.cpp", - env.Idlc('create.idl')[0], + 'create.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -359,7 +359,7 @@ env.Library( env.Library( target='set_index_commit_quorum_idl', source=[ - env.Idlc('set_index_commit_quorum.idl')[0], + 'set_index_commit_quorum.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/commit_quorum_options', @@ -371,7 +371,7 @@ env.Library( env.Library( target='rename_collection_idl', source=[ - env.Idlc('rename_collection.idl')[0], + 'rename_collection.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/idl_parser', @@ -381,7 +381,7 @@ env.Library( env.Library( target='set_feature_compatibility_version_idl', source=[ - env.Idlc('set_feature_compatibility_version.idl')[0], + 'set_feature_compatibility_version.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/idl_parser', @@ -393,7 +393,7 @@ env.Library( target='shutdown_idl', source=[ 'shutdown.cpp', - env.Idlc('shutdown.idl')[0], + 'shutdown.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/idl_parser', @@ -420,7 +420,7 @@ env.Library( "oplog_note.cpp", 'read_write_concern_defaults_server_status.cpp', "resize_oplog.cpp", - env.Idlc("resize_oplog.idl")[0], + "resize_oplog.idl", 'rwc_defaults_commands.cpp', "set_feature_compatibility_version_command.cpp", "set_index_commit_quorum_command.cpp", @@ -433,8 +433,8 @@ env.Library( "txn_cmds.cpp", "user_management_commands.cpp", "vote_commit_index_build_command.cpp", - env.Idlc('internal_rename_if_options_and_indexes_match.idl')[0], - env.Idlc('vote_commit_index_build.idl')[0], + 'internal_rename_if_options_and_indexes_match.idl', + 'vote_commit_index_build.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -492,7 +492,7 @@ env.Library( source=[ 'killcursors_common.cpp', 'kill_op_cmd_base.cpp', - env.Idlc('kill_operations.idl')[0], + 'kill_operations.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/audit', @@ -525,7 +525,7 @@ env.Library( target='profile_common', source=[ 'profile_common.cpp', - env.Idlc('profile.idl')[0], + 'profile.idl', '$BUILD_DIR/mongo/db/profile_filter_impl.cpp', ], LIBDEPS=[ @@ -553,8 +553,8 @@ env.Library( env.Library( target='tenant_migration_cmds_request', source=[ - env.Idlc('tenant_migration_donor_cmds.idl')[0], - env.Idlc('tenant_migration_recipient_cmds.idl')[0], + 'tenant_migration_donor_cmds.idl', + 'tenant_migration_recipient_cmds.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -568,8 +568,8 @@ env.Library( env.Library( target='txn_cmd_request', source=[ - env.Idlc("txn_cmds.idl")[0], - env.Idlc("txn_two_phase_commit_cmds.idl")[0], + "txn_cmds.idl", + "txn_two_phase_commit_cmds.idl", ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -581,7 +581,7 @@ env.Library( target='map_reduce_parser', source=[ 'map_reduce_out_options.cpp', - env.Idlc('map_reduce.idl')[0], + 'map_reduce.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/write_concern_options', diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index e3a688ff6b6..892e7364cc8 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -24,7 +24,7 @@ env.Library( target='write_conflict_exception', source=[ 'write_conflict_exception.cpp', - env.Idlc('write_conflict_exception.idl')[0], + 'write_conflict_exception.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript index ba20544ff6e..e8ddf248a32 100644 --- a/src/mongo/db/free_mon/SConscript +++ b/src/mongo/db/free_mon/SConscript @@ -15,9 +15,9 @@ fmEnv.Library( 'free_mon_op_observer.cpp', 'free_mon_storage.cpp', 'free_mon_controller.cpp', - env.Idlc('free_mon_protocol.idl')[0], - env.Idlc('free_mon_commands.idl')[0], - env.Idlc('free_mon_storage.idl')[0], + 'free_mon_protocol.idl', + 'free_mon_commands.idl', + 'free_mon_storage.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -35,9 +35,9 @@ if free_monitoring == "on": source=[ 'free_mon_commands.cpp', 'free_mon_mongod.cpp', - env.Idlc('free_mon_mongod.idl')[0], + 'free_mon_mongod.idl', 'free_mon_options.cpp', - env.Idlc('free_mon_options.idl')[0], + 'free_mon_options.idl', 'free_mon_status.cpp', ], LIBDEPS=[ diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 2acb362fdb6..6635636940e 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -43,7 +43,7 @@ env.Library( target='ftdc_server', source=[ 'ftdc_server.cpp', - env.Idlc('ftdc_server.idl')[0], + 'ftdc_server.idl', 'ftdc_system_stats.cpp', 'ftdc_system_stats_${TARGET_OS}.cpp', ], diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index 21f71bb3ccb..8cad2992394 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -174,7 +174,7 @@ env.Library( target="index_build_interceptor", source=[ "index_build_interceptor.cpp", - env.Idlc('index_build_interceptor.idl')[0], + 'index_build_interceptor.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript index d72a2d7ff09..8938105deff 100644 --- a/src/mongo/db/matcher/SConscript +++ b/src/mongo/db/matcher/SConscript @@ -59,7 +59,7 @@ env.Library( 'schema/expression_internal_schema_xor.cpp', 'schema/json_pointer.cpp', 'schema/json_schema_parser.cpp', - env.Idlc('schema/encrypt_schema.idl')[0], + 'schema/encrypt_schema.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index 50dab62eaac..f1ab9615526 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -30,7 +30,7 @@ env.Library( target='write_ops_parsers', source=[ 'write_ops_parsers.cpp', - env.Idlc('write_ops.idl')[0], + 'write_ops.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index bb6e5006f0f..b1a29549b58 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -302,7 +302,7 @@ pipelineEnv.Library( env.Library( target='runtime_constants_idl', source=[ - env.Idlc('runtime_constants.idl')[0] + 'runtime_constants.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/idl_parser', @@ -312,14 +312,14 @@ env.Library( env.Library( target='document_sources_idl', source=[ - env.Idlc('document_source_change_stream.idl')[0], - env.Idlc('document_source_list_sessions.idl')[0], - env.Idlc('document_source_merge.idl')[0], - env.Idlc('document_source_merge_modes.idl')[0], - env.Idlc('document_source_replace_root.idl')[0], - env.Idlc('document_source_union_with.idl')[0], - env.Idlc('exchange_spec.idl')[0], - env.Idlc('value.idl')[0], + 'document_source_change_stream.idl', + 'document_source_list_sessions.idl', + 'document_source_merge.idl', + 'document_source_merge_modes.idl', + 'document_source_replace_root.idl', + 'document_source_union_with.idl', + 'exchange_spec.idl', + 'value.idl', 'document_source_merge_spec.cpp', 'resume_token.cpp' ], diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 1578a53f59b..769c1c30599 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -52,7 +52,7 @@ env.Library( "query_planner_common.cpp", "query_settings.cpp", "query_solution.cpp", - env.Idlc("expression_index_knobs.idl")[0], + "expression_index_knobs.idl", ], LIBDEPS=[ "$BUILD_DIR/mongo/base", @@ -89,7 +89,7 @@ env.Library( env.Library( target='distinct_command_idl', source=[ - env.Idlc('distinct_command.idl')[0], + 'distinct_command.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/idl_parser', @@ -153,8 +153,8 @@ env.Library( 'getmore_request.cpp', 'killcursors_response.cpp', 'view_response_formatter.cpp', - env.Idlc('count_command.idl')[0], - env.Idlc('kill_cursors.idl')[0], + 'count_command.idl', + 'kill_cursors.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -176,7 +176,7 @@ env.Library( source=[ "query_request.cpp", "tailable_mode.cpp", - env.Idlc("tailable_mode.idl")[0], + "tailable_mode.idl", ], LIBDEPS=[ "$BUILD_DIR/mongo/base", @@ -193,7 +193,7 @@ env.Library( env.Library( target="query_knobs", source=[ - env.Idlc('query_knobs.idl')[0] + 'query_knobs.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter' @@ -241,7 +241,7 @@ env.Library( target="hint_parser", source=[ "hint_parser.cpp", - env.Idlc('hint.idl')[0], + 'hint.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index e193ed4c5de..690a37d6edf 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -7,7 +7,7 @@ env = env.Clone() env.Library( target='repl_server_parameters', source=[ - env.Idlc('repl_server_parameters.idl')[0] + 'repl_server_parameters.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/read_preference', @@ -38,7 +38,7 @@ env.Library( 'oplog_entry_or_grouped_inserts.cpp', 'tenant_migration_decoration.cpp', 'transaction_oplog_application.cpp', - env.Idlc('apply_ops.idl')[0], + 'apply_ops.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -150,7 +150,7 @@ env.Library( target='repl_settings', source=[ 'repl_settings.cpp', - env.Idlc('repl_settings.idl')[0], + 'repl_settings.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -174,7 +174,7 @@ env.Library( source=[ 'dbcheck.cpp', "dbcheck_idl.cpp", - env.Idlc('dbcheck.idl')[0], + 'dbcheck.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -192,7 +192,7 @@ env.Library( env.Library( target='rollback_idl', source=[ - env.Idlc('rollback.idl')[0], + 'rollback.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -240,7 +240,7 @@ env.Library( env.Library( target='replication_consistency_markers_idl', source=[ - env.Idlc('replication_consistency_markers.idl')[0], + 'replication_consistency_markers.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -467,7 +467,7 @@ env.Library( target='rollback_impl', source=[ 'rollback_impl.cpp', - env.Idlc('rollback_impl.idl')[0], + 'rollback_impl.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/concurrency/lock_manager', @@ -492,7 +492,7 @@ env.Library( target='oplog_entry', source=[ 'oplog_entry.cpp', - env.Idlc('oplog_entry.idl')[0], + 'oplog_entry.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -510,7 +510,7 @@ env.Library( env.Library( target='optime_and_wall_time_base', source=[ - env.Idlc('optime_and_wall_time_base.idl')[0], + 'optime_and_wall_time_base.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -660,7 +660,7 @@ env.Library( source=[ 'heartbeat_response_action.cpp', 'topology_coordinator.cpp', - env.Idlc('topology_coordinator.idl')[0], + 'topology_coordinator.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/audit', @@ -688,7 +688,7 @@ env.Library( 'replication_coordinator_impl_elect_v1.cpp', 'replication_coordinator_impl_heartbeat.cpp', 'vote_requester.cpp', - env.Idlc('replication_coordinator_impl.idl')[0], + 'replication_coordinator_impl.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands/mongod_fcv', @@ -837,9 +837,9 @@ env.Library( 'repl_set_write_concern_mode_definitions.cpp', 'update_position_args.cpp', 'last_vote.cpp', - env.Idlc('member_config.idl')[0], - env.Idlc('repl_set_config.idl')[0], - env.Idlc('repl_set_config_params.idl')[0], + 'member_config.idl', + 'repl_set_config.idl', + 'repl_set_config_params.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -867,7 +867,7 @@ env.Library( 'repl_set_command.cpp', 'repl_set_get_status_cmd.cpp', 'repl_set_test_egress.cpp', - env.Idlc('repl_set_test_egress.idl')[0], + 'repl_set_test_egress.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1150,7 +1150,7 @@ env.Library( source=[ 'cloner_utils.cpp', 'database_cloner_common.cpp', - env.Idlc('database_cloner.idl')[0], + 'database_cloner.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1260,7 +1260,7 @@ env.Library( env.Library( target='tenant_migration_state_machine_idl', source=[ - env.Idlc('tenant_migration_state_machine.idl')[0], + 'tenant_migration_state_machine.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1654,7 +1654,7 @@ env.Library( target='replication_metrics', source=[ 'replication_metrics.cpp', - env.Idlc('replication_metrics.idl')[0], + 'replication_metrics.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1670,7 +1670,7 @@ env.Library( target='election_reason_counter', source=[ 'election_reason_counter.cpp', - env.Idlc('election_reason_counter.idl')[0], + 'election_reason_counter.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index c80135f9766..bca1a9f6290 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -32,7 +32,7 @@ env.Library( env.Library( target='sharding_runtime_d_params', source=[ - env.Idlc('sharding_runtime_d_params.idl')[0], + 'sharding_runtime_d_params.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -93,9 +93,9 @@ env.Library( 'split_chunk.cpp', 'split_vector.cpp', 'start_chunk_clone_request.cpp', - env.Idlc('migration_coordinator_document.idl')[0], - env.Idlc('range_deletion_task.idl')[0], - env.Idlc('resharding/resharding_oplog_applier_progress.idl')[0], + 'migration_coordinator_document.idl', + 'range_deletion_task.idl', + 'resharding/resharding_oplog_applier_progress.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/catalog/multi_index_block', @@ -141,10 +141,10 @@ env.Library( target='resharding_util', source=[ 'resharding_util.cpp', - env.Idlc('resharding/coordinator_document.idl')[0], - env.Idlc('resharding/donor_document.idl')[0], - env.Idlc('resharding/donor_oplog_id.idl')[0], - env.Idlc('resharding/recipient_document.idl')[0], + 'resharding/coordinator_document.idl', + 'resharding/donor_document.idl', + 'resharding/donor_oplog_id.idl', + 'resharding/recipient_document.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -211,8 +211,8 @@ env.Library( 'transaction_coordinator_util.cpp', 'transaction_coordinator_worker_curop_repository_mongod.cpp', 'transaction_coordinator.cpp', - env.Idlc('transaction_coordinator_document.idl')[0], - env.Idlc('transaction_coordinators_stats.idl')[0], + 'transaction_coordinator_document.idl', + 'transaction_coordinators_stats.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/server_status', @@ -243,7 +243,7 @@ env.Library( env.Library( target='type_shard_identity', source=[ - env.Idlc('add_shard_cmd.idl')[0], + 'add_shard_cmd.idl', 'type_shard_identity.cpp', ], LIBDEPS=[ diff --git a/src/mongo/db/sorter/SConscript b/src/mongo/db/sorter/SConscript index b3d6a25db0f..26084eca010 100644 --- a/src/mongo/db/sorter/SConscript +++ b/src/mongo/db/sorter/SConscript @@ -23,7 +23,7 @@ sorterEnv.CppUnitTest( env.Library( target='sorter_idl', source=[ - env.Idlc('sorter.idl')[0], + 'sorter.idl', ], LIBDEPS=[ "$BUILD_DIR/mongo/base", diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index 5b9d036e170..65545e1e408 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -57,8 +57,8 @@ env.Library( source=[ 'server_read_concern_metrics.cpp', 'server_write_concern_metrics.cpp', - env.Idlc('read_concern_stats.idl')[0], - env.Idlc('server_write_concern_metrics.idl')[0], + 'read_concern_stats.idl', + 'server_write_concern_metrics.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -76,7 +76,7 @@ env.Library( target='resource_consumption_metrics', source=[ 'resource_consumption_metrics.cpp', - env.Idlc('operation_resource_consumption.idl')[0], + 'operation_resource_consumption.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index c582d8f78a4..2b3a2703cb4 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -171,7 +171,7 @@ env.Library( target='storage_options', source=[ 'storage_options.cpp', - env.Idlc('storage_parameters.idl')[0], + 'storage_parameters.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -430,7 +430,7 @@ env.Library( env.Library( target='flow_control_parameters', source=[ - env.Idlc('flow_control_parameters.idl')[0], + 'flow_control_parameters.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -551,7 +551,7 @@ env.Library( env.Library( target='two_phase_index_build_knobs_idl', source=[ - env.Idlc('two_phase_index_build_knobs.idl')[0], + 'two_phase_index_build_knobs.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 1ac92a34380..3dad11475c2 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -54,7 +54,7 @@ if wiredtiger: 'wiredtiger_snapshot_manager.cpp', 'wiredtiger_size_storer.cpp', 'wiredtiger_util.cpp', - env.Idlc('wiredtiger_parameters.idl')[0], + 'wiredtiger_parameters.idl', ], LIBDEPS= [ '$BUILD_DIR/mongo/base', @@ -105,7 +105,7 @@ if wiredtiger: 'wiredtiger_init.cpp', 'wiredtiger_options_init.cpp', 'wiredtiger_server_status.cpp', - env.Idlc('wiredtiger_global_options.idl')[0], + 'wiredtiger_global_options.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/db_raii', @@ -181,7 +181,7 @@ if wiredtiger: wtEnv.Library( target='oplog_stone_parameters', source=[ - env.Idlc('oplog_stone_parameters.idl')[0], + 'oplog_stone_parameters.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/server_parameter', diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index ca6634cc36e..220a7c77f49 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -12,7 +12,7 @@ env.Library( target="framework_options", source=[ "framework_options.cpp", - env.Idlc("framework_options.idl")[0], + "framework_options.idl", ], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_options_core', diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index f64288444e7..c2161766407 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -71,7 +71,7 @@ env.Library( 'transaction_coordinator_factory_embedded.cpp', 'transaction_coordinator_worker_curop_repository_embedded.cpp', 'transaction_coordinator_curop_embedded.cpp', - env.Idlc('embedded_options.idl')[0], + 'embedded_options.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/embedded/mongo_embedded/SConscript b/src/mongo/embedded/mongo_embedded/SConscript index d34ab07094f..d17607555c5 100644 --- a/src/mongo/embedded/mongo_embedded/SConscript +++ b/src/mongo/embedded/mongo_embedded/SConscript @@ -87,7 +87,7 @@ if get_option('link-model') != 'dynamic-sdk': target='mongo_embedded_test', source=[ 'mongo_embedded_test.cpp', - env.Idlc('mongo_embedded_test.idl')[0], + 'mongo_embedded_test.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/embedded/mongoc_embedded/SConscript b/src/mongo/embedded/mongoc_embedded/SConscript index 8d787ec2177..3ec247a8b45 100644 --- a/src/mongo/embedded/mongoc_embedded/SConscript +++ b/src/mongo/embedded/mongoc_embedded/SConscript @@ -86,7 +86,7 @@ if get_option('link-model') != 'dynamic-sdk': target='mongoc_embedded_test', source=[ 'mongoc_embedded_test.cpp', - env.Idlc('mongoc_embedded_test.idl')[0], + 'mongoc_embedded_test.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript index fb7041b3652..600547a89b7 100644 --- a/src/mongo/executor/SConscript +++ b/src/mongo/executor/SConscript @@ -256,7 +256,7 @@ env.Library( target='task_executor_pool', source=[ 'task_executor_pool.cpp', - env.Idlc("task_executor_pool_parameters.idl")[0], + "task_executor_pool_parameters.idl", ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/server_parameter', diff --git a/src/mongo/idl/SConscript b/src/mongo/idl/SConscript index 99cad300ea8..92f99142b64 100644 --- a/src/mongo/idl/SConscript +++ b/src/mongo/idl/SConscript @@ -52,13 +52,13 @@ env.CppUnitTest( 'idl_test.cpp', 'server_parameter_specialized_test.cpp', 'server_parameter_with_storage_test.cpp', - env.Idlc('config_option_no_init_test.idl')[0], - env.Idlc('config_option_test.idl')[0], - env.Idlc('feature_flag_test.idl')[0], - env.Idlc('server_parameter_specialized_test.idl')[0], - env.Idlc('server_parameter_with_storage_test.idl')[0], - env.Idlc('unittest.idl')[0], - env.Idlc('unittest_import.idl')[0], + 'config_option_no_init_test.idl', + 'config_option_test.idl', + 'feature_flag_test.idl', + 'server_parameter_specialized_test.idl', + 'server_parameter_with_storage_test.idl', + 'unittest.idl', + 'unittest_import.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript index aeec34c5414..43f089fa02a 100644 --- a/src/mongo/rpc/SConscript +++ b/src/mongo/rpc/SConscript @@ -56,7 +56,7 @@ env.Library( 'legacy_reply.cpp', 'legacy_reply_builder.cpp', 'reply_builder_interface.cpp', - env.Idlc('object_check.idl')[0], + 'object_check.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -95,7 +95,7 @@ env.Library( 'metadata/repl_set_metadata.cpp', 'metadata/oplog_query_metadata.cpp', 'metadata/tracking_metadata.cpp', - env.Idlc('topology_version.idl')[0], + 'topology_version.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -117,7 +117,7 @@ env.Library( ], source=[ 'metadata/impersonated_user_metadata.cpp', - env.Idlc('metadata/impersonated_user_metadata.idl')[0], + 'metadata/impersonated_user_metadata.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index c1ab8a0b0b2..a08d92d46c2 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -45,7 +45,7 @@ env.Library( 'transaction_router.cpp', 'router_transactions_metrics.cpp', 'session_catalog_router.cpp', - env.Idlc('router_transactions_stats.idl')[0], + 'router_transactions_stats.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands/txn_cmd_request', @@ -89,7 +89,7 @@ env.Library( source=[ 'sharding_initialization.cpp', 'sharding_task_executor_pool_controller.cpp', - env.Idlc('sharding_task_executor_pool.idl')[0], + 'sharding_task_executor_pool.idl', 'client/sharding_connection_hook.cpp', 'client/sharding_network_connection_hook.cpp', ], @@ -161,29 +161,29 @@ env.Library( 'shard_invalidated_for_targeting_exception.cpp', 'stale_exception.cpp', 'would_change_owning_shard_exception.cpp', - env.Idlc('catalog/type_chunk_base.idl')[0], - env.Idlc('catalog/type_shard_collection.idl')[0], - env.Idlc('chunk_version.idl')[0], - env.Idlc('database_version.idl')[0], - env.Idlc('mongod_and_mongos_server_parameters.idl')[0], - env.Idlc('request_types/balancer_collection_status.idl')[0], - env.Idlc('request_types/clone_catalog_data.idl')[0], - env.Idlc('request_types/clear_jumbo_flag.idl')[0], - env.Idlc('request_types/clone_collection_options_from_primary_shard.idl')[0], - env.Idlc('request_types/create_database.idl')[0], - env.Idlc('request_types/ensure_chunk_version_is_greater_than.idl')[0], - env.Idlc('request_types/flush_database_cache_updates.idl')[0], - env.Idlc('request_types/flush_routing_table_cache_updates.idl')[0], - env.Idlc('request_types/get_database_version.idl')[0], - env.Idlc('request_types/move_primary.idl')[0], - env.Idlc('request_types/shard_collection.idl')[0], - env.Idlc('request_types/refine_collection_shard_key.idl')[0], - env.Idlc('request_types/reshard_collection.idl')[0], - env.Idlc('resharded_chunk.idl')[0], - env.Idlc('request_types/wait_for_fail_point.idl')[0], - env.Idlc('resharding/common_types.idl')[0], - env.Idlc('resharding/type_collection_fields.idl')[0], - env.Idlc('resharding/resume_token.idl')[0], + 'catalog/type_chunk_base.idl', + 'catalog/type_shard_collection.idl', + 'chunk_version.idl', + 'database_version.idl', + 'mongod_and_mongos_server_parameters.idl', + 'request_types/balancer_collection_status.idl', + 'request_types/clone_catalog_data.idl', + 'request_types/clear_jumbo_flag.idl', + 'request_types/clone_collection_options_from_primary_shard.idl', + 'request_types/create_database.idl', + 'request_types/ensure_chunk_version_is_greater_than.idl', + 'request_types/flush_database_cache_updates.idl', + 'request_types/flush_routing_table_cache_updates.idl', + 'request_types/get_database_version.idl', + 'request_types/move_primary.idl', + 'request_types/shard_collection.idl', + 'request_types/refine_collection_shard_key.idl', + 'request_types/reshard_collection.idl', + 'resharded_chunk.idl', + 'request_types/wait_for_fail_point.idl', + 'resharding/common_types.idl', + 'resharding/type_collection_fields.idl', + 'resharding/resume_token.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/client/connection_string', @@ -381,7 +381,7 @@ env.Library( target='mongos_server_parameters', source=[ 'mongos_server_parameters.cpp', - env.Idlc('mongos_server_parameters.idl')[0], + 'mongos_server_parameters.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -478,7 +478,7 @@ env.Library( 'mongos_main.cpp', 'mongos_options.cpp', 'mongos_options_init.cpp', - env.Idlc('mongos_options.idl')[0], + 'mongos_options.idl', 'service_entry_point_mongos.cpp', 'sharding_uptime_reporter.cpp', 'version_mongos.cpp', diff --git a/src/mongo/s/client/SConscript b/src/mongo/s/client/SConscript index 765dedcc15c..71ebe87178f 100644 --- a/src/mongo/s/client/SConscript +++ b/src/mongo/s/client/SConscript @@ -9,7 +9,7 @@ env.Library( source=[ 'shard_remote.cpp', 'num_hosts_targeted_metrics.cpp', - env.Idlc('shard_remote.idl')[0], + 'shard_remote.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/client/fetcher', diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript index 8fc761a2e0b..19925d42727 100644 --- a/src/mongo/s/commands/SConscript +++ b/src/mongo/s/commands/SConscript @@ -99,7 +99,7 @@ env.Library( 'kill_sessions_remote.cpp', 's_read_write_concern_defaults_server_status.cpp', 'strategy.cpp', - env.Idlc('cluster_commands.idl')[0], + 'cluster_commands.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands/servers', diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript index c036a7a45c0..f075f820a7e 100644 --- a/src/mongo/s/query/SConscript +++ b/src/mongo/s/query/SConscript @@ -8,7 +8,7 @@ env.Library( target="cluster_query", source=[ "cluster_find.cpp", - env.Idlc('cluster_query_knobs.idl')[0], + 'cluster_query_knobs.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands', @@ -75,7 +75,7 @@ env.Library( "async_results_merger.cpp", "blocking_results_merger.cpp", "establish_cursors.cpp", - env.Idlc('async_results_merger_params.idl')[0], + 'async_results_merger_params.idl', ], LIBDEPS=[ "$BUILD_DIR/mongo/db/query/command_request_response", diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript index a21b49ae298..30ca99b52ae 100644 --- a/src/mongo/scripting/SConscript +++ b/src/mongo/scripting/SConscript @@ -13,7 +13,7 @@ env.Library( target='scripting_common', source=[ 'deadline_monitor.cpp', - env.Idlc('deadline_monitor.idl')[0], + 'deadline_monitor.idl', 'dbdirectclient_factory.cpp', 'engine.cpp', 'jsexception.cpp', @@ -110,8 +110,8 @@ if usemozjs: 'mozjs/uri.cpp', 'mozjs/valuereader.cpp', 'mozjs/valuewriter.cpp', - env.Idlc('mozjs/engine.idl')[0], - env.Idlc('mozjs/scripting_util.idl')[0], + 'mozjs/engine.idl', + 'mozjs/scripting_util.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context', diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript index 95465a8bfbb..eb3c7a1631d 100644 --- a/src/mongo/shell/SConscript +++ b/src/mongo/shell/SConscript @@ -106,7 +106,7 @@ env.Library( env.Library( target='shell_options_register', source=[ - env.Idlc('shell_options.idl')[0], + 'shell_options.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -150,7 +150,7 @@ if get_option('ssl') == 'on': "kms.cpp", "kms_aws.cpp", "kms_local.cpp", - kmsEnv.Idlc("kms.idl")[0], + "kms.idl", ], LIBDEPS=[ '$BUILD_DIR/mongo/base/secure_allocator', @@ -184,7 +184,7 @@ if get_option('ssl') == 'on': target="encrypted_dbclient", source=[ "encrypted_dbclient_base.cpp", - scriptingEnv.Idlc("fle_shell_options.idl")[0], + "fle_shell_options.idl", ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/clientdriver_minimal', diff --git a/src/mongo/tools/SConscript b/src/mongo/tools/SConscript index 840000a4217..af952f2df16 100644 --- a/src/mongo/tools/SConscript +++ b/src/mongo/tools/SConscript @@ -14,7 +14,7 @@ mongobridge = env.Program( "bridge.cpp", "bridge_commands.cpp", "mongobridge_options.cpp", - env.Idlc("mongobridge_options.idl")[0], + "mongobridge_options.idl", "mongobridge_options_init.cpp" ], LIBDEPS=[ diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript index 5326afe5db2..ee4c644a084 100644 --- a/src/mongo/transport/SConscript +++ b/src/mongo/transport/SConscript @@ -53,7 +53,7 @@ tlEnv.Library( target='transport_layer', source=[ 'transport_layer_asio.cpp', - env.Idlc('transport_options.idl')[0], + 'transport_options.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base/system_error', @@ -90,7 +90,7 @@ tlEnv.Library( 'service_executor_reserved.cpp', 'service_executor_synchronous.cpp', 'service_executor_utils.cpp', - env.Idlc('service_executor.idl')[0], + 'service_executor.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context', @@ -153,7 +153,7 @@ zlibEnv.Library( env.Library( target='message_compressor_options_client', source=[ - env.Idlc('message_compressor_options_client.idl')[0], + 'message_compressor_options_client.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -164,7 +164,7 @@ env.Library( env.Library( target='message_compressor_options_server', source=[ - env.Idlc('message_compressor_options_server.idl')[0], + 'message_compressor_options_server.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript index 93192746231..54d2ee54c52 100644 --- a/src/mongo/unittest/SConscript +++ b/src/mongo/unittest/SConscript @@ -13,7 +13,7 @@ env.Library( 'temp_dir.cpp', 'unittest_helpers.cpp', 'unittest.cpp', - env.Idlc('unittest.idl')[0], + 'unittest.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -29,7 +29,7 @@ env.Library( target="unittest_main", source=[ 'unittest_main.cpp', - env.Idlc('unittest_options.idl')[0], + 'unittest_options.idl', ], LIBDEPS=[ 'unittest', @@ -45,7 +45,7 @@ env.Library( target="integration_test_main", source=[ 'integration_test_main.cpp', - env.Idlc('integration_test_main.idl')[0], + 'integration_test_main.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index 1e759de47dc..13f9ec6ab3e 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -202,7 +202,7 @@ env.Library( target="fail_point", source=[ "fail_point.cpp", - env.Idlc('fail_point_server_parameter.idl')[0], + 'fail_point_server_parameter.idl', ], LIBDEPS=[ "$BUILD_DIR/mongo/base", @@ -215,7 +215,7 @@ env.Library( target="testing_options", source=[ "testing_options.cpp", - env.Idlc('testing_options.idl')[0], + 'testing_options.idl', ], LIBDEPS=[ "$BUILD_DIR/mongo/base", @@ -315,7 +315,7 @@ if env['MONGO_ALLOCATOR'] in ['tcmalloc', 'tcmalloc-experimental']: source=[ 'tcmalloc_server_status_section.cpp', 'tcmalloc_set_parameter.cpp', - env.Idlc('tcmalloc_parameters.idl')[0], + 'tcmalloc_parameters.idl', 'heap_profiler.cpp', ], LIBDEPS=[ @@ -472,7 +472,7 @@ env.Library( target='password', source=[ 'password.cpp', - env.Idlc('password_params.idl')[0], + 'password_params.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index 968d6f3e90e..ea81c6d254c 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -16,7 +16,7 @@ env.Library( "sockaddr.cpp", "socket_exception.cpp", "socket_utils.cpp", - env.Idlc('hostandport.idl')[0], + 'hostandport.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -46,7 +46,7 @@ env.Library( target='ssl_options_client', source=[ 'ssl_options_client.cpp', - env.Idlc('ssl_options_client.idl')[0], + 'ssl_options_client.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -61,7 +61,7 @@ env.Library( target='ssl_options_server', source=[ 'ssl_options_server.cpp', - env.Idlc('ssl_options_server.idl')[0], + 'ssl_options_server.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -109,7 +109,7 @@ if not get_option('ssl') == 'off': "ssl_manager_%s.cpp" % (ssl_provider), "ssl_stream.cpp", "ssl_peer_info.cpp", - env.Idlc('ssl_parameters.idl')[0], + 'ssl_parameters.idl', "ocsp/ocsp_manager.cpp", ], LIBDEPS=[ @@ -141,7 +141,7 @@ if not get_option('ssl') == 'off': target='ssl_parameters_auth', source=[ 'ssl_parameters_auth.cpp', - env.Idlc('ssl_parameters_auth.idl')[0], + 'ssl_parameters_auth.idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/authentication', diff --git a/src/mongo/watchdog/SConscript b/src/mongo/watchdog/SConscript index a1cedf2a327..55c5689b0f7 100644 --- a/src/mongo/watchdog/SConscript +++ b/src/mongo/watchdog/SConscript @@ -25,7 +25,7 @@ env.Library( target='watchdog_mongod', source=[ 'watchdog_mongod.cpp', - env.Idlc('watchdog_mongod.idl')[0], + 'watchdog_mongod.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands/server_status', |