summaryrefslogtreecommitdiff
path: root/src/SConscript.client
diff options
context:
space:
mode:
authorLaszlo Boszormenyi (GCS) <gcs@debian.org>2013-10-18 10:31:13 +0200
committerLaszlo Boszormenyi (GCS) <gcs@debian.org>2013-10-18 10:31:13 +0200
commit65585c90b12d6523bea75a2aebaae2a2fdf9e641 (patch)
treeccb3081edfe67f988844af661a2bf93aa95ae09f /src/SConscript.client
parente3904bf97e74cbbe5dde6b3abc3e797ad7d26b5d (diff)
Imported Upstream version 2.4.6upstream/2.4.6
Diffstat (limited to 'src/SConscript.client')
-rw-r--r--src/SConscript.client27
1 files changed, 22 insertions, 5 deletions
diff --git a/src/SConscript.client b/src/SConscript.client
index e30c73fcbb4..ff959e95f27 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')
@@ -52,6 +54,8 @@ clientSourceBasic = [
'mongo/db/namespace.cpp',
'mongo/db/dbmessage.cpp',
'mongo/pch.cpp',
+ 'mongo/platform/backtrace.cpp',
+ 'mongo/platform/posix_fadvise.cpp',
'mongo/platform/random.cpp',
'mongo/util/assert_util.cpp',
'mongo/util/background.cpp',
@@ -82,7 +86,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',
@@ -98,14 +101,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'),