diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-01-15 14:50:29 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-01-17 13:43:18 -0500 |
| commit | 7d3f945ee748347a3ca3c219a9df1435d74ae3e9 (patch) | |
| tree | 1aee7b99990d93600611f9c05b459a6e0e4a1157 /src/SConscript.client | |
| parent | 770a3903d6b03c724d1a8465bc02073392981ea2 (diff) | |
| download | mongo-7d3f945ee748347a3ca3c219a9df1435d74ae3e9.tar.gz | |
SERVER-8150 Always stage sasl files into client archive
Diffstat (limited to 'src/SConscript.client')
| -rw-r--r-- | src/SConscript.client | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/SConscript.client b/src/SConscript.client index 777f9262927..11d7cdac55c 100644 --- a/src/SConscript.client +++ b/src/SConscript.client @@ -13,7 +13,7 @@ env.Command(['mongo/db/auth/action_type.h', 'mongo/db/auth/action_type.cpp'], ['mongo/db/auth/generate_action_types.py', 'mongo/db/auth/action_types.txt'], '$PYTHON $SOURCES $TARGETS') -clientSource = [ +clientSourceBasic = [ 'mongo/base/configuration_variable_manager.cpp', 'mongo/base/error_codes.cpp', 'mongo/base/global_initializer.cpp', @@ -85,9 +85,15 @@ clientSource = [ 'mongo/util/version.cpp', ] +clientSourceSasl = ['mongo/client/sasl_client_authenticate.cpp', + 'mongo/util/gsasl_session.cpp'] + +clientSourceAll = clientSourceBasic + clientSourceSasl + if env['MONGO_BUILD_SASL_CLIENT']: - clientSource.extend(['mongo/client/sasl_client_authenticate.cpp', - 'mongo/util/gsasl_session.cpp']) + clientSource = clientSourceAll +else: + clientSource = clientSourceBasic exampleSourceMap = [ ('authTest', 'mongo/client/examples/authTest.cpp'), @@ -154,7 +160,7 @@ env.Install( 'mongo/db/auth/generate_action_types.py', 'mongo/db/auth/action_types.txt', '#buildscripts/make_archive.py', - clientSource, + clientSourceAll, clientHeaders, [source for (target, source) in exampleSourceMap], 'mongo/bson/bsondemo/bsondemo.cpp', |