SERVER-9666 Push lasterror and service_context into db directory

7 files changed, 35 insertions, 31 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 9329ecfd200..a49b0af28f6 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -138,14 +138,6 @@ env.CppUnitTest('oid_test', ['bson/oid_test.cpp'],
 env.CppUnitTest('bson_extract_test', ['bson/util/bson_extract_test.cpp'], LIBDEPS=['bson'])
 env.CppUnitTest('bson_check_test', ['bson/util/bson_check_test.cpp'], LIBDEPS=['bson'])
 
-env.Library('lasterror', [
-            "db/lasterror.cpp",
-            ],
-            LIBDEPS=[
-                'service_context',
-                'util/foundation',
-            ])
-
 def getSysInfo():
     if env.TargetOSIs("windows"):
         return "windows " + str( sys.getwindowsversion() )
@@ -230,8 +222,8 @@ env.Library('mongocommon', commonFiles,
                      '$BUILD_DIR/mongo/client/clientdriver',
                      'util/fail_point',
                      'util/foundation',
-                     'service_context',
-                     'lasterror',
+                     'db/service_context',
+                     'db/lasterror',
                      'db/mongohasher',
                      'db/namespace_string',
                      'util/net/network',
@@ -326,20 +318,6 @@ coredbEnv.Library("coredb", [
                            '$BUILD_DIR/mongo/client/clientdriver',
                            ])
 
-env.Library(
-    target='service_context',
-    source=[
-        'db/client.cpp',
-        'db/client_basic.cpp',
-        'db/service_context.cpp',
-        'db/service_context_noop.cpp',
-    ],
-    LIBDEPS=[
-        'util/concurrency/spin_lock',
-        'util/decorable',
-        'util/net/hostandport',
-         ])
-
 # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client
 # libs.
 serverOnlyFiles = [ "db/background.cpp",
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index d7517990895..8e9340301ae 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -120,7 +120,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/stats/top',
         '$BUILD_DIR/mongo/util/fail_point',
         '$BUILD_DIR/mongo/util/net/network',
-        '$BUILD_DIR/mongo/service_context',
+        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/progress_meter',
     ],
 )
@@ -292,7 +292,7 @@ env.Library(
         '$BUILD_DIR/mongo/base/base',
         '$BUILD_DIR/mongo/bson',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_global',
-        '$BUILD_DIR/mongo/service_context',
+        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/concurrency/synchronization',
         'range_arithmetic',
     ],
@@ -355,3 +355,29 @@ env.Library(
         'server_options',
     ],
 )
+
+env.Library(
+    target='service_context',
+    source=[
+        'client.cpp',
+        'client_basic.cpp',
+        'service_context.cpp',
+        'service_context_noop.cpp',
+    ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/util/concurrency/spin_lock',
+        '$BUILD_DIR/mongo/util/decorable',
+        '$BUILD_DIR/mongo/util/net/hostandport',
+    ],
+)
+
+env.Library(
+    tagret='lasterror',
+    source=[
+        "lasterror.cpp",
+    ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/util/foundation',
+        'service_context',
+    ],
+)
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index d28c5acd43c..44deb0110d9 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -50,7 +50,7 @@ env.Library('authorization_manager_global',
             ],
             LIBDEPS=[
                 'authcore',
-                '$BUILD_DIR/mongo/service_context',
+                '$BUILD_DIR/mongo/db/service_context',
             ])
 
 env.Library('authservercommon',
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript
index 669f0d3658b..32ac7a41570 100644
--- a/src/mongo/db/concurrency/SConscript
+++ b/src/mongo/db/concurrency/SConscript
@@ -27,7 +27,7 @@ env.Library(
         # Temporary crutch since the ssl cleanup is hard coded in background.cpp
         '$BUILD_DIR/mongo/util/net/network',
         '$BUILD_DIR/mongo/db/server_parameters',
-        '$BUILD_DIR/mongo/service_context',
+        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/concurrency/spin_lock',
         '$BUILD_DIR/third_party/shim_boost',
     ],
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 412554d9066..267943729c9 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -120,7 +120,7 @@ env.Library('repl_coordinator_impl',
                      '$BUILD_DIR/mongo/db/global_timestamp',
                      '$BUILD_DIR/mongo/rpc/command_status',
                      '$BUILD_DIR/mongo/db/server_options_core',
-                     '$BUILD_DIR/mongo/service_context',
+                     '$BUILD_DIR/mongo/db/service_context',
                      'data_replicator',
                      'repl_coordinator_interface',
                      'replica_set_messages',
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index 2aa132e7d48..ba121d2e981 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -8,7 +8,7 @@ env.Library(
         'top.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/service_context',
+        '$BUILD_DIR/mongo/db/service_context',
     ],
 )
 
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 27b07483f10..bcd47c95a04 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -170,7 +170,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/bson',
         '$BUILD_DIR/mongo/db/common', # for Message
-        '$BUILD_DIR/mongo/lasterror',
+        '$BUILD_DIR/mongo/db/lasterror',
         'cluster_ops',
     ],
 )