SERVER-7565 SERVER-7126 SERVER-7576 Visual Studio require Python, run Python scripts

This commit makes the Visual Studio builds require Python to be installed.

Add Pre-Build Events to Visual Studio projects to run the same Python
scripts that the scons build runs to create src/mongo/base/error_codes.cpp,
src/mongo/base/error_codes.h, src/mongo/db/auth/action_type.h and
src/mongo/db/auth/action_type.cpp.

10 files changed, 334 insertions, 92 deletions

diff --git a/.gitignore b/.gitignore
index d7be8c396f0..8b9786a27e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,7 +97,6 @@ scratch
 /libmongotestfiles.*
 /libmongoshellfiles.*
 
-
 /emr.jar
 *.class
 
@@ -135,15 +134,20 @@ debian/mongodb
 *.includes
 *.orig
 
+#built by Visual Studio
+src/mongo/base/error_codes.cpp
+src/mongo/base/error_codes.h
+src/mongo/db/auth/action_type.cpp
+src/mongo/db/auth/action_type.h
+src/mongo/shell/mongo-server.cpp
+src/mongo/shell/mongo.cpp
+src/third_party/js-1.7/jsautocfg.h
+src/third_party/js-1.7/jsautokw.h
 
 # old things that should be removed
 # maybe remove this mid 2012
 src/third_party/js-1.7/jscpucfg
 src/third_party/js-1.7/jskwgen
 src/mongo/buildinfo.cpp
-src/mongo/shell/mongo-server.cpp
-src/mongo/shell/mongo.cpp
-src/third_party/js-1.7/jsautocfg.h
-src/third_party/js-1.7/jsautokw.h
 buildinfo.cpp
 /.settings/
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
index d105058024b..f7c6331bfe9 100755
--- a/src/mongo/db/mongod.vcxproj
+++ b/src/mongo/db/mongod.vcxproj
@@ -203,7 +203,9 @@
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -235,7 +237,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -265,7 +269,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -295,7 +301,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -329,7 +337,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -363,7 +373,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -394,7 +406,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -425,7 +439,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -1029,6 +1045,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp" />

     <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp" />

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

+    <ClCompile Include="..\bson\util\bson_extract.cpp" />

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

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

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

@@ -1312,6 +1329,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\bson\mutable\mutable_bson_builder.h" />

     <ClInclude Include="..\bson\mutable\mutable_bson_heap.h" />

     <ClInclude Include="..\bson\mutable\mutable_bson_internal.h" />

+    <ClInclude Include="..\bson\util\bson_extract.h" />

     <ClInclude Include="..\client\authentication_table.h" />

     <ClInclude Include="..\platform\atomic_intrinsics.h" />

     <ClInclude Include="..\platform\atomic_intrinsics_win32.h" />

@@ -1351,6 +1369,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\util\timer-win32-inl.h" />

     <ClInclude Include="..\util\timer.h" />

     <ClInclude Include="..\util\touch_pages.h" />

+    <ClInclude Include="auth\acquired_capability.h" />

     <ClInclude Include="auth\action_set.h" />

     <ClInclude Include="auth\action_type.h" />

     <ClInclude Include="auth\authentication_session.h" />

@@ -1487,6 +1506,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <ItemGroup>

     <None Include="..\..\third_party\js-1.7\jskeyword.tbl" />

     <None Include="..\..\third_party\js-1.7\jsopcode.tbl" />

+    <None Include="..\..\third_party\run_if_newer.js" />

     <None Include="..\base\error_codes.err" />

     <None Include="..\base\generate_error_codes.py" />

     <None Include="..\util\mongoutils\README" />

diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
index 0a99b823f54..44d38c33d42 100755
--- a/src/mongo/db/mongod.vcxproj.filters
+++ b/src/mongo/db/mongod.vcxproj.filters
@@ -1043,6 +1043,9 @@
     <ClCompile Include="..\base\error_codes.cpp">

       <Filter>base</Filter>

     </ClCompile>

+    <ClCompile Include="..\bson\util\bson_extract.cpp">

+      <Filter>bson\util</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -1989,6 +1992,12 @@
     <ClInclude Include="..\util\fail_point_service.h">

       <Filter>util\Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="..\bson\util\bson_extract.h">

+      <Filter>bson\util</Filter>

+    </ClInclude>

+    <ClInclude Include="auth\acquired_capability.h">

+      <Filter>db\auth</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="mongo.ico">

@@ -2015,6 +2024,9 @@
     <None Include="..\base\error_codes.err">

       <Filter>base</Filter>

     </None>

+    <None Include="..\..\third_party\run_if_newer.js">

+      <Filter>third_party</Filter>

+    </None>

   </ItemGroup>

   <ItemGroup>

     <Filter Include="db">

diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
index 823507e427b..b531718a518 100644
--- a/src/mongo/dbtests/test.vcxproj
+++ b/src/mongo/dbtests/test.vcxproj
@@ -202,7 +202,8 @@
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -234,7 +235,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -263,7 +265,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -292,7 +295,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -324,7 +328,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -356,7 +361,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -386,7 +392,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -416,7 +423,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -499,10 +507,15 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\bson\bson_db.h" />

     <ClInclude Include="..\bson\bson_field.h" />

     <ClInclude Include="..\bson\inline_decls.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_builder.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_heap.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_internal.h" />

     <ClInclude Include="..\bson\oid.h" />

     <ClInclude Include="..\bson\ordering.h" />

     <ClInclude Include="..\base\string_data.h" />

     <ClInclude Include="..\bson\util\atomic_int.h" />

+    <ClInclude Include="..\bson\util\bson_extract.h" />

     <ClInclude Include="..\bson\util\builder.h" />

     <ClInclude Include="..\bson\util\misc.h" />

     <ClInclude Include="..\client\authentication_table.h" />

@@ -519,7 +532,6 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\db\dur_journal.h" />

     <ClInclude Include="..\db\d_concurrency.h" />

     <ClInclude Include="..\db\explain.h" />

-    <ClInclude Include="..\db\fail_point_service.h" />

     <ClInclude Include="..\db\geo\core.h" />

     <ClInclude Include="..\db\geo\hash.h" />

     <ClInclude Include="..\db\geo\shapes.h" />

@@ -623,6 +635,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\util\elapsed_tracker.h" />

     <ClInclude Include="..\util\fail_point.h" />

     <ClInclude Include="..\util\fail_point_registry.h" />

+    <ClInclude Include="..\util\fail_point_service.h" />

     <ClInclude Include="..\util\file.h" />

     <ClInclude Include="..\util\goodies.h" />

     <ClInclude Include="..\util\hashtab.h" />

@@ -1238,6 +1251,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4141</DisableSpecificWarnings>

     </ClCompile>

     <ClCompile Include="..\base\configuration_variable_manager.cpp" />

+    <ClCompile Include="..\base\error_codes.cpp" />

     <ClCompile Include="..\base\global_initializer.cpp" />

     <ClCompile Include="..\base\global_initializer_registerer.cpp" />

     <ClCompile Include="..\base\init.cpp" />

@@ -1247,7 +1261,12 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\base\make_string_vector.cpp" />

     <ClCompile Include="..\base\parse_number.cpp" />

     <ClCompile Include="..\base\status.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_builder.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp" />

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

+    <ClCompile Include="..\bson\util\bson_extract.cpp" />

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

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

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

@@ -1277,7 +1296,6 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\db\d_concurrency.cpp" />

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

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

-    <ClCompile Include="..\db\fail_point_service.cpp" />

     <ClCompile Include="..\db\geo\2d.cpp" />

     <ClCompile Include="..\db\geo\hash.cpp" />

     <ClCompile Include="..\db\geo\haystack.cpp" />

@@ -1317,16 +1335,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\db\security_common.cpp" />

     <ClCompile Include="..\platform\random.cpp" />

     <ClCompile Include="..\scripting\bson_template_evaluator.cpp" />

-    <ClCompile Include="..\scripting\sm_db.cpp">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>

-    </ClCompile>

+    <ClCompile Include="..\scripting\sm_db.cpp" />

     <ClCompile Include="..\s\cluster_constants.cpp" />

     <ClCompile Include="..\s\default_version.cpp" />

     <ClCompile Include="..\..\third_party\pcre-8.30\pcrecpp.cc" />

@@ -1405,6 +1414,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\util\elapsed_tracker.cpp" />

     <ClCompile Include="..\util\fail_point.cpp" />

     <ClCompile Include="..\util\fail_point_registry.cpp" />

+    <ClCompile Include="..\util\fail_point_service.cpp" />

     <ClCompile Include="..\util\file_allocator.cpp" />

     <ClCompile Include="..\util\histogram.cpp" />

     <ClCompile Include="..\util\log.cpp" />

@@ -1511,6 +1521,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\db\repl\rs_config.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <None Include="..\base\error_codes.err" />

+    <None Include="..\base\generate_error_codes.py" />

     <None Include="btreetests.inl" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
index dd55e378c11..61ae56fcfd1 100755
--- a/src/mongo/dbtests/test.vcxproj.filters
+++ b/src/mongo/dbtests/test.vcxproj.filters
@@ -119,6 +119,9 @@
     <Filter Include="db\auth">

       <UniqueIdentifier>{f05caff2-28ae-48ec-87b2-ee00d8c9012d}</UniqueIdentifier>

     </Filter>

+    <Filter Include="bson\mutable">

+      <UniqueIdentifier>{96220e3c-7484-4511-b445-b3d10f98df61}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\client\connpool.h">

@@ -750,9 +753,6 @@
     <ClInclude Include="..\base\status.h">

       <Filter>base</Filter>

     </ClInclude>

-    <ClInclude Include="..\db\fail_point_service.h">

-      <Filter>db\Header Files\e to n</Filter>

-    </ClInclude>

     <ClInclude Include="..\util\fail_point.h">

       <Filter>util\Header Files</Filter>

     </ClInclude>

@@ -822,6 +822,24 @@
     <ClInclude Include="..\db\auth\mongo_authentication_session.h">

       <Filter>db\auth</Filter>

     </ClInclude>

+    <ClInclude Include="..\util\fail_point_service.h">

+      <Filter>util\Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\util\bson_extract.h">

+      <Filter>bson\util</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_builder.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_heap.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_internal.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

@@ -1720,9 +1738,6 @@
     <ClCompile Include="..\base\status.cpp">

       <Filter>base</Filter>

     </ClCompile>

-    <ClCompile Include="..\db\fail_point_service.cpp">

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

-    </ClCompile>

     <ClCompile Include="..\util\fail_point.cpp">

       <Filter>util\Source Files</Filter>

     </ClCompile>

@@ -1762,10 +1777,37 @@
     <ClCompile Include="..\db\auth\mongo_authentication_session.cpp">

       <Filter>db\auth</Filter>

     </ClCompile>

+    <ClCompile Include="..\base\error_codes.cpp">

+      <Filter>base</Filter>

+    </ClCompile>

+    <ClCompile Include="..\util\fail_point_service.cpp">

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

+    </ClCompile>

+    <ClCompile Include="..\bson\util\bson_extract.cpp">

+      <Filter>bson\util</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_builder.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="btreetests.inl">

       <Filter>dbtests</Filter>

     </None>

+    <None Include="..\base\error_codes.err">

+      <Filter>base</Filter>

+    </None>

+    <None Include="..\base\generate_error_codes.py">

+      <Filter>base</Filter>

+    </None>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/mongo/s/mongos.vcxproj b/src/mongo/s/mongos.vcxproj
index e31b35d65ca..c3a87771c4b 100644
--- a/src/mongo/s/mongos.vcxproj
+++ b/src/mongo/s/mongos.vcxproj
@@ -189,7 +189,9 @@
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -218,7 +220,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -245,7 +249,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -272,7 +278,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -304,7 +312,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -336,7 +346,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -366,7 +378,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -396,7 +410,9 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\db\auth" /input:"generate_action_types.py,action_types.txt" /output:"action_type.h,action_type.cpp" /command:"python generate_action_types.py action_types.txt action_type.h action_type.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -975,6 +991,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4334</DisableSpecificWarnings>

     </ClCompile>

     <ClCompile Include="..\base\configuration_variable_manager.cpp" />

+    <ClCompile Include="..\base\error_codes.cpp" />

     <ClCompile Include="..\base\global_initializer.cpp" />

     <ClCompile Include="..\base\global_initializer_registerer.cpp" />

     <ClCompile Include="..\base\init.cpp" />

@@ -984,7 +1001,12 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\base\make_string_vector.cpp" />

     <ClCompile Include="..\base\parse_number.cpp" />

     <ClCompile Include="..\base\status.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_builder.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp" />

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

+    <ClCompile Include="..\bson\util\bson_extract.cpp" />

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

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

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

@@ -992,13 +1014,15 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\client\distlock.cpp" />

     <ClCompile Include="..\db\auth\action_set.cpp" />

     <ClCompile Include="..\db\auth\action_type.cpp" />

+    <ClCompile Include="..\db\auth\authorization_manager.cpp" />

     <ClCompile Include="..\db\auth\capability.cpp" />

     <ClCompile Include="..\db\auth\capability_set.cpp" />

+    <ClCompile Include="..\db\auth\external_state.cpp" />

     <ClCompile Include="..\db\auth\mongo_authentication_session.cpp" />

     <ClCompile Include="..\db\auth\principal.cpp" />

     <ClCompile Include="..\db\auth\principal_set.cpp" />

+    <ClCompile Include="..\db\commands\fail_point_cmd.cpp" />

     <ClCompile Include="..\db\commands\server_status.cpp" />

-    <ClCompile Include="..\db\fail_point_service.cpp" />

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

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

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

@@ -1044,16 +1068,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\platform\random.cpp" />

     <ClCompile Include="..\scripting\bench.cpp" />

     <ClCompile Include="..\scripting\bson_template_evaluator.cpp" />

-    <ClCompile Include="..\scripting\sm_db.cpp">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>

-    </ClCompile>

+    <ClCompile Include="..\scripting\sm_db.cpp" />

     <ClCompile Include="..\util\alignedbuilder.cpp" />

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

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

@@ -1062,6 +1077,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\util\concurrency\thread_pool.cpp" />

     <ClCompile Include="..\util\fail_point.cpp" />

     <ClCompile Include="..\util\fail_point_registry.cpp" />

+    <ClCompile Include="..\util\fail_point_service.cpp" />

     <ClCompile Include="..\util\intrusive_counter.cpp" />

     <ClCompile Include="..\util\log.cpp" />

     <ClCompile Include="..\util\net\miniwebserver.cpp" />

@@ -1245,24 +1261,33 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\bson\bson_db.h" />

     <ClInclude Include="..\bson\bson_field.h" />

     <ClInclude Include="..\bson\inline_decls.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_builder.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_heap.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_internal.h" />

     <ClInclude Include="..\bson\oid.h" />

     <ClInclude Include="..\bson\ordering.h" />

     <ClInclude Include="..\base\string_data.h" />

     <ClInclude Include="..\bson\util\atomic_int.h" />

+    <ClInclude Include="..\bson\util\bson_extract.h" />

     <ClInclude Include="..\bson\util\builder.h" />

     <ClInclude Include="..\bson\util\misc.h" />

     <ClInclude Include="..\client\authentication_table.h" />

     <ClInclude Include="..\client\authlevel.h" />

+    <ClInclude Include="..\db\auth\acquired_capability.h" />

     <ClInclude Include="..\db\auth\action_set.h" />

     <ClInclude Include="..\db\auth\action_type.h" />

     <ClInclude Include="..\db\auth\authentication_session.h" />

+    <ClInclude Include="..\db\auth\authorization_manager.h" />

     <ClInclude Include="..\db\auth\capability.h" />

     <ClInclude Include="..\db\auth\capability_set.h" />

+    <ClInclude Include="..\db\auth\external_state.h" />

+    <ClInclude Include="..\db\auth\external_state_impl.h" />

     <ClInclude Include="..\db\auth\mongo_authentication_session.h" />

     <ClInclude Include="..\db\auth\principal.h" />

     <ClInclude Include="..\db\auth\principal_set.h" />

+    <ClInclude Include="..\db\commands\fail_point_cmd.h" />

     <ClInclude Include="..\db\commands\server_status.h" />

-    <ClInclude Include="..\db\fail_point_service.h" />

     <ClInclude Include="..\db\hasher.h" />

     <ClInclude Include="..\db\initialize_server_global_state.h" />

     <ClInclude Include="..\db\keypattern.h" />

@@ -1299,6 +1324,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\util\concurrency\simplerwlock.h" />

     <ClInclude Include="..\util\fail_point.h" />

     <ClInclude Include="..\util\fail_point_registry.h" />

+    <ClInclude Include="..\util\fail_point_service.h" />

     <ClInclude Include="..\util\intrusive_counter.h" />

     <ClInclude Include="..\util\net\hostandport.h" />

     <ClInclude Include="..\util\net\listen.h" />

@@ -1359,6 +1385,10 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <ItemGroup>

     <None Include="..\..\third_party\js-1.7\jskeyword.tbl" />

     <None Include="..\..\third_party\js-1.7\jsopcode.tbl" />

+    <None Include="..\base\error_codes.err" />

+    <None Include="..\base\generate_error_codes.py" />

+    <None Include="..\db\auth\action_types.txt" />

+    <None Include="..\db\auth\generate_action_types.py" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/src/mongo/s/mongos.vcxproj.filters b/src/mongo/s/mongos.vcxproj.filters
index 480df17a28f..464a26354d5 100755
--- a/src/mongo/s/mongos.vcxproj.filters
+++ b/src/mongo/s/mongos.vcxproj.filters
@@ -90,6 +90,9 @@
     <Filter Include="db\auth">

       <UniqueIdentifier>{a8303268-06c5-45c6-9f68-93ea9e6e1348}</UniqueIdentifier>

     </Filter>

+    <Filter Include="bson\mutable">

+      <UniqueIdentifier>{785e9dc0-570b-43f5-902f-61ae605b81a8}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="balance.cpp">

@@ -777,9 +780,6 @@
     <ClCompile Include="..\base\status.cpp">

       <Filter>base</Filter>

     </ClCompile>

-    <ClCompile Include="..\db\fail_point_service.cpp">

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

-    </ClCompile>

     <ClCompile Include="..\util\fail_point.cpp">

       <Filter>util\Source Files</Filter>

     </ClCompile>

@@ -828,6 +828,36 @@
     <ClCompile Include="..\db\auth\mongo_authentication_session.cpp">

       <Filter>db\auth</Filter>

     </ClCompile>

+    <ClCompile Include="..\base\error_codes.cpp">

+      <Filter>base</Filter>

+    </ClCompile>

+    <ClCompile Include="..\db\auth\authorization_manager.cpp">

+      <Filter>db\auth</Filter>

+    </ClCompile>

+    <ClCompile Include="..\db\auth\external_state.cpp">

+      <Filter>db\auth</Filter>

+    </ClCompile>

+    <ClCompile Include="..\db\commands\fail_point_cmd.cpp">

+      <Filter>db\commands</Filter>

+    </ClCompile>

+    <ClCompile Include="..\util\fail_point_service.cpp">

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

+    </ClCompile>

+    <ClCompile Include="..\bson\util\bson_extract.cpp">

+      <Filter>bson\util</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_builder.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -1272,9 +1302,6 @@
     <ClInclude Include="..\base\status.h">

       <Filter>base</Filter>

     </ClInclude>

-    <ClInclude Include="..\db\fail_point_service.h">

-      <Filter>db\Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\util\fail_point.h">

       <Filter>util\Header Files</Filter>

     </ClInclude>

@@ -1356,6 +1383,39 @@
     <ClInclude Include="..\db\auth\mongo_authentication_session.h">

       <Filter>db\auth</Filter>

     </ClInclude>

+    <ClInclude Include="..\db\auth\acquired_capability.h">

+      <Filter>db\auth</Filter>

+    </ClInclude>

+    <ClInclude Include="..\db\auth\authorization_manager.h">

+      <Filter>db\auth</Filter>

+    </ClInclude>

+    <ClInclude Include="..\db\auth\external_state.h">

+      <Filter>db\auth</Filter>

+    </ClInclude>

+    <ClInclude Include="..\db\auth\external_state_impl.h">

+      <Filter>db\auth</Filter>

+    </ClInclude>

+    <ClInclude Include="..\db\commands\fail_point_cmd.h">

+      <Filter>db\commands</Filter>

+    </ClInclude>

+    <ClInclude Include="..\util\fail_point_service.h">

+      <Filter>util\Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\util\bson_extract.h">

+      <Filter>bson\util</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_builder.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_heap.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_internal.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\..\third_party\js-1.7\jskeyword.tbl">

@@ -1364,5 +1424,17 @@
     <None Include="..\..\third_party\js-1.7\jsopcode.tbl">

       <Filter>third_party\SpiderMonkey\Header Files</Filter>

     </None>

+    <None Include="..\base\error_codes.err">

+      <Filter>base</Filter>

+    </None>

+    <None Include="..\base\generate_error_codes.py">

+      <Filter>base</Filter>

+    </None>

+    <None Include="..\db\auth\action_types.txt">

+      <Filter>db\auth</Filter>

+    </None>

+    <None Include="..\db\auth\generate_action_types.py">

+      <Filter>db\auth</Filter>

+    </None>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/mongo/scripting/sm_db.cpp b/src/mongo/scripting/sm_db.cpp
index d33f1708a10..c9ab4d7abe7 100644
--- a/src/mongo/scripting/sm_db.cpp
+++ b/src/mongo/scripting/sm_db.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <third_party/js-1.7/jsapi.h>
+//#include <third_party/js-1.7/jsapi.h>
 
 #include "mongo/client/dbclientcursor.h"
 #include "mongo/db/namespacestring.h"
diff --git a/src/mongo/shell/mongo.vcxproj b/src/mongo/shell/mongo.vcxproj
index 48af994a6b1..6e9f6bf390d 100755
--- a/src/mongo/shell/mongo.vcxproj
+++ b/src/mongo/shell/mongo.vcxproj
@@ -178,7 +178,8 @@
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -200,7 +201,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -223,7 +225,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -245,7 +248,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -273,7 +277,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -300,7 +305,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -328,7 +334,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -355,7 +362,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     </Link>

     <PreBuildEvent>

       <Command>cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\..\third_party\js-1.7" /input:"jskwgen.exe" /output:"jsautokw.h" /command:"jskwgen jsautokw.h"

-cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."

+cscript //Nologo "$(ProjectDir)..\..\third_party\run_if_newer.js" /path:"$(ProjectDir)..\base" /input:"generate_error_codes.py,error_codes.err" /output:"error_codes.h,error_codes.cpp" /command:"python generate_error_codes.py error_codes.err error_codes.h error_codes.cpp"

+cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(ProjectDir).."

 </Command>

       <Message>Build jsautokw.h for SpiderMonkey, create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

     </PreBuildEvent>

@@ -872,6 +880,7 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">4355;4800;4267;4244;4334</DisableSpecificWarnings>

     </ClCompile>

     <ClCompile Include="..\base\configuration_variable_manager.cpp" />

+    <ClCompile Include="..\base\error_codes.cpp" />

     <ClCompile Include="..\base\global_initializer.cpp" />

     <ClCompile Include="..\base\global_initializer_registerer.cpp" />

     <ClCompile Include="..\base\init.cpp" />

@@ -881,10 +890,14 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\base\make_string_vector.cpp" />

     <ClCompile Include="..\base\parse_number.cpp" />

     <ClCompile Include="..\base\status.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_builder.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp" />

+    <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp" />

+    <ClCompile Include="..\bson\util\bson_extract.cpp" />

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

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

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

-    <ClCompile Include="..\db\fail_point_service.cpp" />

     <ClCompile Include="..\platform\random.cpp" />

     <ClCompile Include="..\scripting\bson_template_evaluator.cpp" />

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

@@ -989,16 +1002,7 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\..\third_party\pcre-8.30\pcreposix.c" />

     <ClCompile Include="..\scripting\bench.cpp" />

     <ClCompile Include="..\scripting\engine_spidermonkey.cpp" />

-    <ClCompile Include="..\scripting\sm_db.cpp">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>

-    </ClCompile>

+    <ClCompile Include="..\scripting\sm_db.cpp" />

     <ClCompile Include="..\scripting\utils.cpp" />

     <ClCompile Include="linenoise.cpp" />

     <ClCompile Include="..\util\background.cpp" />

@@ -1039,6 +1043,8 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <ItemGroup>

     <None Include="..\..\third_party\js-1.7\jskeyword.tbl" />

     <None Include="..\..\third_party\js-1.7\jsopcode.tbl" />

+    <None Include="..\base\error_codes.err" />

+    <None Include="..\base\generate_error_codes.py" />

     <None Include="collection.js" />

     <None Include="db.js" />

     <None Include="mongo.js" />

@@ -1102,6 +1108,7 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\..\third_party\js-1.7\prmjtime.h" />

     <ClInclude Include="..\..\third_party\js-1.7\resource.h" />

     <ClInclude Include="..\base\configuration_variable_manager.h" />

+    <ClInclude Include="..\base\counter.h" />

     <ClInclude Include="..\base\disallow_copying.h" />

     <ClInclude Include="..\base\error_codes.h" />

     <ClInclude Include="..\base\global_initializer.h" />

@@ -1118,9 +1125,13 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\bson\bson.h" />

     <ClInclude Include="..\bson\bson_builder_base.h" />

     <ClInclude Include="..\bson\bson_field.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_builder.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_heap.h" />

+    <ClInclude Include="..\bson\mutable\mutable_bson_internal.h" />

+    <ClInclude Include="..\bson\util\bson_extract.h" />

     <ClInclude Include="..\client\authentication_table.h" />

     <ClInclude Include="..\client\dbclientinterface.h" />

-    <ClInclude Include="..\db\fail_point_service.h" />

     <ClInclude Include="..\platform\atomic_intrinsics.h" />

     <ClInclude Include="..\platform\atomic_intrinsics_win32.h" />

     <ClInclude Include="..\platform\atomic_word.h" />

diff --git a/src/mongo/shell/mongo.vcxproj.filters b/src/mongo/shell/mongo.vcxproj.filters
index d503ef11995..97cd9ac7a62 100644
--- a/src/mongo/shell/mongo.vcxproj.filters
+++ b/src/mongo/shell/mongo.vcxproj.filters
@@ -95,6 +95,9 @@
     <Filter Include="base">

       <UniqueIdentifier>{3e1af8fb-25f6-4fb4-a7f2-19182cf13eaf}</UniqueIdentifier>

     </Filter>

+    <Filter Include="bson\mutable">

+      <UniqueIdentifier>{8fc8632d-6c44-4b00-be6a-f0bcc6face8e}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\scripting\engine.cpp">

@@ -551,9 +554,6 @@
     <ClCompile Include="..\base\status.cpp">

       <Filter>base</Filter>

     </ClCompile>

-    <ClCompile Include="..\db\fail_point_service.cpp">

-      <Filter>db\Source FIles</Filter>

-    </ClCompile>

     <ClCompile Include="..\util\fail_point.cpp">

       <Filter>util\Source Files</Filter>

     </ClCompile>

@@ -566,6 +566,24 @@
     <ClCompile Include="..\util\net\ssl_manager.cpp">

       <Filter>util\net</Filter>

     </ClCompile>

+    <ClCompile Include="..\base\error_codes.cpp">

+      <Filter>base</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\util\bson_extract.cpp">

+      <Filter>bson\util</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_builder.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_heap.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

+    <ClCompile Include="..\bson\mutable\mutable_bson_internal.cpp">

+      <Filter>bson\mutable</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="collection.js">

@@ -610,6 +628,12 @@
     <None Include="..\..\third_party\js-1.7\jsopcode.tbl">

       <Filter>third_party\SpiderMonkey\Header Files</Filter>

     </None>

+    <None Include="..\base\error_codes.err">

+      <Filter>base</Filter>

+    </None>

+    <None Include="..\base\generate_error_codes.py">

+      <Filter>base</Filter>

+    </None>

   </ItemGroup>

   <ItemGroup>

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

@@ -1322,9 +1346,6 @@
     <ClInclude Include="..\base\status.h">

       <Filter>base</Filter>

     </ClInclude>

-    <ClInclude Include="..\db\fail_point_service.h">

-      <Filter>db\Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\util\fail_point.h">

       <Filter>util\Header Files</Filter>

     </ClInclude>

@@ -1340,6 +1361,24 @@
     <ClInclude Include="..\util\net\ssl_manager.h">

       <Filter>util\net</Filter>

     </ClInclude>

+    <ClInclude Include="..\base\counter.h">

+      <Filter>base</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\util\bson_extract.h">

+      <Filter>bson\util</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_builder.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_heap.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

+    <ClInclude Include="..\bson\mutable\mutable_bson_internal.h">

+      <Filter>bson\mutable</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="..\db\db.rc">