diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-06-28 11:30:39 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-06-28 16:45:59 -0400 |
| commit | b975f73660d0fbe7306e77a58f3a8b85aa6a6419 (patch) | |
| tree | 08a60394d1ed369862a54a15a0635ab8cd07b68b /src/SConscript.client | |
| parent | 0a4b206a2938fec91d4431ce6d5ebfc602972a4e (diff) | |
| download | mongo-b975f73660d0fbe7306e77a58f3a8b85aa6a6419.tar.gz | |
SERVER-10053 Always package all processinfo files
Diffstat (limited to 'src/SConscript.client')
| -rw-r--r-- | src/SConscript.client | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/SConscript.client b/src/SConscript.client index 9abcfadbae7..22b96ac4c08 100644 --- a/src/SConscript.client +++ b/src/SConscript.client @@ -2,6 +2,8 @@ # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple # programs. +import os + Import('env has_option installSetup use_system_version_of_library') Import('nix linux darwin windows') @@ -85,7 +87,6 @@ clientSourceBasic = [ 'mongo/util/net/ssl_manager.cpp', 'mongo/util/password.cpp', 'mongo/util/processinfo.cpp', - env.File('mongo/util/processinfo_${PYSYSPLATFORM}.cpp'), 'mongo/util/ramlog.cpp', 'mongo/util/signal_handlers.cpp', 'mongo/util/stringutils.cpp', @@ -101,14 +102,28 @@ clientSourceBasic = [ clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp', 'mongo/client/sasl_client_session.cpp'] -clientSourceAll = clientSourceBasic + clientSourceSasl +clientSourceProcessInfo = [ + 'mongo/util/processinfo_darwin.cpp', + 'mongo/util/processinfo_freebsd.cpp', + 'mongo/util/processinfo_linux2.cpp', + 'mongo/util/processinfo_none.cpp', + 'mongo/util/processinfo_sunos5.cpp', + 'mongo/util/processinfo_win32.cpp' +] + +clientSourceAll = clientSourceBasic + clientSourceSasl + clientSourceProcessInfo usingSasl = env['MONGO_BUILD_SASL_CLIENT'] +clientSource = list(clientSourceBasic) if usingSasl: - clientSource = clientSourceAll -else: - clientSource = clientSourceBasic + clientSource += clientSourceSasl + +processInfoPlatformFile = env.File( "mongo/util/processinfo_${PYSYSPLATFORM}.cpp" ) +# NOTE: See comment about similar code in src/mongo/SConscript +if not os.path.exists( str( processInfoPlatformFile ) ): + processInfoPlatformFile = env.File( "mongo/util/processinfo_none.cpp" ) +clientSource += [processInfoPlatformFile] exampleSourceMap = [ ('authTest', 'mongo/client/examples/authTest.cpp'), |