Skip to content

Commit b0cd366

Browse files
author
Andrew Morrow
committed
SERVER-11658 Consistently use Library target
1 parent 406ca29 commit b0cd366

File tree

27 files changed

+440
-440
lines changed

27 files changed

+440
-440
lines changed

‎src/mongo/SConscript‎

Lines changed: 228 additions & 228 deletions
Large diffs are not rendered by default.

‎src/mongo/base/SConscript‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ Import("env")
55
env.Command(['error_codes.h', 'error_codes.cpp'], ['generate_error_codes.py', 'error_codes.err'],
66
'$PYTHON $SOURCES $TARGETS')
77

8-
env.StaticLibrary('base', ['error_codes.cpp',
9-
'global_initializer.cpp',
10-
'global_initializer_registerer.cpp',
11-
'init.cpp',
12-
'initializer.cpp',
13-
'initializer_context.cpp',
14-
'initializer_dependency_graph.cpp',
15-
'make_string_vector.cpp',
16-
'parse_number.cpp',
17-
'status.cpp',
18-
'string_data.cpp',
19-
],
20-
LIBDEPS=[
21-
'$BUILD_DIR/third_party/murmurhash3/murmurhash3',
22-
])
8+
env.Library('base', ['error_codes.cpp',
9+
'global_initializer.cpp',
10+
'global_initializer_registerer.cpp',
11+
'init.cpp',
12+
'initializer.cpp',
13+
'initializer_context.cpp',
14+
'initializer_dependency_graph.cpp',
15+
'make_string_vector.cpp',
16+
'parse_number.cpp',
17+
'status.cpp',
18+
'string_data.cpp',
19+
],
20+
LIBDEPS=[
21+
'$BUILD_DIR/third_party/murmurhash3/murmurhash3',
22+
])
2323

2424
env.CppUnitTest('initializer_dependency_graph_test',
2525
['initializer_dependency_graph_test.cpp'],

‎src/mongo/db/SConscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Import("env")
88
# get resolved.
99
#
1010

11-
env.StaticLibrary(
11+
env.Library(
1212
target= 'common',
1313
source= [
1414
'field_ref.cpp',

‎src/mongo/db/auth/SConscript‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,62 @@
22

33
Import("env")
44

5-
env.StaticLibrary('serverauth', ['mongo_authentication_session.cpp'])
5+
env.Library('serverauth', ['mongo_authentication_session.cpp'])
66

77
env.Command(['action_type.h', 'action_type.cpp'], ['generate_action_types.py', 'action_types.txt'],
88
'$PYTHON $SOURCES $TARGETS')
99

1010
# Just the data structures used
11-
env.StaticLibrary('authcore', ['action_set.cpp',
12-
'action_type.cpp',
13-
'authorization_manager.cpp',
14-
'authorization_session.cpp',
15-
'authz_documents_update_guard.cpp',
16-
'authz_manager_external_state.cpp',
17-
'authz_manager_external_state_local.cpp',
18-
'authz_session_external_state.cpp',
19-
'privilege.cpp',
20-
'privilege_parser.cpp',
21-
'resource_pattern.cpp',
22-
'role_graph.cpp',
23-
'role_graph_update.cpp',
24-
'role_name.cpp',
25-
'role_graph_builtin_roles.cpp',
26-
'user.cpp',
27-
'user_document_parser.cpp',
28-
'user_management_commands_parser.cpp',
29-
'user_name.cpp',
30-
'user_set.cpp'],
31-
LIBDEPS=['$BUILD_DIR/mongo/auth_helpers',
32-
'$BUILD_DIR/mongo/base/base',
33-
'$BUILD_DIR/mongo/bson',
34-
'$BUILD_DIR/mongo/db/common',
35-
'$BUILD_DIR/mongo/db/ops/update_driver',
36-
'$BUILD_DIR/mongo/stringutils'])
11+
env.Library('authcore', ['action_set.cpp',
12+
'action_type.cpp',
13+
'authorization_manager.cpp',
14+
'authorization_session.cpp',
15+
'authz_documents_update_guard.cpp',
16+
'authz_manager_external_state.cpp',
17+
'authz_manager_external_state_local.cpp',
18+
'authz_session_external_state.cpp',
19+
'privilege.cpp',
20+
'privilege_parser.cpp',
21+
'resource_pattern.cpp',
22+
'role_graph.cpp',
23+
'role_graph_update.cpp',
24+
'role_name.cpp',
25+
'role_graph_builtin_roles.cpp',
26+
'user.cpp',
27+
'user_document_parser.cpp',
28+
'user_management_commands_parser.cpp',
29+
'user_name.cpp',
30+
'user_set.cpp'],
31+
LIBDEPS=['$BUILD_DIR/mongo/auth_helpers',
32+
'$BUILD_DIR/mongo/base/base',
33+
'$BUILD_DIR/mongo/bson',
34+
'$BUILD_DIR/mongo/db/common',
35+
'$BUILD_DIR/mongo/db/ops/update_driver',
36+
'$BUILD_DIR/mongo/stringutils'])
3737

38-
env.StaticLibrary('authservercommon',
39-
['auth_server_parameters.cpp',
40-
'authorization_manager_global.cpp',
41-
'authz_session_external_state_server_common.cpp',
42-
'security_key.cpp'],
43-
LIBDEPS=['authcore'])
38+
env.Library('authservercommon',
39+
['auth_server_parameters.cpp',
40+
'authorization_manager_global.cpp',
41+
'authz_session_external_state_server_common.cpp',
42+
'security_key.cpp'],
43+
LIBDEPS=['authcore'])
4444

45-
env.StaticLibrary('authmongod',
46-
['authz_manager_external_state_d.cpp',
47-
'authz_session_external_state_d.cpp',
48-
'auth_index_d.cpp'],
49-
LIBDEPS=['authservercommon', '$BUILD_DIR/mongo/server_parameters'])
45+
env.Library('authmongod',
46+
['authz_manager_external_state_d.cpp',
47+
'authz_session_external_state_d.cpp',
48+
'auth_index_d.cpp'],
49+
LIBDEPS=['authservercommon', '$BUILD_DIR/mongo/server_parameters'])
5050

51-
env.StaticLibrary('authmongos',
52-
['authz_manager_external_state_s.cpp',
53-
'authz_session_external_state_s.cpp',
54-
'user_cache_invalidator_job.cpp'],
55-
LIBDEPS=['authservercommon'])
51+
env.Library('authmongos',
52+
['authz_manager_external_state_s.cpp',
53+
'authz_session_external_state_s.cpp',
54+
'user_cache_invalidator_job.cpp'],
55+
LIBDEPS=['authservercommon'])
5656

57-
env.StaticLibrary('authmocks',
58-
['authz_manager_external_state_mock.cpp'],
59-
LIBDEPS=['$BUILD_DIR/mongo/db/ops/update_driver',
60-
'$BUILD_DIR/mongo/expressions'])
57+
env.Library('authmocks',
58+
['authz_manager_external_state_mock.cpp'],
59+
LIBDEPS=['$BUILD_DIR/mongo/db/ops/update_driver',
60+
'$BUILD_DIR/mongo/expressions'])
6161

6262
env.CppUnitTest('action_set_test', 'action_set_test.cpp', LIBDEPS=['authcore'])
6363
env.CppUnitTest('privilege_parser_test', 'privilege_parser_test.cpp', LIBDEPS=['authcore'])

‎src/mongo/db/exec/SConscript‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Import("env")
44

5-
env.StaticLibrary(
5+
env.Library(
66
target = "working_set",
77
source = [
88
"working_set.cpp",
@@ -22,7 +22,7 @@ env.CppUnitTest(
2222
],
2323
)
2424

25-
env.StaticLibrary(
25+
env.Library(
2626
target = "mock_stage",
2727
source = [
2828
"mock_stage.cpp",
@@ -32,7 +32,7 @@ env.StaticLibrary(
3232
],
3333
)
3434

35-
env.StaticLibrary(
35+
env.Library(
3636
target = 'exec',
3737
source = [
3838
"2d.cpp",

‎src/mongo/db/fts/SConscript‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env.Command( [ "stop_words_list.h", "stop_words_list.cpp"],
2424
[ "generate_stop_words.py"] + [ 'stop_words_%s.txt' % x for x in stop_word_lanages ],
2525
"$PYTHON $SOURCES $TARGETS" )
2626

27-
env.StaticLibrary('base', [
27+
env.Library('base', [
2828
'fts_index_format.cpp',
2929
'fts_matcher.cpp',
3030
'fts_query.cpp',
@@ -41,18 +41,18 @@ env.StaticLibrary('base', [
4141
"$BUILD_DIR/third_party/shim_stemmer"
4242
])
4343

44-
env.StaticLibrary( 'server_common', [
45-
'fts_command.cpp',
46-
'fts_enabled.cpp'
47-
] )
44+
env.Library( 'server_common', [
45+
'fts_command.cpp',
46+
'fts_enabled.cpp'
47+
] )
4848

49-
env.StaticLibrary('ftsmongod', [
49+
env.Library('ftsmongod', [
5050
'fts_command_mongod.cpp',
5151
'fts_search.cpp',
5252
], LIBDEPS=["base","server_common"])
5353

5454

55-
env.StaticLibrary('ftsmongos', [
55+
env.Library('ftsmongos', [
5656
'fts_command_mongos.cpp',
5757
], LIBDEPS=["server_common"])
5858

‎src/mongo/db/index/SConscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Import("env")
44

5-
env.StaticLibrary(
5+
env.Library(
66
target='key_generator',
77
source=[
88
'btree_key_generator.cpp',

‎src/mongo/db/ops/SConscript‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Import("env")
44

5-
env.StaticLibrary(
5+
env.Library(
66
target='update_common',
77
source=[
88
'field_checker.cpp',
@@ -48,7 +48,7 @@ env.CppUnitTest(
4848
],
4949
)
5050

51-
env.StaticLibrary(
51+
env.Library(
5252
target='update',
5353
source=[
5454
'modifier_add_to_set.cpp',
@@ -196,7 +196,7 @@ env.CppUnitTest(
196196
],
197197
)
198198

199-
env.StaticLibrary(
199+
env.Library(
200200
target='update_driver',
201201
source=[
202202
'modifier_table.cpp',

‎src/mongo/db/query/SConscript‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Import("env")
44

5-
env.StaticLibrary(
5+
env.Library(
66
target='query_planner',
77
source=[
88
"canonical_query.cpp",
@@ -25,7 +25,7 @@ env.StaticLibrary(
2525
],
2626
)
2727

28-
env.StaticLibrary(
28+
env.Library(
2929
target='query',
3030
source=[
3131
"cached_plan_runner.cpp",
@@ -46,7 +46,7 @@ env.StaticLibrary(
4646
],
4747
)
4848

49-
env.StaticLibrary(
49+
env.Library(
5050
target="index_bounds",
5151
source=[
5252
"index_bounds.cpp",
@@ -57,7 +57,7 @@ env.StaticLibrary(
5757
],
5858
)
5959

60-
env.StaticLibrary(
60+
env.Library(
6161
target="lite_parsed_query",
6262
source=[
6363
"lite_parsed_query.cpp"

‎src/mongo/logger/SConscript‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
Import("env")
44

5-
env.StaticLibrary('logger',
6-
[
7-
'console.cpp',
8-
'log_manager.cpp',
9-
'log_severity.cpp',
10-
'logger.cpp',
11-
'logstream_builder.cpp',
12-
'message_event_utf8_encoder.cpp',
13-
'message_log_domain.cpp',
14-
'ramlog.cpp',
15-
'rotatable_file_manager.cpp',
16-
'rotatable_file_writer.cpp',
17-
],
18-
LIBDEPS=['$BUILD_DIR/mongo/base/base',
19-
'$BUILD_DIR/mongo/util/concurrency/thread_name'])
5+
env.Library('logger',
6+
[
7+
'console.cpp',
8+
'log_manager.cpp',
9+
'log_severity.cpp',
10+
'logger.cpp',
11+
'logstream_builder.cpp',
12+
'message_event_utf8_encoder.cpp',
13+
'message_log_domain.cpp',
14+
'ramlog.cpp',
15+
'rotatable_file_manager.cpp',
16+
'rotatable_file_writer.cpp',
17+
],
18+
LIBDEPS=['$BUILD_DIR/mongo/base/base',
19+
'$BUILD_DIR/mongo/util/concurrency/thread_name'])
2020

2121
# writes multi-byte sequences to console
2222
# to support manual testing of console stream under Windows

0 commit comments

Comments
 (0)