SERVER-2939 Another rebase onto master, hoping later merges get easier

Includes many changes from earlier SERVER-2939-xx branchs.
tadmarshall · Mar 13, 2012 · 780b1d9 · 780b1d9
1 parent f374409
commit 780b1d9
Show file tree

Hide file tree

Showing 11 changed files with 1,286 additions and 318 deletions.
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
@@ -442,7 +442,8 @@ env.JSHeader( "shell/mongo-server.cpp" , [ "shell/servers.js"] )
 coreShellFiles = [ "shell/dbshell.cpp",
                    "shell/shell_utils.cpp",
                    "shell/mongo-server.cpp",
-                   "../third_party/linenoise/linenoise.cpp"]
+                   "../third_party/linenoise/linenoise.cpp",
+                   "../third_party/linenoise/linenoise_utf8.cpp"]
 
 shellFilesToUse = coreShellFiles
 
@@ -452,7 +453,8 @@ if shellEnv is not None:
          [ "shell/dbshell.cpp",
            "shell/shell_utils.cpp",
            "shell/mongo-server.cpp",
-           "../third_party/linenoise/linenoise.cpp" ],
+           "../third_party/linenoise/linenoise.cpp",
+           "../third_party/linenoise/linenoise_utf8.cpp" ],
         LIBDEPS=["coreserver", "clientandshell",
                  "$BUILD_DIR/third_party/pcrecpp"] )
 

diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
@@ -977,7 +977,21 @@ int _main( int argc, char* argv[] ) {
 int main( int argc, char* argv[] ) {
     static mongo::StaticObserver staticObserver;
     try {
+#ifdef _WIN32
+        UINT initialConsoleInputCodePage = GetConsoleCP();
+        UINT initialConsoleOutputCodePage = GetConsoleOutputCP();
+        SetConsoleCP( CP_UTF8 );
+        SetConsoleOutputCP( CP_UTF8 );
+
+        int returnValue = _main( argc , argv );
+
+        SetConsoleCP( initialConsoleInputCodePage );
+        SetConsoleOutputCP( initialConsoleOutputCodePage );
+
+        return returnValue;
+#else
         return _main( argc , argv );
+#endif
     }
     catch ( mongo::DBException& e ) {
         cerr << "exception: " << e.what() << endl;

diff --git a/src/mongo/shell/msvc/mongo.vcxproj b/src/mongo/shell/msvc/mongo.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -177,6 +177,12 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\third_party\linenoise\linenoise_utf8.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\..\..\third_party\boost\libs\filesystem\v2\src\v2_operations.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
@@ -848,6 +854,7 @@
     </Library>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\third_party\linenoise\linenoise_utf8.h" />
     <ClInclude Include="..\..\..\third_party\pcre-8.30\config.h" />
     <ClInclude Include="..\..\..\third_party\pcre-8.30\pcre.h" />
     <ClInclude Include="..\..\..\third_party\pcre-8.30\pcrecpp.h" />

diff --git a/src/mongo/shell/msvc/mongo.vcxproj.filters b/src/mongo/shell/msvc/mongo.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Resource Files">
@@ -265,7 +265,7 @@
       <Filter>shell</Filter>
     </ClCompile>
     <ClCompile Include="..\..\util\md5.cpp">
-      <Filter>shell</Filter>
+      <Filter>util</Filter>
     </ClCompile>
     <ClCompile Include="..\..\util\stringutils.cpp">
       <Filter>util</Filter>
@@ -348,6 +348,9 @@
     <ClCompile Include="..\..\..\third_party\boost\libs\program_options\src\winmain.cpp">
       <Filter>Boost</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\third_party\linenoise\linenoise_utf8.cpp">
+      <Filter>third_party\linenoise</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\collection.js">
@@ -800,6 +803,9 @@
     <ClInclude Include="..\..\util\assert_util.h">
       <Filter>util</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\third_party\linenoise\linenoise_utf8.h">
+      <Filter>third_party\linenoise</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\db\db.rc">

diff --git a/src/third_party/linenoise/UTF-8-test-BOM.txt b/src/third_party/linenoise/UTF-8-test-BOM.txt
diff --git a/src/third_party/linenoise/UTF-8-test.txt b/src/third_party/linenoise/UTF-8-test.txt