vcproj fixes and buildboost.bat for windows

7 files changed, 223 insertions, 140 deletions

diff --git a/README b/README
index 0341176e002..37282ee4f88 100644
--- a/README
+++ b/README
@@ -1,43 +1,43 @@
-MongoDB README
-
-DOCUMENTATION
-
-  http://www.mongodb.org/
-
-COMPONENTS
-
-  mongod - The database process.
-  mongos - Sharding controller.
-  mongo  - The database shell (uses interactive javascript).
-
-BUILDING
-      
-  see docs/building.md
-
-
-RUNNING
-
-  ./mongod
-
-  runs the database.  Use 
-
-  ./mongod --help
-
-  to see command line options.
-
-NOTES
-
-  Mongo uses memory mapped files.  If built as a 32 bit executable, you will
-  not be able to work with large (multi-gigabyte) databases.  However, 32 bit
-  builds work fine with small development databases.
-
-
-LICENSING
-
-  Most MongoDB source files are made available under the terms of the
-  GNU Affero General Public License (AGPL).  See individual files for
-  details.
-
-  As an exception, the files in the debian/ directory, the rpm/
-  directory, and all subdirectories thereof are made available under
-  the terms of the Apache License, version 2.0.
+MongoDB README

+

+DOCUMENTATION

+

+  http://www.mongodb.org/

+

+COMPONENTS

+

+  mongod - The database process.

+  mongos - Sharding controller.

+  mongo  - The database shell (uses interactive javascript).

+

+BUILDING

+      

+  see docs/building.md

+

+

+RUNNING

+

+  ./mongod

+

+  runs the database.  Use 

+

+  ./mongod --help

+

+  to see command line options.

+

+NOTES

+

+  Mongo uses memory mapped files.  If built as a 32 bit executable, you will

+  not be able to work with large (multi-gigabyte) databases.  However, 32 bit

+  builds work fine with small development databases.

+

+

+LICENSING

+

+  Most MongoDB source files are made available under the terms of the

+  GNU Affero General Public License (AGPL).  See individual files for

+  details.

+

+  As an exception, the files in the debian/ directory, the rpm/

+  directory, and all subdirectories thereof are made available under

+  the terms of the Apache License, version 2.0.

diff --git a/buildscripts/buildboost.bat b/buildscripts/buildboost.bat
new file mode 100644
index 00000000000..ffa6d05706b
--- /dev/null
+++ b/buildscripts/buildboost.bat
@@ -0,0 +1,54 @@
+@echo off

+

+cls

+echo This script builds the boost libs that MongoDB requires on Windows.

+echo We assume boost source is in machine's \boost directory.

+echo You can get boost at www.boost.org.

+echo .

+echo Note: you will want boost v1.42 or higher with VS2010.

+echo .

+echo We assume you have bjam.  To build bjam:

+echo cd tools\jam\src

+echo build.bat

+echo .

+

+cd \boost

+echo bin\bjam --version

+bin\bjam --version

+

+echo .

+echo .

+echo .

+echo About to build release libraries

+pause

+cls

+bin\bjam variant=release runtime-link=static link=static --with-filesystem --with-thread --with-date_time --with-program_options --layout=versioned threading=multi toolset=msvc

+echo .

+echo .

+echo .

+echo About to try to move libs from /boost/stage/lib to /boost/lib/

+pause

+cls

+rem bjam makes extra copies without the ver #; we kill those:

+del stage\lib\*-mt.lib

+move stage\lib\* lib\

+

+echo .

+echo .

+echo .

+echo About to build debug libraries

+pause

+cls

+bin\bjam variant=debug --with-filesystem --with-thread --with-date_time --with-program_options --layout=versioned threading=multi toolset=msvc

+

+echo .

+echo .

+echo .

+echo About to try to move libs from /boost/stage/lib to /boost/lib/

+pause

+cls

+rem bjam makes extra copies without the ver #; we kill those:

+del stage\lib\*s.lib

+move stage\lib\* lib\

+

+echo Done - try running "dir \boost\lib\"

diff --git a/db/db.sln b/db/db.sln
index eb953983417..5bd528c5aa1 100644
--- a/db/db.sln
+++ b/db/db.sln
@@ -1,82 +1,85 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongod", "db.vcproj", "{215B2D68-0A70-4D10-8E75-B31010C62A91}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{4082881B-EB00-486F-906C-843B8EC06E18}"
-	ProjectSection(SolutionItems) = preProject
-		driverHelpers.cpp = driverHelpers.cpp
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B262D59-9DC7-4BF1-A431-1BD4966899A5}"
-	ProjectSection(SolutionItems) = preProject
-		..\tools\bridge.cpp = ..\tools\bridge.cpp
-		..\tools\dump.cpp = ..\tools\dump.cpp
-		..\tools\export.cpp = ..\tools\export.cpp
-		..\tools\files.cpp = ..\tools\files.cpp
-		..\tools\import.cpp = ..\tools\import.cpp
-		..\tools\restore.cpp = ..\tools\restore.cpp
-		..\tools\sniffer.cpp = ..\tools\sniffer.cpp
-		..\tools\stat.cpp = ..\tools\stat.cpp
-		..\tools\tool.cpp = ..\tools\tool.cpp
-		..\tools\tool.h = ..\tools\tool.h
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongos", "..\s\dbgrid.vcproj", "{E03717ED-69B4-4D21-BC55-DF6690B585C6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\dbtests\test.vcproj", "{215B2D68-0A70-4D10-8E75-B33010C62A91}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unix files", "unix files", "{2F760952-C71B-4865-998F-AABAE96D1373}"
-	ProjectSection(SolutionItems) = preProject
-		..\util\mmap_posix.cpp = ..\util\mmap_posix.cpp
-		..\util\processinfo_darwin.cpp = ..\util\processinfo_darwin.cpp
-		..\util\processinfo_linux2.cpp = ..\util\processinfo_linux2.cpp
-		..\util\processinfo_none.cpp = ..\util\processinfo_none.cpp
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shell", "shell", "{407B4B88-3451-433C-B74F-31B31FEB5791}"
-	ProjectSection(SolutionItems) = preProject
-		..\shell\dbshell.cpp = ..\shell\dbshell.cpp
-		..\shell\mongo.cpp = ..\shell\mongo.cpp
-		..\shell\mongo_vstudio.cpp = ..\shell\mongo_vstudio.cpp
-		..\shell\utils.cpp = ..\shell\utils.cpp
-		..\shell\utils.h = ..\shell\utils.h
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "other source files", "other source files", "{12B11474-2D74-48C3-BB3D-F03249BEA88F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsondemo", "..\bson\bsondemo\bsondemo.vcproj", "{C9DB5EB7-81AA-4185-BAA1-DA035654402F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.ActiveCfg = Debug|Win32
-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.Build.0 = Debug|Win32
-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.ActiveCfg = Release|Win32
-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.Build.0 = Release|Win32
-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.Build.0 = Debug|Win32
-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.ActiveCfg = Release|Win32
-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.Build.0 = Release|Win32
-		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Win32.ActiveCfg = Debug|Win32
-		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Win32.Build.0 = Debug|Win32
-		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|Win32.ActiveCfg = Release|Win32
-		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|Win32.Build.0 = Release|Win32
-		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Win32.Build.0 = Debug|Win32
-		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|Win32.ActiveCfg = Release|Win32
-		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2B262D59-9DC7-4BF1-A431-1BD4966899A5} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}
-		{2F760952-C71B-4865-998F-AABAE96D1373} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}
-		{407B4B88-3451-433C-B74F-31B31FEB5791} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}
-		{4082881B-EB00-486F-906C-843B8EC06E18} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}
-	EndGlobalSection
-EndGlobal
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongod", "db.vcproj", "{215B2D68-0A70-4D10-8E75-B31010C62A91}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{4082881B-EB00-486F-906C-843B8EC06E18}"

+	ProjectSection(SolutionItems) = preProject

+		driverHelpers.cpp = driverHelpers.cpp

+	EndProjectSection

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B262D59-9DC7-4BF1-A431-1BD4966899A5}"

+	ProjectSection(SolutionItems) = preProject

+		..\tools\bridge.cpp = ..\tools\bridge.cpp

+		..\tools\dump.cpp = ..\tools\dump.cpp

+		..\tools\export.cpp = ..\tools\export.cpp

+		..\tools\files.cpp = ..\tools\files.cpp

+		..\tools\import.cpp = ..\tools\import.cpp

+		..\tools\restore.cpp = ..\tools\restore.cpp

+		..\tools\sniffer.cpp = ..\tools\sniffer.cpp

+		..\tools\stat.cpp = ..\tools\stat.cpp

+		..\tools\tool.cpp = ..\tools\tool.cpp

+		..\tools\tool.h = ..\tools\tool.h

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongos", "..\s\dbgrid.vcproj", "{E03717ED-69B4-4D21-BC55-DF6690B585C6}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\dbtests\test.vcproj", "{215B2D68-0A70-4D10-8E75-B33010C62A91}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unix files", "unix files", "{2F760952-C71B-4865-998F-AABAE96D1373}"

+	ProjectSection(SolutionItems) = preProject

+		..\util\mmap_posix.cpp = ..\util\mmap_posix.cpp

+		..\util\processinfo_darwin.cpp = ..\util\processinfo_darwin.cpp

+		..\util\processinfo_linux2.cpp = ..\util\processinfo_linux2.cpp

+		..\util\processinfo_none.cpp = ..\util\processinfo_none.cpp

+	EndProjectSection

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shell", "shell", "{407B4B88-3451-433C-B74F-31B31FEB5791}"

+	ProjectSection(SolutionItems) = preProject

+		..\shell\dbshell.cpp = ..\shell\dbshell.cpp

+		..\shell\mongo_vstudio.cpp = ..\shell\mongo_vstudio.cpp

+		..\shell\utils.cpp = ..\shell\utils.cpp

+		..\shell\utils.h = ..\shell\utils.h

+	EndProjectSection

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "other source files", "other source files", "{12B11474-2D74-48C3-BB3D-F03249BEA88F}"

+	ProjectSection(SolutionItems) = preProject

+		..\buildscripts\buildboost.bat = ..\buildscripts\buildboost.bat

+		..\SConstruct = ..\SConstruct

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsondemo", "..\bson\bsondemo\bsondemo.vcproj", "{C9DB5EB7-81AA-4185-BAA1-DA035654402F}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.ActiveCfg = Debug|Win32

+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.Build.0 = Debug|Win32

+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.ActiveCfg = Release|Win32

+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.Build.0 = Release|Win32

+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.Build.0 = Debug|Win32

+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.ActiveCfg = Release|Win32

+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.Build.0 = Release|Win32

+		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Win32.ActiveCfg = Debug|Win32

+		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Debug|Win32.Build.0 = Debug|Win32

+		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|Win32.ActiveCfg = Release|Win32

+		{215B2D68-0A70-4D10-8E75-B33010C62A91}.Release|Win32.Build.0 = Release|Win32

+		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Debug|Win32.Build.0 = Debug|Win32

+		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|Win32.ActiveCfg = Release|Win32

+		{C9DB5EB7-81AA-4185-BAA1-DA035654402F}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+	GlobalSection(NestedProjects) = preSolution

+		{2B262D59-9DC7-4BF1-A431-1BD4966899A5} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}

+		{2F760952-C71B-4865-998F-AABAE96D1373} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}

+		{407B4B88-3451-433C-B74F-31B31FEB5791} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}

+		{4082881B-EB00-486F-906C-843B8EC06E18} = {12B11474-2D74-48C3-BB3D-F03249BEA88F}

+	EndGlobalSection

+EndGlobal

diff --git a/db/db.vcproj b/db/db.vcproj
index ea6b6915ac8..3f61b0de362 100644
--- a/db/db.vcproj
+++ b/db/db.vcproj
@@ -1062,6 +1062,14 @@
 						UsePrecompiledHeader="1"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

 			</File>

 			<Filter

 				Name="cpp"

diff --git a/dbtests/test.vcproj b/dbtests/test.vcproj
index 967f9b46745..c25fc0063dd 100644
--- a/dbtests/test.vcproj
+++ b/dbtests/test.vcproj
@@ -43,7 +43,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\js\src;&quot;..\pcre-7.4&quot;;&quot;c:\Program Files\boost\latest&quot;;c:\boost;\boost"

+				AdditionalIncludeDirectories="&quot;c:\program files\boost\latest&quot;;..\..\js\src;&quot;..\pcre-7.4&quot;;c:\boost;\boost"

 				PreprocessorDefinitions="MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -124,7 +124,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\..\js\src;&quot;..\pcre-7.4&quot;;&quot;c:\Program Files\boost\latest&quot;;c:\boost;\boost"

+				AdditionalIncludeDirectories="&quot;c:\program files\boost\latest&quot;;..\..\js\src;&quot;..\pcre-7.4&quot;;c:\boost;\boost"

 				PreprocessorDefinitions="MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -782,6 +782,14 @@
 						UsePrecompiledHeader="1"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

 			</File>

 			<Filter

 				Name="cpp"

diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj
index 25396e36c7d..dbda8a019bc 100644
--- a/s/dbgrid.vcproj
+++ b/s/dbgrid.vcproj
@@ -124,6 +124,7 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="pch.h"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4355;4800"

@@ -208,18 +209,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\pch.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\db\queryutil.cpp"

 				>

 			</File>

@@ -1020,6 +1009,27 @@
 				>

 			</File>

 		</Filter>

+		<File

+			RelativePath="..\pch.cpp"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					UsePrecompiledHeader="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					UsePrecompiledHeader="1"

+					PrecompiledHeaderThrough="pch.h"

+				/>

+			</FileConfiguration>

+		</File>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/s/s_only.cpp b/s/s_only.cpp
index c838f3f7a02..8ab1f1a361d 100644
--- a/s/s_only.cpp
+++ b/s/s_only.cpp
@@ -35,7 +35,7 @@ namespace mongo {
     boost::thread_specific_ptr<Client> currentClient;
 
     Client::Client( const char * s ){ assert(!"this shouldn't be called"); }
-    Client::~Client(){ assert(!"this shouldn't be called"); }
+    Client::~Client(){ log() << "Client::~Client : this shouldn't be called" << endl; }
     bool Client::shutdown(){ assert(!"this shouldn't be called"); return true; }
 
 }