summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SConstruct12
-rwxr-xr-xbuildscripts/build_and_test_client.py75
-rw-r--r--distsrc/client/LICENSE.txt203
-rwxr-xr-xdistsrc/client/SConstruct120
-rw-r--r--src/SConscript.client31
-rw-r--r--src/mongo/SConscript7
-rw-r--r--src/mongo/client/mongo_client_lib.cpp107
-rw-r--r--src/mongo/client/simple_client_demo.cpp4
8 files changed, 1 insertions, 558 deletions
diff --git a/SConstruct b/SConstruct
index c9f57daaedb..916d39dc006 100644
--- a/SConstruct
+++ b/SConstruct
@@ -257,9 +257,6 @@ add_option( "use-cpu-profiler",
add_option("mongod-concurrency-level", "Concurrency level, \"global\" or \"db\"", 1, True,
type="choice", choices=["global", "db"])
-add_option('client-dist-basename', "Name of the client source archive.", 1, False,
- default='mongo-cxx-driver')
-
add_option('build-fast-and-loose', "NEVER for production builds", 0, False)
add_option('propagate-shell-environment',
@@ -319,10 +316,6 @@ usePCH = has_option( "usePCH" )
justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
env = Environment( BUILD_DIR=variantDir,
- CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
- CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
- CLIENT_LICENSE='#distsrc/client/LICENSE.txt',
- CLIENT_SCONSTRUCT='#distsrc/client/SConstruct',
DIST_ARCHIVE_SUFFIX='.tgz',
EXTRAPATH=get_option("extrapath"),
MODULE_BANNERS=[],
@@ -1506,13 +1499,8 @@ env.AlwaysBuild( "s3shell" )
def s3dist( env , target , source ):
s3push( str(source[0]) , "mongodb" )
-def s3distclient(env, target, source):
- s3push(str(source[0]), "cxx-driver/mongodb", platformDir=False)
-
env.Alias( "dist" , '$SERVER_ARCHIVE' )
-env.Alias( "distclient", "$CLIENT_ARCHIVE")
env.AlwaysBuild(env.Alias( "s3dist" , [ '$SERVER_ARCHIVE' ] , [ s3dist ] ))
-env.AlwaysBuild(env.Alias( "s3distclient" , [ '$CLIENT_ARCHIVE' ] , [ s3distclient ] ))
# --- an uninstall target ---
if len(COMMAND_LINE_TARGETS) > 0 and 'uninstall' in COMMAND_LINE_TARGETS:
diff --git a/buildscripts/build_and_test_client.py b/buildscripts/build_and_test_client.py
deleted file mode 100755
index 1b97f623cc5..00000000000
--- a/buildscripts/build_and_test_client.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-'''Script to attempt an isolated build of the C++ driver and its examples.
-
-Working directory must be the repository root.
-
-Usage:
-
-./buildscripts/build_and_test_client.py <mongo client archive file> [optional scons arguments]
-
-The client is built in a temporary directory, and the sample programs are run against a mongod
-instance found in the current working directory. The temporary directory and its contents are
-destroyed at the end of execution.
-'''
-
-import os
-import shutil
-import subprocess
-import sys
-import tempfile
-import tarfile
-import zipfile
-
-import utils
-
-def main(args):
- archive_file = args[1]
- scons_args = args[2:]
- build_and_test(archive_file, scons_args)
-
-def build_and_test(archive_name, scons_args):
- work_dir = tempfile.mkdtemp()
- try:
- archive = open_archive(archive_name)
- extracted_root = extract_archive(work_dir, archive)
- run_scons(extracted_root, scons_args)
- smoke_client(extracted_root)
- finally:
- shutil.rmtree(work_dir)
-
-def open_tar(archive_name):
- return tarfile.open(archive_name, 'r')
-
-def open_zip(archive_name):
- class ZipWrapper(zipfile.ZipFile):
- def getnames(self):
- return self.namelist()
- return ZipWrapper(archive_name, 'r')
-
-def open_archive(archive_name):
- try:
- return open_tar(archive_name)
- except:
- return open_zip(archive_name)
-
-def extract_archive(work_dir, archive_file):
- archive_file.extractall(path=work_dir)
- return os.path.join(
- work_dir,
- os.path.dirname([n for n in archive_file.getnames() if n.endswith('SConstruct')][0])
- )
-
-def run_scons(extracted_root, scons_args):
- rc = subprocess.call(['scons', '-C', extracted_root, ] + scons_args + ['clientTests'])
- if rc is not 0:
- sys.exit(rc)
-
-def smoke_client(extracted_root):
- rc = subprocess.call(utils.smoke_command("--test-path", extracted_root, "client"))
- if rc is not 0:
- sys.exit(rc)
-
-if __name__ == '__main__':
- main(sys.argv)
- sys.exit(0)
diff --git a/distsrc/client/LICENSE.txt b/distsrc/client/LICENSE.txt
deleted file mode 100644
index 4a67574d9bc..00000000000
--- a/distsrc/client/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
deleted file mode 100755
index c8d95630ea6..00000000000
--- a/distsrc/client/SConstruct
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- mode: python -*-
-
-# scons file for MongoDB c++ client library and examples
-
-import os
-import sys
-
-# options
-AddOption("--extrapath",
- dest="extrapath",
- type="string",
- nargs=1,
- action="store",
- help="comma separated list of add'l paths (--extrapath /opt/foo/,/foo) static linking")
-
-AddOption("--prefix",
- dest="prefix",
- type="string",
- nargs=1,
- action="store",
- default="/usr/local",
- help="installation root")
-
-
-# Stub out has_option so that we can use it in SConscript.client
-def has_option(name):
- return False
-
-# Stub out use_system_version_of_library so we can use it in SConscript.client
-def use_system_version_of_library(name):
- return True
-
-env = Environment(BUILD_DIR='#build',
- CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
- CLIENT_DIST_BASENAME='mongo-cxx-driver',
- CLIENT_LICENSE='#LICENSE.txt',
- CLIENT_SCONSTRUCT='#SConstruct',
- MSVS_ARCH=None,
- PYTHON=sys.executable,
- PYSYSPLATFORM=os.sys.platform)
-
-if env['PYSYSPLATFORM'] == 'linux3':
- env['PYSYSPLATFORM'] = 'linux2'
-if 'freebsd' in env['PYSYSPLATFORM']:
- env['PYSYSPLATFORM'] = 'freebsd'
-
-def addExtraLibs(s):
- for x in s.split(","):
- if os.path.exists(x):
- env.Append(CPPPATH=[x + "/include", x],
- LIBPATH=[x + "/lib", x + "/lib64"])
-
-if GetOption( "extrapath" ) is not None:
- addExtraLibs( GetOption( "extrapath" ) )
-
-env.Prepend(CPPPATH=["$BUILD_DIR", "$BUILD_DIR/mongo"])
-env.Append(CPPDEFINES=[ "_SCONS", "MONGO_EXPOSE_MACROS" ])
-
-nix = False
-linux = False
-windows = False
-darwin = False
-
-if "darwin" == sys.platform:
- addExtraLibs( "/opt/local/" )
- nix = True
- darwin = True
-elif sys.platform in ("linux2", "linux3"):
- nix = True
- linux = True
-elif sys.platform == 'win32':
- windows = True
-
-if windows:
- env['DIST_ARCHIVE_SUFFIX'] = '.zip'
- env.Append(CCFLAGS=['/EHsc', '/O2'])
-else:
- env['DIST_ARCHIVE_SUFFIX'] = '.tgz'
-
-if nix:
- env.Append(CCFLAGS=["-O3", "-pthread"])
-if linux:
- env.Append(LINKFLAGS=["-pthread"])
-
-boostLibs = ["thread", "filesystem", "system"]
-conf = Configure(env)
-for lib in boostLibs:
- if not conf.CheckLib(["boost_%s-mt" % lib, "boost_%s" % lib],
- language="C++"):
- if not windows:
- Exit(1)
-
-env['MONGO_BUILD_SASL_CLIENT'] = conf.CheckLibWithHeader(
- "sasl2", "sasl/sasl.h", "C", "sasl_version_info(0, 0, 0, 0, 0, 0);", autoadd=False)
-
-if (conf.CheckCXXHeader( "execinfo.h" ) and
- conf.CheckDeclaration('backtrace', includes='#include <execinfo.h>') and
- conf.CheckDeclaration('backtrace_symbols', includes='#include <execinfo.h>') and
- conf.CheckDeclaration('backtrace_symbols_fd', includes='#include <execinfo.h>')):
-
- env.Append( CPPDEFINES=[ "MONGO_HAVE_EXECINFO_BACKTRACE" ] )
-
-conf.Finish()
-
-class InstallSetup:
- binaries = False
- libraries = False
- headers = False
-installSetup = InstallSetup()
-
-Export("env has_option use_system_version_of_library installSetup")
-Export("nix linux windows darwin")
-env.SConscript('src/SConscript.client', variant_dir='$BUILD_DIR', duplicate=False)
-
-mongoclient = env.Alias('mongoclient', ['${LIBPREFIX}mongoclient${LIBSUFFIX}'])
-env.Default(mongoclient)
-
-
-# install
-env.Alias("install", GetOption('prefix'))
diff --git a/src/SConscript.client b/src/SConscript.client
index 7c25e4963de..3687438839f 100644
--- a/src/SConscript.client
+++ b/src/SConscript.client
@@ -271,14 +271,8 @@ clientEnv['CPPDEFINES'].remove('MONGO_EXPOSE_MACROS')
# Compile the example files to .o so that we can link them twice: once statically, once shared.
exampleObjMap = [(target, clientEnv.Object(source)) for (target, source) in exampleSourceMap]
-# Create an environment for linking the examples to the static library. For out of tree builds,
-# we need to use LIBS. For in-tree builds we need LIBDEPS.
staticClientEnv = clientEnv.Clone()
-if '_LIBDEPS' in clientEnv:
- staticClientEnv.PrependUnique(LIBDEPS=[mongoClientStaticLib])
-else:
- # We need the mongo client library to preceed the boost libraries.
- staticClientEnv.PrependUnique(LIBS=[mongoClientStaticLib])
+staticClientEnv.PrependUnique(LIBDEPS=[mongoClientStaticLib])
# Build each statically linked client program
staticClientPrograms = [staticClientEnv.Program(target, obj) for (target, obj) in exampleObjMap]
@@ -313,26 +307,3 @@ if buildShared:
clientTests.append(sharedClientProgramInstalls)
clientEnv.Alias('clientTests', clientTests, [])
-
-env.Install(
- '#/',
- env.Command('$CLIENT_ARCHIVE',
- ['#buildscripts/make_archive.py',
- '$CLIENT_SCONSTRUCT',
- '$CLIENT_LICENSE',
- 'SConscript.client',
- 'mongo/base/generate_error_codes.py',
- 'mongo/base/error_codes.err',
- 'mongo/db/auth/generate_action_types.py',
- 'mongo/db/auth/action_types.txt',
- 'third_party/murmurhash3/MurmurHash3.h',
- '#buildscripts/make_archive.py',
- clientSourceAll,
- clientHeaders,
- [source for (target, source) in exampleSourceMap]],
- '${PYTHON} ${SOURCES[0]} -o $TARGET '
- '--transform ${str(Dir(BUILD_DIR))}/client_build=$CLIENT_DIST_BASENAME/src '
- '--transform ${str(Dir(BUILD_DIR))}=$CLIENT_DIST_BASENAME/src '
- '--transform distsrc/client=$CLIENT_DIST_BASENAME '
- '--transform =$CLIENT_DIST_BASENAME/ '
- '${TEMPFILE(SOURCES[1:])}'))
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index de3bc7669c1..dec5d8345f0 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -1020,10 +1020,3 @@ env.Command(
#final alias
env.Alias( "install", "$INSTALL_DIR" )
-
-env.Alias("clientBuild", ['#buildscripts/build_and_test_client.py',
- '#/${PROGPREFIX}mongod${PROGSUFFIX}',
- '#$CLIENT_ARCHIVE'],
- '$PYTHON ${SOURCES[0]} ${SOURCES[2]} ${EXTRAPATH and "--extrapath"} $EXTRAPATH'
- )
-env.AlwaysBuild("clientBuild")
diff --git a/src/mongo/client/mongo_client_lib.cpp b/src/mongo/client/mongo_client_lib.cpp
deleted file mode 100644
index feb923b1274..00000000000
--- a/src/mongo/client/mongo_client_lib.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/* @file client_lib.cpp */
-
-/* Copyright 2009 10gen Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
-
- MongoDB C++ Driver
-
- Normally one includes dbclient.h, and links against libmongoclient.a, when connecting to MongoDB
- from C++. However, if you have a situation where the pre-built library does not work, you can use
- this file instead to build all the necessary symbols. To do so, include mongo_client_lib.cpp in your
- project.
-
- GCC
- ---
- For example, to build and run simple_client_demo.cpp with GCC and run it:
-
- g++ -I .. simple_client_demo.cpp mongo_client_lib.cpp -lboost_thread-mt -lboost_filesystem
- ./a.out
-
- Visual Studio (2010 tested)
- ---------------------------
- First, see client/examples/simple_client_demo.vcxproj.
- - Be sure to include your boost include directory in your project as an Additional Include Directory.
- - Define _CRT_SECURE_NO_WARNINGS to avoid warnings on use of strncpy and such by the MongoDB client code.
- - Include the boost libraries directory.
- - Linker.Input.Additional Dependencies - add ws2_32.lib for the Winsock library.
-*/
-
-#if defined(_WIN32)
-// C4800 forcing value to bool 'true' or 'false' (performance warning)
-#pragma warning( disable : 4800 )
-#endif
-
-#include "../util/md5main.cpp"
-
-#define MONGO_EXPOSE_MACROS
-
-#include "../pch.h"
-
-#include "../util/assert_util.cpp"
-#include "../util/net/message.cpp"
-#include "../util/util.cpp"
-#include "../util/background.cpp"
-#include "../util/base64.cpp"
-#include "../util/net/sock.cpp"
-#include "../util/log.cpp"
-#include "../util/password.cpp"
-#include "../util/net/message_port.cpp"
-#include "../util/concurrency/thread_pool.cpp"
-#include "../util/concurrency/task.cpp"
-#include "../util/concurrency/spin_lock.cpp"
-
-// in client/ directory:
-#include "authentication_table.cpp"
-#include "connpool.cpp"
-#include "syncclusterconnection.cpp"
-#include "dbclient.cpp"
-#include "clientOnly.cpp"
-#include "gridfs.cpp"
-#include "dbclientcursor.cpp"
-#include "dbclient_rs.cpp"
-
-#include "../util/text.cpp"
-#include "../bson/oid.cpp"
-#include "../db/lasterror.cpp"
-#include "../db/json.cpp"
-#include "../db/jsobj.cpp"
-#include "../db/dbmessage.cpp"
-
-#include "../pch.cpp"
-
-extern "C" {
-#include "../util/md5.cpp"
-}
-
-// in client/ directory:
-#include "clientAndShell.cpp"
-
-#include "../util/time_support.cpp"
-#include "../util/timer.cpp"
-#include "../util/concurrency/mutexdebugger.cpp"
-#include "../util/stringutils.cpp"
-
-/* these should probably be in clientOnly.cpp. however as a first step putting here so that there
- is no risk we break the LIB build of cpp client. so this is interim.
- */
-namespace mongo {
- void printStackTrace(class std::basic_ostream<char,struct std::char_traits<char> > &) { }
- void mongo_breakpoint() { }
- void printStackAndExit( int signalNum ) {
- ::_exit( EXIT_ABRUPT );
- }
-}
diff --git a/src/mongo/client/simple_client_demo.cpp b/src/mongo/client/simple_client_demo.cpp
index 51b370ab2d3..3aea72c2273 100644
--- a/src/mongo/client/simple_client_demo.cpp
+++ b/src/mongo/client/simple_client_demo.cpp
@@ -19,13 +19,9 @@
How to build and run:
- (1) Using the mongoclient:
g++ simple_client_demo.cpp -lmongoclient -lboost_thread-mt -lboost_filesystem -lboost_program_options
./a.out
- (2) using client_lib.cpp:
- g++ -I .. simple_client_demo.cpp mongo_client_lib.cpp -lboost_thread-mt -lboost_filesystem
- ./a.out
*/
#include <iostream>
View Lorry Controller Status