SERVER-6591 Visual Studio -- adapt to renamed and added files

8 files changed, 34 insertions, 18 deletions

diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
index 12f479c0870..f39b5007d91 100755
--- a/src/mongo/db/mongod.vcxproj
+++ b/src/mongo/db/mongod.vcxproj
@@ -1014,7 +1014,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4141</DisableSpecificWarnings>

     </ClCompile>

     <ClCompile Include="..\bson\oid.cpp" />

-    <ClCompile Include="..\client\authentication_table.cpp" />

+    <ClCompile Include="..\client\authentication_table_common.cpp" />

+    <ClCompile Include="..\client\authentication_table_server.cpp" />

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

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

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

@@ -1539,4 +1540,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
index 769dadd1410..5387a6548bf 100755
--- a/src/mongo/db/mongod.vcxproj.filters
+++ b/src/mongo/db/mongod.vcxproj.filters
@@ -875,9 +875,6 @@
     <ClCompile Include="..\util\touch_pages.cpp">

       <Filter>util\Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\client\authentication_table.cpp">

-      <Filter>client\Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="hashindex.cpp">

       <Filter>db\Source Files\e to n</Filter>

     </ClCompile>

@@ -914,6 +911,12 @@
     <ClCompile Include="pipeline\pipeline_d.cpp">

       <Filter>db\pipeline\Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\client\authentication_table_common.cpp">

+      <Filter>client\Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\client\authentication_table_server.cpp">

+      <Filter>client\Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\targetver.h" />

@@ -1818,4 +1821,4 @@
       <Filter>db\Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
index 0a9a94f6bef..d86d3399645 100644
--- a/src/mongo/dbtests/test.vcxproj
+++ b/src/mongo/dbtests/test.vcxproj
@@ -1186,7 +1186,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4141</DisableSpecificWarnings>

     </ClCompile>

     <ClCompile Include="..\bson\oid.cpp" />

-    <ClCompile Include="..\client\authentication_table.cpp" />

+    <ClCompile Include="..\client\authentication_table_common.cpp" />

+    <ClCompile Include="..\client\authentication_table_server.cpp" />

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

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

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

diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
index 020b80c41e9..4c7c2aa615b 100755
--- a/src/mongo/dbtests/test.vcxproj.filters
+++ b/src/mongo/dbtests/test.vcxproj.filters
@@ -1486,9 +1486,6 @@
     <ClCompile Include="..\util\touch_pages.cpp">

       <Filter>util\Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\client\authentication_table.cpp">

-      <Filter>client</Filter>

-    </ClCompile>

     <ClCompile Include="histogram_test.cpp">

       <Filter>dbtests</Filter>

     </ClCompile>

@@ -1519,6 +1516,12 @@
     <ClCompile Include="..\..\third_party\murmurhash3\MurmurHash3.cpp">

       <Filter>third_party\MurmurHash3</Filter>

     </ClCompile>

+    <ClCompile Include="..\client\authentication_table_common.cpp">

+      <Filter>client</Filter>

+    </ClCompile>

+    <ClCompile Include="..\client\authentication_table_server.cpp">

+      <Filter>client</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="btreetests.inl">

diff --git a/src/mongo/s/mongos.vcxproj b/src/mongo/s/mongos.vcxproj
index fe291d42cd1..d5dbe51a5d2 100644
--- a/src/mongo/s/mongos.vcxproj
+++ b/src/mongo/s/mongos.vcxproj
@@ -975,7 +975,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4334</DisableSpecificWarnings>

     </ClCompile>

     <ClCompile Include="..\bson\oid.cpp" />

-    <ClCompile Include="..\client\authentication_table.cpp" />

+    <ClCompile Include="..\client\authentication_table_common.cpp" />

+    <ClCompile Include="..\client\authentication_table_server.cpp" />

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

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

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

@@ -1269,4 +1270,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/src/mongo/s/mongos.vcxproj.filters b/src/mongo/s/mongos.vcxproj.filters
index 5019568a894..585b6558c79 100755
--- a/src/mongo/s/mongos.vcxproj.filters
+++ b/src/mongo/s/mongos.vcxproj.filters
@@ -717,9 +717,6 @@
     <ClCompile Include="..\util\time_support.cpp">

       <Filter>util\Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\client\authentication_table.cpp">

-      <Filter>client</Filter>

-    </ClCompile>

     <ClCompile Include="..\client\connection_factory.cpp">

       <Filter>client</Filter>

     </ClCompile>

@@ -732,6 +729,12 @@
     <ClCompile Include="..\db\pipeline\pipeline.cpp">

       <Filter>db\pipeline\Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\client\authentication_table_common.cpp">

+      <Filter>client</Filter>

+    </ClCompile>

+    <ClCompile Include="..\client\authentication_table_server.cpp">

+      <Filter>client</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\pch.h" />

@@ -1074,4 +1077,4 @@
       <Filter>third_party\SpiderMonkey\Header Files</Filter>

     </None>

   </ItemGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/src/mongo/shell/mongo.vcxproj b/src/mongo/shell/mongo.vcxproj
index 5fc8aff9adf..a9e09c1891d 100755
--- a/src/mongo/shell/mongo.vcxproj
+++ b/src/mongo/shell/mongo.vcxproj
@@ -863,7 +863,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">4355;4800;4267;4244;4334</DisableSpecificWarnings>

       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4334</DisableSpecificWarnings>

     </ClCompile>

-    <ClCompile Include="..\client\authentication_table.cpp" />

+    <ClCompile Include="..\client\authentication_table_client.cpp" />

+    <ClCompile Include="..\client\authentication_table_common.cpp" />

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

     <ClCompile Include="..\db\dbmessage.cpp" />

     <ClCompile Include="..\util\concurrency\mutexdebugger.cpp" />

diff --git a/src/mongo/shell/mongo.vcxproj.filters b/src/mongo/shell/mongo.vcxproj.filters
index c530723a23a..1e493e9e2da 100644
--- a/src/mongo/shell/mongo.vcxproj.filters
+++ b/src/mongo/shell/mongo.vcxproj.filters
@@ -509,7 +509,10 @@
     <ClCompile Include="..\util\concurrency\mutexdebugger.cpp">

       <Filter>util\concurrency</Filter>

     </ClCompile>

-    <ClCompile Include="..\client\authentication_table.cpp">

+    <ClCompile Include="..\client\authentication_table_common.cpp">

+      <Filter>client</Filter>

+    </ClCompile>

+    <ClCompile Include="..\client\authentication_table_client.cpp">

       <Filter>client</Filter>

     </ClCompile>

   </ItemGroup>