Visual Studio -- add, remove, rename, move files

mongodb · Jul 19, 2013 · 8d9a893 · 8d9a893
1 parent 83d3c89
commit 8d9a893
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 40 deletions.
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
@@ -2084,6 +2084,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\bson\oid.cpp" />
+    <ClCompile Include="..\bson\optime.cpp" />
     <ClCompile Include="..\bson\util\bson_extract.cpp" />
     <ClCompile Include="..\client\dbclientcursor.cpp" />
     <ClCompile Include="..\client\dbclient_rs.cpp" />
@@ -2412,6 +2413,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="commands\write_commands\write_commands.cpp" />
+    <ClCompile Include="database_holder.cpp" />
     <ClCompile Include="exec\and_hash.cpp" />
     <ClCompile Include="exec\and_sorted.cpp" />
     <ClCompile Include="exec\collection_iterator.cpp" />
@@ -3618,7 +3620,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClCompile Include="key.cpp" />
     <ClCompile Include="lockstat.cpp" />
     <ClCompile Include="lockstate.cpp" />
-    <ClCompile Include="mongommf.cpp" />
     <ClCompile Include="namespace_details.cpp" />
     <ClCompile Include="ops\count.cpp" />
     <ClCompile Include="ops\delete.cpp" />
@@ -3665,7 +3666,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClCompile Include="repl\master_slave.cpp" />
     <ClCompile Include="repl\oplog.cpp" />
     <ClCompile Include="repl\oplogreader.cpp" />
-    <ClCompile Include="repl\optime.cpp" />
     <ClCompile Include="repl\replication_server_status.cpp" />
     <ClCompile Include="repl\replset_web_handler.cpp" />
     <ClCompile Include="repl\repl_reads_ok.cpp" />
@@ -3705,6 +3705,10 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     </ClCompile>
     <ClCompile Include="stats\snapshots_webplugins.cpp" />
     <ClCompile Include="stats\timer_stats.cpp" />
+    <ClCompile Include="storage\data_file.cpp" />
+    <ClCompile Include="storage\durable_mapped_file.cpp" />
+    <ClCompile Include="storage\extent.cpp" />
+    <ClCompile Include="storage\extent_manager.cpp" />
     <ClCompile Include="storage\namespace.cpp" />
     <ClCompile Include="storage\namespace_index.cpp" />
     <ClCompile Include="storage\namespace_test.cpp">
@@ -4157,6 +4161,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\bson\optime.h" />
     <ClInclude Include="..\bson\util\bson_extract.h" />
     <ClInclude Include="..\client\authlevel.h" />
     <ClInclude Include="..\client\constants.h" />
@@ -4245,6 +4250,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="commands\write_commands\batch.h" />
     <ClInclude Include="commands\write_commands\batch_executor.h" />
     <ClInclude Include="commands\write_commands\write_commands.h" />
+    <ClInclude Include="database_holder.h" />
     <ClInclude Include="exec\and_common-inl.h" />
     <ClInclude Include="exec\and_hash.h" />
     <ClInclude Include="exec\and_sorted.h" />
@@ -4578,7 +4584,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="repl\master_slave.h" />
     <ClInclude Include="repl\oplog.h" />
     <ClInclude Include="repl\oplogreader.h" />
-    <ClInclude Include="repl\optime.h" />
     <ClInclude Include="repl\replication_server_status.h" />
     <ClInclude Include="repl\repl_reads_ok.h" />
     <ClInclude Include="repl\repl_start.h" />
@@ -4594,6 +4599,10 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="sort_phase_one.h" />
     <ClInclude Include="stats\fine_clock.h" />
     <ClInclude Include="stats\timer_stats.h" />
+    <ClInclude Include="storage\data_file.h" />
+    <ClInclude Include="storage\durable_mapped_file.h" />
+    <ClInclude Include="storage\extent.h" />
+    <ClInclude Include="storage\extent_manager.h" />
     <ClInclude Include="storage\namespace-inl.h" />
     <ClInclude Include="storage\namespace.h" />
     <ClInclude Include="storage\namespace_index.h" />
@@ -4766,7 +4775,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\util\trace.h" />
     <ClInclude Include="pipeline\pipeline.h" />
     <ClInclude Include="pipeline\pipeline_d.h" />
-    <ClInclude Include="databaseholder.h" />
     <ClInclude Include="durop.h" />
     <ClInclude Include="dur_commitjob.h" />
     <ClInclude Include="dur_journal.h" />
@@ -4779,7 +4787,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="instance.h" />
     <ClInclude Include="interrupt_status.h" />
     <ClInclude Include="interrupt_status_mongod.h" />
-    <ClInclude Include="mongommf.h" />
     <ClInclude Include="ops\count.h" />
     <ClInclude Include="ops\delete.h" />
     <ClInclude Include="ops\update.h" />

diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
@@ -632,9 +632,6 @@
     <ClCompile Include="module.cpp">
       <Filter>db\Source Files\e to n</Filter>
     </ClCompile>
-    <ClCompile Include="mongommf.cpp">
-      <Filter>db\Source Files\e to n</Filter>
-    </ClCompile>
     <ClCompile Include="namespace_details.cpp">
       <Filter>db\Source Files\e to n</Filter>
     </ClCompile>
@@ -1745,9 +1742,6 @@
     <ClCompile Include="repl\oplogreader.cpp">
       <Filter>db\repl</Filter>
     </ClCompile>
-    <ClCompile Include="repl\optime.cpp">
-      <Filter>db\repl</Filter>
-    </ClCompile>
     <ClCompile Include="repl\repl_reads_ok.cpp">
       <Filter>db\repl</Filter>
     </ClCompile>
@@ -2414,6 +2408,24 @@
     <ClCompile Include="exec\collection_scan.cpp">
       <Filter>db\exec</Filter>
     </ClCompile>
+    <ClCompile Include="database_holder.cpp">
+      <Filter>db\Source Files\a to d</Filter>
+    </ClCompile>
+    <ClCompile Include="storage\data_file.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="storage\durable_mapped_file.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="storage\extent.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="storage\extent_manager.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\bson\optime.cpp">
+      <Filter>bson</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\third_party\snappy\config.h">
@@ -2786,9 +2798,6 @@
     <ClInclude Include="database.h">
       <Filter>db\Header Files\a to d</Filter>
     </ClInclude>
-    <ClInclude Include="databaseholder.h">
-      <Filter>db\Header Files\a to d</Filter>
-    </ClInclude>
     <ClInclude Include="db.h">
       <Filter>db\Header Files\a to d</Filter>
     </ClInclude>
@@ -2852,9 +2861,6 @@
     <ClInclude Include="matcher.h">
       <Filter>db\Header Files\e to n</Filter>
     </ClInclude>
-    <ClInclude Include="mongommf.h">
-      <Filter>db\Header Files\e to n</Filter>
-    </ClInclude>
     <ClInclude Include="namespace_details-inl.h">
       <Filter>db\Header Files\e to n</Filter>
     </ClInclude>
@@ -4352,9 +4358,6 @@
     <ClInclude Include="repl\oplogreader.h">
       <Filter>db\repl</Filter>
     </ClInclude>
-    <ClInclude Include="repl\optime.h">
-      <Filter>db\repl</Filter>
-    </ClInclude>
     <ClInclude Include="repl\repl_reads_ok.h">
       <Filter>db\repl</Filter>
     </ClInclude>
@@ -4854,6 +4857,24 @@
     <ClInclude Include="exec\collection_scan_common.h">
       <Filter>db\exec</Filter>
     </ClInclude>
+    <ClInclude Include="database_holder.h">
+      <Filter>db\Header Files\a to d</Filter>
+    </ClInclude>
+    <ClInclude Include="storage\data_file.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="storage\durable_mapped_file.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="storage\extent.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="storage\extent_manager.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\bson\optime.h">
+      <Filter>bson</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="mongo.ico">

diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
@@ -584,6 +584,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\bson\oid.h" />
+    <ClInclude Include="..\bson\optime.h" />
     <ClInclude Include="..\bson\ordering.h" />
     <ClInclude Include="..\base\string_data.h" />
     <ClInclude Include="..\bson\util\atomic_int.h" />
@@ -650,7 +651,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\db\commands\write_commands\write_commands.h" />
     <ClInclude Include="..\db\compact.h" />
     <ClInclude Include="..\db\curop-inl.h" />
-    <ClInclude Include="..\db\databaseholder.h" />
+    <ClInclude Include="..\db\database_holder.h" />
     <ClInclude Include="..\db\dur.h" />
     <ClInclude Include="..\db\durop.h" />
     <ClInclude Include="..\db\dur_commitjob.h" />
@@ -756,7 +757,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\db\matcher_covered.h" />
     <ClInclude Include="..\db\memconcept.h" />
     <ClInclude Include="..\db\module.h" />
-    <ClInclude Include="..\db\mongommf.h" />
     <ClInclude Include="..\db\mongomutex.h" />
     <ClInclude Include="..\db\namespace_details-inl.h" />
     <ClInclude Include="..\db\namespace_details.h" />
@@ -826,7 +826,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\db\repl\multicmd.h" />
     <ClInclude Include="..\db\repl\oplog.h" />
     <ClInclude Include="..\db\repl\oplogreader.h" />
-    <ClInclude Include="..\db\repl\optime.h" />
     <ClInclude Include="..\db\repl\replication_server_status.h" />
     <ClInclude Include="..\db\repl\repl_reads_ok.h" />
     <ClInclude Include="..\db\repl\repl_start.h" />
@@ -848,6 +847,10 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\db\stats\snapshots.h" />
     <ClInclude Include="..\db\stats\timer_stats.h" />
     <ClInclude Include="..\db\stats\top.h" />
+    <ClInclude Include="..\db\storage\data_file.h" />
+    <ClInclude Include="..\db\storage\durable_mapped_file.h" />
+    <ClInclude Include="..\db\storage\extent.h" />
+    <ClInclude Include="..\db\storage\extent_manager.h" />
     <ClInclude Include="..\db\storage\namespace-inl.h" />
     <ClInclude Include="..\db\storage\namespace.h" />
     <ClInclude Include="..\db\storage\namespace_index.h" />
@@ -2367,6 +2370,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\bson\oid.cpp" />
+    <ClCompile Include="..\bson\optime.cpp" />
     <ClCompile Include="..\bson\util\bson_extract.cpp" />
     <ClCompile Include="..\client\dbclientcursor.cpp" />
     <ClCompile Include="..\client\dbclient_rs.cpp" />
@@ -2541,6 +2545,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClCompile Include="..\db\commands\write_commands\write_commands.cpp" />
     <ClCompile Include="..\db\compact.cpp" />
     <ClCompile Include="..\db\curop.cpp" />
+    <ClCompile Include="..\db\database_holder.cpp" />
     <ClCompile Include="..\db\dbcommands_admin.cpp" />
     <ClCompile Include="..\db\dbcommands_generic.cpp" />
     <ClCompile Include="..\db\dur.cpp" />
@@ -3145,7 +3150,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\db\mongommf.cpp" />
     <ClCompile Include="..\db\namespace_details.cpp" />
     <ClCompile Include="..\db\namespace_string_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -3392,7 +3396,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClCompile Include="..\db\repl\master_slave.cpp" />
     <ClCompile Include="..\db\repl\oplog.cpp" />
     <ClCompile Include="..\db\repl\oplogreader.cpp" />
-    <ClCompile Include="..\db\repl\optime.cpp" />
     <ClCompile Include="..\db\repl\replication_server_status.cpp" />
     <ClCompile Include="..\db\repl\replset_web_handler.cpp" />
     <ClCompile Include="..\db\repl\repl_reads_ok.cpp" />
@@ -3440,6 +3443,10 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClCompile Include="..\db\stats\service_stats.cpp" />
     <ClCompile Include="..\db\stats\snapshots_webplugins.cpp" />
     <ClCompile Include="..\db\stats\timer_stats.cpp" />
+    <ClCompile Include="..\db\storage\data_file.cpp" />
+    <ClCompile Include="..\db\storage\durable_mapped_file.cpp" />
+    <ClCompile Include="..\db\storage\extent.cpp" />
+    <ClCompile Include="..\db\storage\extent_manager.cpp" />
     <ClCompile Include="..\db\storage\namespace.cpp" />
     <ClCompile Include="..\db\storage\namespace_index.cpp" />
     <ClCompile Include="..\db\storage\namespace_test.cpp">

diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
@@ -445,9 +445,6 @@
     <ClInclude Include="..\db\database.h">
       <Filter>db\Header Files\a to d</Filter>
     </ClInclude>
-    <ClInclude Include="..\db\databaseholder.h">
-      <Filter>db\Header Files\a to d</Filter>
-    </ClInclude>
     <ClInclude Include="..\db\db.h">
       <Filter>db\Header Files\a to d</Filter>
     </ClInclude>
@@ -544,9 +541,6 @@
     <ClInclude Include="..\db\dur_journal.h">
       <Filter>db\Header Files\a to d</Filter>
     </ClInclude>
-    <ClInclude Include="..\db\mongommf.h">
-      <Filter>db\Header Files\e to n</Filter>
-    </ClInclude>
     <ClInclude Include="..\util\logfile.h">
       <Filter>util\Header Files</Filter>
     </ClInclude>
@@ -2180,9 +2174,6 @@
     <ClInclude Include="..\db\repl\oplogreader.h">
       <Filter>db\repl</Filter>
     </ClInclude>
-    <ClInclude Include="..\db\repl\optime.h">
-      <Filter>db\repl</Filter>
-    </ClInclude>
     <ClInclude Include="..\db\repl\repl_reads_ok.h">
       <Filter>db\repl</Filter>
     </ClInclude>
@@ -2754,6 +2745,24 @@
     <ClInclude Include="..\db\exec\collection_scan_common.h">
       <Filter>db\exec</Filter>
     </ClInclude>
+    <ClInclude Include="..\db\database_holder.h">
+      <Filter>db\Header Files\a to d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\db\storage\data_file.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\db\storage\durable_mapped_file.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\db\storage\extent.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\db\storage\extent_manager.h">
+      <Filter>db\storage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\bson\optime.h">
+      <Filter>bson</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\client\connpool.cpp">
@@ -3294,9 +3303,6 @@
     <ClCompile Include="..\db\dur_preplogbuffer.cpp">
       <Filter>db\Source Files\a to d</Filter>
     </ClCompile>
-    <ClCompile Include="..\db\mongommf.cpp">
-      <Filter>db\Source Files\e to n</Filter>
-    </ClCompile>
     <ClCompile Include="..\util\logfile.cpp">
       <Filter>util\Source Files</Filter>
     </ClCompile>
@@ -4681,9 +4687,6 @@
     <ClCompile Include="..\db\repl\oplogreader.cpp">
       <Filter>db\repl</Filter>
     </ClCompile>
-    <ClCompile Include="..\db\repl\optime.cpp">
-      <Filter>db\repl</Filter>
-    </ClCompile>
     <ClCompile Include="..\db\repl\repl_reads_ok.cpp">
       <Filter>db\repl</Filter>
     </ClCompile>
@@ -5302,6 +5305,24 @@
     <ClCompile Include="query_stage_collscan.cpp">
       <Filter>dbtests</Filter>
     </ClCompile>
+    <ClCompile Include="..\db\database_holder.cpp">
+      <Filter>db\Source Files\a to d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\db\storage\data_file.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\db\storage\durable_mapped_file.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\db\storage\extent.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\db\storage\extent_manager.cpp">
+      <Filter>db\storage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\bson\optime.cpp">
+      <Filter>bson</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="btreetests.inl">

diff --git a/src/mongo/s/mongos.vcxproj b/src/mongo/s/mongos.vcxproj
@@ -1994,6 +1994,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\bson\oid.cpp" />
+    <ClCompile Include="..\bson\optime.cpp" />
     <ClCompile Include="..\bson\util\bson_extract.cpp" />
     <ClCompile Include="..\client\dbclientcursor.cpp" />
     <ClCompile Include="..\client\dbclient_rs.cpp" />
@@ -3701,6 +3702,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\bson\oid.h" />
+    <ClInclude Include="..\bson\optime.h" />
     <ClInclude Include="..\bson\ordering.h" />
     <ClInclude Include="..\base\string_data.h" />
     <ClInclude Include="..\bson\util\atomic_int.h" />