[Box Backup-dev] COMMIT r484 - in box/chris/general: distribution/boxbackup infrastructure/msvc/2003 lib/common

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Tue Feb 21 21:16:49 GMT 2006


Author: chris
Date: 2006-02-21 21:16:45 +0000 (Tue, 21 Feb 2006)
New Revision: 484

Added:
   box/chris/general/infrastructure/msvc/2003/boxbackup.ncb
Modified:
   box/chris/general/distribution/boxbackup/VERSION.txt
   box/chris/general/infrastructure/msvc/2003/bbackupctl.vcproj
   box/chris/general/infrastructure/msvc/2003/bbackupd.vcproj
   box/chris/general/infrastructure/msvc/2003/boxbackup.suo
   box/chris/general/infrastructure/msvc/2003/boxquery.vcproj
   box/chris/general/infrastructure/msvc/2003/common.vcproj
   box/chris/general/infrastructure/msvc/2003/win32test.vcproj
   box/chris/general/lib/common/BoxPlatform.h
Log:
* distribution/boxbackup/VERSION.txt
* infrastructure/msvc/2003/*
* lib/common/BoxPlatform.h
- Merged in changes from r471 to r483 (mainly updated VS2003 project files)


Modified: box/chris/general/distribution/boxbackup/VERSION.txt
===================================================================
--- box/chris/general/distribution/boxbackup/VERSION.txt	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/distribution/boxbackup/VERSION.txt	2006-02-21 21:16:45 UTC (rev 484)
@@ -1,2 +1,2 @@
-0.09_plus2
+0.09_plus3
 boxbackup

Modified: box/chris/general/infrastructure/msvc/2003/bbackupctl.vcproj
===================================================================
--- box/chris/general/infrastructure/msvc/2003/bbackupctl.vcproj	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/infrastructure/msvc/2003/bbackupctl.vcproj	2006-02-21 21:16:45 UTC (rev 484)
@@ -23,7 +23,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32\Debug\libdb42d.lib"
+				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
 				OutputFile="$(OutDir)/bbackupctl.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -131,6 +131,9 @@
 					<File
 						RelativePath="..\..\..\bin\bbackupctl\bbackupctl.cpp">
 					</File>
+					<File
+						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp">
+					</File>
 				</Filter>
 			</Filter>
 		</Filter>
@@ -138,6 +141,9 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: box/chris/general/infrastructure/msvc/2003/bbackupd.vcproj
===================================================================
--- box/chris/general/infrastructure/msvc/2003/bbackupd.vcproj	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/infrastructure/msvc/2003/bbackupd.vcproj	2006-02-21 21:16:45 UTC (rev 484)
@@ -23,7 +23,7 @@
 				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\lib\win32\Debug\boost_regex.lib $(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32\Debug\libdb42d.lib"
+				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
 				OutputFile="$(OutDir)/bbackupd.exe"
 				LinkIncremental="2"
 				IgnoreAllDefaultLibraries="FALSE"
@@ -84,7 +84,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\lib\win32\Release\boost_regex.lib"
+				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"
 				OutputFile="$(OutDir)/bbackupd.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -148,11 +148,14 @@
 						RelativePath="..\..\..\bin\bbackupd\bbackupd.cpp">
 					</File>
 					<File
-						RelativePath="..\..\..\bin\bbackupd\bbwinservice.cpp">
+						RelativePath="..\..\..\bin\bbackupd\Win32BackupService.cpp">
 					</File>
 					<File
-						RelativePath="..\..\..\bin\bbackupd\ServiceBackupDaemon.cpp">
+						RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp">
 					</File>
+					<File
+						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp">
+					</File>
 				</Filter>
 			</Filter>
 		</Filter>
@@ -182,11 +185,14 @@
 						RelativePath="..\..\..\bin\bbackupd\BackupDaemon.h">
 					</File>
 					<File
-						RelativePath="..\..\..\bin\bbackupd\bbwinservice.h">
+						RelativePath="..\..\..\bin\bbackupd\Win32BackupService.h">
 					</File>
 					<File
-						RelativePath="..\..\..\bin\bbackupd\ServiceBackupDaemon.h">
+						RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.h">
 					</File>
+					<File
+						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">
+					</File>
 				</Filter>
 			</Filter>
 		</Filter>

Copied: box/chris/general/infrastructure/msvc/2003/boxbackup.ncb (from rev 483, box/trunk/infrastructure/msvc/2003/boxbackup.ncb)

Modified: box/chris/general/infrastructure/msvc/2003/boxbackup.suo
===================================================================
(Binary files differ)

Modified: box/chris/general/infrastructure/msvc/2003/boxquery.vcproj
===================================================================
--- box/chris/general/infrastructure/msvc/2003/boxquery.vcproj	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/infrastructure/msvc/2003/boxquery.vcproj	2006-02-21 21:16:45 UTC (rev 484)
@@ -24,7 +24,7 @@
 				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\lib\win32\Debug\boost_regex.lib"
+				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
 				OutputFile="$(OutDir)/bbackupquery.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -84,7 +84,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\lib\win32\Release\boost_regex.lib"
+				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib"
 				OutputFile="$(OutDir)/bbackupquery.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""

Modified: box/chris/general/infrastructure/msvc/2003/common.vcproj
===================================================================
--- box/chris/general/infrastructure/msvc/2003/common.vcproj	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/infrastructure/msvc/2003/common.vcproj	2006-02-21 21:16:45 UTC (rev 484)
@@ -23,7 +23,7 @@
 				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -171,9 +171,6 @@
 						RelativePath="..\..\..\lib\common\IOStreamGetLine.cpp">
 					</File>
 					<File
-						RelativePath="..\..\..\lib\common\LinuxWorkaround.cpp">
-					</File>
-					<File
 						RelativePath="..\..\..\lib\common\MemBlockStream.cpp">
 					</File>
 					<File

Modified: box/chris/general/infrastructure/msvc/2003/win32test.vcproj
===================================================================
--- box/chris/general/infrastructure/msvc/2003/win32test.vcproj	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/infrastructure/msvc/2003/win32test.vcproj	2006-02-21 21:16:45 UTC (rev 484)
@@ -23,7 +23,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32\Debug\libdb42d.lib"
+				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
 				OutputFile="$(OutDir)/win32test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -126,7 +126,7 @@
 				RelativePath="..\..\..\lib\win32\emu.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\lib\win32\win32test.cpp">
+				RelativePath="..\..\..\test\win32\testlibwin32.cpp">
 			</File>
 		</Filter>
 		<Filter

Modified: box/chris/general/lib/common/BoxPlatform.h
===================================================================
--- box/chris/general/lib/common/BoxPlatform.h	2006-02-21 15:47:08 UTC (rev 483)
+++ box/chris/general/lib/common/BoxPlatform.h	2006-02-21 21:16:45 UTC (rev 484)
@@ -46,6 +46,12 @@
 	#define PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 #endif
 
+// Disable memory testing under Darwin, it just doesn't like it very much.
+#ifdef __APPLE__
+	// TODO: We really should get some decent leak detection code.
+	#define PLATFORM_DISABLE_MEM_LEAK_TESTING
+#endif
+
 // Find out if credentials on UNIX sockets can be obtained
 #ifndef HAVE_GETPEEREID
 	#if !HAVE_DECL_SO_PEERCRED




More information about the Boxbackup-dev mailing list