diff --git a/src/mongo/bson/bsondemo/bsondemo.vcxproj b/src/mongo/bson/bsondemo/bsondemo.vcxproj index 2ad53894d7d37..cbfc4b81376c8 100644 --- a/src/mongo/bson/bsondemo/bsondemo.vcxproj +++ b/src/mongo/bson/bsondemo/bsondemo.vcxproj @@ -1,4 +1,4 @@ - + @@ -17,6 +17,22 @@ Release x64 + + Win2008PlusDebug + Win32 + + + Win2008PlusDebug + x64 + + + Win2008PlusRelease + Win32 + + + Win2008PlusRelease + x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F} @@ -29,61 +45,115 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + @@ -105,6 +175,26 @@ MachineX86 + + + Disabled + c:\boost;\boost + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + No + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + true + + + true + Console + MachineX86 + + Disabled @@ -124,6 +214,25 @@ Console + + + Disabled + c:\boost;\boost + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + No + true + + + true + Console + + MaxSpeed @@ -147,6 +256,29 @@ MachineX86 + + + MaxSpeed + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + c:\boost;\boost + No + true + + + true + Console + true + true + MachineX86 + + MaxSpeed @@ -169,6 +301,28 @@ true + + + MaxSpeed + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + c:\boost;\boost + No + true + + + true + Console + true + true + + @@ -190,4 +344,4 @@ - + \ No newline at end of file diff --git a/src/mongo/client/examples/mongoperf.vcxproj b/src/mongo/client/examples/mongoperf.vcxproj index 466a412841c60..e011852f17eb9 100755 --- a/src/mongo/client/examples/mongoperf.vcxproj +++ b/src/mongo/client/examples/mongoperf.vcxproj @@ -9,6 +9,14 @@ Release Win32 + + Win2008PlusDebug + Win32 + + + Win2008PlusRelease + Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46} @@ -23,19 +31,32 @@ true + + true + false true + + false + true + + + + + + + ..\..;..\..\..\third_party\pcre-7.4;$(IncludePath) @@ -44,9 +65,15 @@ true + + true + false + + false + @@ -67,6 +94,18 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + Disabled + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + c:\boost;\boost + + + Console + true + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + MaxSpeed @@ -83,6 +122,22 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + diff --git a/src/mongo/client/examples/simple_client_demo.vcxproj b/src/mongo/client/examples/simple_client_demo.vcxproj index 6ce00d9541af0..ca06b0d4ce4c4 100755 --- a/src/mongo/client/examples/simple_client_demo.vcxproj +++ b/src/mongo/client/examples/simple_client_demo.vcxproj @@ -1,4 +1,4 @@ - + @@ -9,6 +9,14 @@ Release Win32 + + Win2008PlusDebug + Win32 + + + Win2008PlusRelease + Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236} @@ -16,31 +24,39 @@ simple_client_demo - Application Unicode - true - + + true + false true - + + false + true + + + + - + + + ..\..;..\..\..\third_party\pcre-7.4;$(IncludePath) @@ -49,19 +65,23 @@ true + + true + false - + + false + - - - - Level3 - c:\boost;\boost - + + + + Level3 + c:\boost;\boost + - Disabled @@ -74,16 +94,25 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - + + + Disabled + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + c:\boost;\boost + + + Console + true + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + - MaxSpeed true true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded - Console @@ -93,15 +122,27 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - + + + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + - - - \ No newline at end of file diff --git a/src/mongo/db/db.vcxproj b/src/mongo/db/db.vcxproj index 79f5122089947..24880d6c58d5c 100755 --- a/src/mongo/db/db.vcxproj +++ b/src/mongo/db/db.vcxproj @@ -17,6 +17,22 @@ Release x64 + + Win2008PlusDebug + Win32 + + + Win2008PlusDebug + x64 + + + Win2008PlusRelease + Win32 + + + Win2008PlusRelease + x64 + mongod @@ -30,69 +46,135 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application false false Unicode + + Application + false + false + Unicode + Application false false Unicode + + Application + false + false + Unicode + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) @@ -123,6 +205,35 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Disabled + ..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost + MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + No + EnableFastChecks + MultiThreadedDebugDLL + Use + pch.h + Level3 + EditAndContinue + 4355;4800;%(DisableSpecificWarnings) + true + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib + false + %(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + Disabled @@ -151,6 +262,34 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Disabled + ..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost + MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;4267;4244;%(DisableSpecificWarnings) + true + No + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib + false + %(IgnoreSpecificDefaultLibraries) + true + Console + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + MaxSpeed @@ -182,6 +321,37 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + MaxSpeed + true + ..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost + _UNICODE;UNICODE;;;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions) + MultiThreaded + true + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;%(DisableSpecificWarnings) + true + No + + + ws2_32.lib;psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib + true + Console + true + true + MachineX86 + false + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + MaxSpeed @@ -211,6 +381,35 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + MaxSpeed + true + ..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost + ;;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions) + MultiThreaded + true + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;4267;4244;%(DisableSpecificWarnings) + true + No + + + ws2_32.lib;psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib + true + Console + true + true + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + @@ -221,249 +420,445 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -478,30 +873,47 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing NotUsing NotUsing + NotUsing + NotUsing + NotUsing @@ -511,9 +923,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -529,9 +945,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing @@ -563,9 +983,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -604,9 +1028,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -624,9 +1052,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -679,20 +1111,34 @@ + + + + + + + + + + + + Use + Use Use + Use @@ -911,26 +1357,38 @@ Document true + true true + true true + true Document true + true true + true true + true Document true + true true + true true + true Document true + true true + true true + true diff --git a/src/mongo/db/db_10.sln b/src/mongo/db/db_10.sln index c1d83f3901ad8..8f9e04d908997 100755 --- a/src/mongo/db/db_10.sln +++ b/src/mongo/db/db_10.sln @@ -46,6 +46,14 @@ Global Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Win2008PlusDebug|Any CPU = Win2008PlusDebug|Any CPU + Win2008PlusDebug|Mixed Platforms = Win2008PlusDebug|Mixed Platforms + Win2008PlusDebug|Win32 = Win2008PlusDebug|Win32 + Win2008PlusDebug|x64 = Win2008PlusDebug|x64 + Win2008PlusRelease|Any CPU = Win2008PlusRelease|Any CPU + Win2008PlusRelease|Mixed Platforms = Win2008PlusRelease|Mixed Platforms + Win2008PlusRelease|Win32 = Win2008PlusRelease|Win32 + Win2008PlusRelease|x64 = Win2008PlusRelease|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Any CPU.ActiveCfg = Debug|x64 @@ -62,6 +70,20 @@ Global {215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.Build.0 = Release|Win32 {215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|x64.ActiveCfg = Release|x64 {215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|x64.Build.0 = Release|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusDebug|x64.Build.0 = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B31010C62A91}.Win2008PlusRelease|x64.Build.0 = Win2008PlusRelease|x64 {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Any CPU.ActiveCfg = Debug|x64 {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Mixed Platforms.Build.0 = Debug|x64 @@ -76,6 +98,20 @@ Global {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.Build.0 = Release|Win32 {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|x64.ActiveCfg = Release|x64 {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|x64.Build.0 = Release|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusDebug|x64.Build.0 = Win2008PlusDebug|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|x64 + {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|x64.Build.0 = Win2008PlusRelease|x64 {215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Any CPU.ActiveCfg = Debug|x64 {215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Mixed Platforms.Build.0 = Debug|x64 @@ -90,6 +126,20 @@ Global {215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|Win32.Build.0 = Release|Win32 {215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|x64.ActiveCfg = Release|x64 {215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|x64.Build.0 = Release|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusDebug|x64.Build.0 = Win2008PlusDebug|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91}.Win2008PlusRelease|x64.Build.0 = Win2008PlusRelease|x64 {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Any CPU.ActiveCfg = Debug|x64 {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Mixed Platforms.Build.0 = Debug|x64 @@ -104,6 +154,20 @@ Global {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|Win32.Build.0 = Release|Win32 {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|x64.ActiveCfg = Release|x64 {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|x64.Build.0 = Release|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusDebug|x64.Build.0 = Win2008PlusDebug|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|x64 + {C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Win2008PlusRelease|x64.Build.0 = Win2008PlusRelease|x64 {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Debug|Any CPU.ActiveCfg = Debug|Win32 {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -116,6 +180,18 @@ Global {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Release|Win32.ActiveCfg = Release|Win32 {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Release|Win32.Build.0 = Release|Win32 {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Release|x64.ActiveCfg = Release|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|Win32 {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Debug|Any CPU.ActiveCfg = Debug|Win32 {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -128,6 +204,18 @@ Global {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Release|Win32.ActiveCfg = Release|Win32 {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Release|Win32.Build.0 = Release|Win32 {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Release|x64.ActiveCfg = Release|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {89C30BC3-2874-4F2C-B4DA-EB04E9782236}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|Win32 {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Debug|Any CPU.ActiveCfg = Debug|Win32 {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -140,6 +228,18 @@ Global {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Release|Win32.ActiveCfg = Release|Win32 {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Release|Win32.Build.0 = Release|Win32 {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Release|x64.ActiveCfg = Release|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|Win32 {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Debug|Any CPU.ActiveCfg = Debug|Win32 {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -152,6 +252,18 @@ Global {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Release|Win32.ActiveCfg = Release|Win32 {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Release|Win32.Build.0 = Release|Win32 {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Release|x64.ActiveCfg = Release|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusDebug|Any CPU.ActiveCfg = Win2008PlusDebug|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusDebug|Mixed Platforms.ActiveCfg = Win2008PlusDebug|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusDebug|Mixed Platforms.Build.0 = Win2008PlusDebug|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusDebug|Win32.ActiveCfg = Win2008PlusDebug|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusDebug|Win32.Build.0 = Win2008PlusDebug|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusDebug|x64.ActiveCfg = Win2008PlusDebug|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusRelease|Any CPU.ActiveCfg = Win2008PlusRelease|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusRelease|Mixed Platforms.ActiveCfg = Win2008PlusRelease|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusRelease|Mixed Platforms.Build.0 = Win2008PlusRelease|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusRelease|Win32.ActiveCfg = Win2008PlusRelease|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32 + {79D4E297-BFB7-4FF2-9B13-08A146582E46}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj index d1caa41a53466..de68585b40544 100644 --- a/src/mongo/dbtests/test.vcxproj +++ b/src/mongo/dbtests/test.vcxproj @@ -17,6 +17,22 @@ Release x64 + + Win2008PlusDebug + Win32 + + + Win2008PlusDebug + x64 + + + Win2008PlusRelease + Win32 + + + Win2008PlusRelease + x64 + {215B2D68-0A70-4D10-8E75-B33010C62A91} @@ -29,69 +45,135 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application false false Unicode + + Application + false + false + Unicode + Application false false Unicode + + Application + false + false + Unicode + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) @@ -123,6 +205,36 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Disabled + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + No + EnableFastChecks + MultiThreadedDebugDLL + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;%(DisableSpecificWarnings) + true + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib + false + %(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + true + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + Disabled @@ -151,6 +263,34 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Disabled + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _DURABLE;_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;4267;4244;%(DisableSpecificWarnings) + No + true + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib + false + %(IgnoreSpecificDefaultLibraries) + true + Console + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + MaxSpeed @@ -181,6 +321,36 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + MaxSpeed + true + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MultiThreaded + true + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;%(DisableSpecificWarnings) + No + true + + + ws2_32.lib;psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib + true + Console + true + true + MachineX86 + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + MaxSpeed @@ -210,6 +380,35 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + MaxSpeed + true + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MultiThreaded + true + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;4267;4244;%(DisableSpecificWarnings) + No + true + + + ws2_32.lib;psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib + true + Console + true + true + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + @@ -332,9 +531,13 @@ Use + Use Use + Use Use + Use Use + Use @@ -343,9 +546,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -390,182 +597,326 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -574,9 +925,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -617,27 +972,41 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -668,16 +1037,28 @@ + + + + + + + + + + + + @@ -698,11 +1079,18 @@ + + NotUsing + NotUsing + + + + @@ -730,7 +1118,9 @@ 4180;%(DisableSpecificWarnings) + 4180;%(DisableSpecificWarnings) 4180;%(DisableSpecificWarnings) + 4180;%(DisableSpecificWarnings) @@ -748,26 +1138,38 @@ Document true + true true + true true + true Document true + true true + true true + true Document true + true true + true true + true Document true + true true + true true + true diff --git a/src/mongo/s/dbgrid.vcxproj b/src/mongo/s/dbgrid.vcxproj index a4c2dac77e3e4..94115f2f59f26 100644 --- a/src/mongo/s/dbgrid.vcxproj +++ b/src/mongo/s/dbgrid.vcxproj @@ -17,6 +17,22 @@ Release x64 + + Win2008PlusDebug + Win32 + + + Win2008PlusDebug + x64 + + + Win2008PlusRelease + Win32 + + + Win2008PlusRelease + x64 + mongos @@ -30,65 +46,123 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) ..\..\third_party\js-1.7;..;$(IncludePath) + ..\..\third_party\js-1.7;..;$(IncludePath) @@ -117,6 +191,33 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Disabled + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;XP_WIN;OLDJS;STATIC_JS_API;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + No + EnableFastChecks + MultiThreadedDebugDLL + Use + pch.h + Level3 + EditAndContinue + 4355;4800;%(DisableSpecificWarnings) + true + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib + true + Console + MachineX86 + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + Disabled @@ -143,6 +244,32 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Disabled + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;XP_WIN;OLDJS;STATIC_JS_API;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + pch.h + Level3 + ProgramDatabase + 4355;4800;4267;4244;%(DisableSpecificWarnings) + No + true + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib + true + Console + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + MaxSpeed @@ -173,6 +300,36 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + MaxSpeed + true + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + 4355;4800;%(DisableSpecificWarnings) + No + true + pch.h + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib + true + Console + true + true + MachineX86 + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + MaxSpeed @@ -202,6 +359,35 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + MaxSpeed + true + ..\..\js\src;..\..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories) + _UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + 4355;4800;4267;4244;%(DisableSpecificWarnings) + No + true + pch.h + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib + true + Console + true + true + + + cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + @@ -209,9 +395,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -251,9 +441,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -261,6 +455,7 @@ NotUsing + NotUsing @@ -268,9 +463,13 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -293,9 +492,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -317,242 +520,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -573,16 +968,26 @@ + + + + + + + + Use + Use Use + Use @@ -592,12 +997,20 @@ + + + + + + + + @@ -663,26 +1076,38 @@ Document true + true true + true true + true Document true + true true + true true + true Document true + true true + true true + true Document true + true true + true true + true diff --git a/src/mongo/shell/msvc/mongo.vcxproj b/src/mongo/shell/msvc/mongo.vcxproj index 8af87912b4735..c03b8570649e3 100644 --- a/src/mongo/shell/msvc/mongo.vcxproj +++ b/src/mongo/shell/msvc/mongo.vcxproj @@ -9,6 +9,14 @@ Release Win32 + + Win2008PlusDebug + Win32 + + + Win2008PlusRelease + Win32 + {FE959BD8-8EE2-4555-AE59-9FA14FFD410E} @@ -21,21 +29,38 @@ true Unicode + + Application + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + + + + + + + true @@ -43,11 +68,22 @@ $(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); ..\..\..\third_party\js-1.7;..\..\..\third_party\pcre-7.4;..\..\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include + + true + \boost\lib\vs2010_32\;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib + $(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + ..\..\..\third_party\js-1.7;..\..\..\third_party\pcre-7.4;..\..\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include + ..\..\..\third_party\js-1.7;..\..\..\third_party\pcre-7.4;..\..\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include false \boost\lib\vs2010_32\;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib + + ..\..\..\third_party\js-1.7;..\..\..\third_party\pcre-7.4;..\..\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include + false + \boost\lib\vs2010_32\;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib + Use @@ -68,6 +104,26 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Use + Level3 + Disabled + XP_WIN;HAVE_CONFIG_H;OLDJS;MONGO_EXPOSE_MACROS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + \boost\ + pch.h + 4355;4800;4267;4244;%(DisableSpecificWarnings) + + + Console + true + ws2_32.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir)..\.." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + Level3 @@ -94,6 +150,32 @@ Create mongo.cpp and mongo-server.cpp from JavaScript source files + + + Level3 + Use + MaxSpeed + true + true + USE_READLINE;XP_WIN;HAVE_CONFIG_H;OLDJS;MONGO_EXPOSE_MACROS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + \boost\ + pch.h + true + MultiThreaded + 4355;4800;4267;4244;%(DisableSpecificWarnings) + + + Console + true + true + true + ws2_32.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir)..\.." + Create mongo.cpp and mongo-server.cpp from JavaScript source files + + @@ -105,34 +187,46 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing + NotUsing true + true true + true NotUsing + NotUsing _CRT_SECURE_NO_WARNINGS;XP_WIN;HAVE_CONFIG_H;OLDJS;MONGO_EXPOSE_MACROS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;XP_WIN;HAVE_CONFIG_H;OLDJS;MONGO_EXPOSE_MACROS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;USE_READLINE;XP_WIN;HAVE_CONFIG_H;OLDJS;MONGO_EXPOSE_MACROS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;USE_READLINE;XP_WIN;HAVE_CONFIG_H;OLDJS;MONGO_EXPOSE_MACROS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) NotUsing + NotUsing @@ -159,67 +253,99 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -236,11 +362,15 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing @@ -258,9 +388,11 @@ true + true true + true diff --git a/src/mongo/util/mongoutils/mongoutils.vcxproj b/src/mongo/util/mongoutils/mongoutils.vcxproj index f6ec0935ca97a..85160de83e205 100755 --- a/src/mongo/util/mongoutils/mongoutils.vcxproj +++ b/src/mongo/util/mongoutils/mongoutils.vcxproj @@ -9,6 +9,14 @@ Release Win32 + + Win2008PlusDebug + Win32 + + + Win2008PlusRelease + Win32 + {7B84584E-92BC-4DB9-971B-A1A8F93E5053} @@ -21,21 +29,38 @@ true MultiByte + + Application + true + MultiByte + Application false true MultiByte + + Application + false + true + MultiByte + + + + + + + @@ -48,6 +73,16 @@ true + + + Level3 + Disabled + c:\boost;\boost + + + true + + Level3 @@ -62,6 +97,20 @@ true + + + Level3 + MaxSpeed + true + true + c:\boost;\boost + + + true + true + true + + diff --git a/win2008plus.props b/win2008plus.props new file mode 100644 index 0000000000000..ceb701dd819a6 --- /dev/null +++ b/win2008plus.props @@ -0,0 +1,12 @@ + + + + + + + + MONGO_USE_SRW_ON_WINDOWS;%(PreprocessorDefinitions) + + + + \ No newline at end of file