Merge branch 'master' of github.com:mongodb/mongo

4 files changed, 12 insertions, 6 deletions

diff --git a/SConstruct b/SConstruct
index 0e25a0b27b7..7e96a50cdb9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1657,15 +1657,16 @@ def build_and_test_client(env, target, source):
     from subprocess import call
 
     if GetOption("extrapath") is not None:
-        call(["scons", "--extrapath=" + GetOption("extrapath")], cwd=installDir)
+        scons_command = ["scons", "--extrapath=" + GetOption("extrapath")]
     else:
-        call("scons", cwd=installDir)
+        scons_command = ["scons"]
+
+    call(scons_command + ["libmongoclient.a", "clientTests"], cwd=installDir)
+
     return bool(call(["python", "buildscripts/smoke.py",
                       "--test-path", installDir, "smokeClient"]))
 env.Alias("clientBuild", [mongod, installDir], [build_and_test_client])
 env.AlwaysBuild("clientBuild")
-env.Alias("clientDist", ["clientBuild", "dist"], [])
-env.AlwaysBuild("clientDist")
 
 def clean_old_dist_builds(env, target, source):
     prefix = "mongodb-%s-%s" % (platform, processor)
diff --git a/db/db.vcxproj b/db/db.vcxproj
index a991eb9a60b..d1e52aeb219 100644
--- a/db/db.vcxproj
+++ b/db/db.vcxproj
@@ -466,6 +466,7 @@
     <ClCompile Include="repl\rs_rollback.cpp" />

     <ClCompile Include="repl\rs_sync.cpp" />

     <ClCompile Include="repl_block.cpp" />

+    <ClCompile Include="restapi.cpp" />

     <ClCompile Include="storage.cpp" />

     <ClCompile Include="..\client\connpool.cpp" />

     <ClCompile Include="..\client\dbclient.cpp" />

diff --git a/db/db.vcxproj.filters b/db/db.vcxproj.filters
index cfb31f2ded4..36658f0a62a 100755
--- a/db/db.vcxproj.filters
+++ b/db/db.vcxproj.filters
@@ -397,6 +397,9 @@
     <ClCompile Include="..\util\processinfo.cpp">

       <Filter>util</Filter>

     </ClCompile>

+    <ClCompile Include="restapi.cpp">

+      <Filter>db</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="repl\rs_config.h">

diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
index 63782064dfd..8a8bae9d012 100644
--- a/distsrc/client/SConstruct
+++ b/distsrc/client/SConstruct
@@ -54,12 +54,12 @@ allClientFiles += Glob( "mongo/scripting/*.cpp" )
 allClientFiles += Glob( "mongo/util/*.cpp" )
 allClientFiles += Glob( "mongo/util/*.c" )
 
-env.Library( "mongoclient" , allClientFiles )
 env.SharedLibrary( "mongoclient" , allClientFiles )
+env.Library( "mongoclient" , allClientFiles )
 
 clientTests = []
 clientEnv = env.Clone();
-clientEnv.Prepend( LIBS=["mongoclient"])
+clientEnv.Prepend( LIBS=["libmongoclient.a"])
 clientEnv.Prepend( LIBPATH=["."] )
 
 # examples
@@ -69,3 +69,4 @@ clientTests += [ clientEnv.Program( "whereExample" , [ "client/examples/whereExa
 clientTests += [ clientEnv.Program( "authTest" , [ "client/examples/authTest.cpp" ] ) ]
 clientTests += [ clientEnv.Program( "httpClientTest" , [ "client/examples/httpClientTest.cpp" ] ) ]
 clientTests += [ clientEnv.Program( "clientTest" , [ "client/examples/clientTest.cpp" ] ) ]
+clientEnv.Alias("clientTests", clientTests, [])