From 5bf096bb2a87cef2858e8d511430b19f21b6bdd2 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sun, 17 Feb 2008 17:14:33 +0000 Subject: [PATCH] - SF [1800596] VS Solutions (ver. 8.0 and 9.0) - SF [1621372] Build Scripts (all Windows scripts consolidated in one) - eliminated warnings in sqlite3.c - updated components file --- .../samples/FormServer/FormServer_vs90.vcproj | 4 +- .../samples/TimeServer/TimeServer_vs90.vcproj | 4 +- CppUnit/CppUnit_vs80.vcproj | 12 +- CppUnit/CppUnit_vs90.vcproj | 8 +- .../WinTestRunner/WinTestRunner_vs80.vcproj | 10 +- .../WinTestRunner/WinTestRunner_vs90.vcproj | 8 +- Data/Data_VS80.sln | 12 +- Data/Data_VS80.vcproj | 162 ++++++++++++++- Data/Data_VS90.sln | 12 +- Data/Data_VS90.vcproj | 152 +++++++++++++- Data/ODBC/ODBC_VS80.sln | 12 +- Data/ODBC/ODBC_VS80.vcproj | 194 +++++++++++++++++- Data/ODBC/ODBC_VS90.sln | 12 +- Data/ODBC/ODBC_VS90.vcproj | 181 +++++++++++++++- Data/ODBC/testsuite/TestSuite_VS80.vcproj | 183 ++++++++++++++++- Data/ODBC/testsuite/TestSuite_VS90.vcproj | 179 +++++++++++++++- Data/ODBC/testsuite/test.mdb | Bin 114688 -> 241664 bytes Data/SQLite/SQLite_VS80.sln | 12 +- Data/SQLite/SQLite_VS80.vcproj | 158 +++++++++++++- Data/SQLite/SQLite_VS90.sln | 12 +- Data/SQLite/SQLite_VS90.vcproj | 154 +++++++++++++- Data/SQLite/src/sqlite3.c | 9 + Data/SQLite/testsuite/TestSuite_VS80.vcproj | 189 ++++++++++++++++- Data/SQLite/testsuite/TestSuite_VS90.vcproj | 176 +++++++++++++++- Data/samples/Binding/Binding_vs80.vcproj | 185 ++++++++++++++++- Data/samples/Binding/Binding_vs90.vcproj | 176 +++++++++++++++- Data/samples/RecordSet/RecordSet_vs80.vcproj | 181 +++++++++++++++- Data/samples/RecordSet/RecordSet_vs90.vcproj | 176 +++++++++++++++- .../RowFormatter/RowFormatter_vs80.vcproj | 181 +++++++++++++++- .../RowFormatter/RowFormatter_vs90.vcproj | 176 +++++++++++++++- Data/samples/Tuple/Tuple_vs80.vcproj | 185 ++++++++++++++++- Data/samples/Tuple/Tuple_vs90.vcproj | 176 +++++++++++++++- .../TypeHandler/TypeHandler_vs80.vcproj | 177 +++++++++++++++- .../TypeHandler/TypeHandler_vs90.vcproj | 176 +++++++++++++++- Data/samples/samples_vs80.sln | 36 +++- Data/samples/samples_vs90.sln | 24 ++- Data/testsuite/TestSuite_VS80.vcproj | 190 ++++++++++++++++- Data/testsuite/TestSuite_VS90.vcproj | 182 +++++++++++++++- Foundation/Foundation_vs80.vcproj | 16 +- Foundation/Foundation_vs90.vcproj | 8 +- .../ActiveMethod/ActiveMethod_vs80.vcproj | 181 +++++++++++++++- .../ActiveMethod/ActiveMethod_vs90.vcproj | 178 +++++++++++++++- .../samples/Activity/Activity_vs80.vcproj | 181 +++++++++++++++- .../samples/Activity/Activity_vs90.vcproj | 178 +++++++++++++++- .../BinaryReaderWriter_vs80.vcproj | 181 +++++++++++++++- .../BinaryReaderWriter_vs90.vcproj | 178 +++++++++++++++- .../samples/DateTime/DateTime_vs80.vcproj | 181 +++++++++++++++- .../samples/DateTime/DateTime_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/Logger/Logger_vs80.vcproj | 181 +++++++++++++++- Foundation/samples/Logger/Logger_vs90.vcproj | 178 +++++++++++++++- .../NotificationQueue_vs80.vcproj | 183 ++++++++++++++++- .../NotificationQueue_vs90.vcproj | 178 +++++++++++++++- .../StringTokenizer_vs80.vcproj | 181 +++++++++++++++- .../StringTokenizer_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/Timer/Timer_vs80.vcproj | 181 +++++++++++++++- Foundation/samples/Timer/Timer_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/URI/URI_vs80.vcproj | 181 +++++++++++++++- Foundation/samples/URI/URI_vs90.vcproj | 178 +++++++++++++++- .../base64decode/base64decode_vs80.vcproj | 181 +++++++++++++++- .../base64decode/base64decode_vs90.vcproj | 178 +++++++++++++++- .../base64encode/base64encode_vs80.vcproj | 181 +++++++++++++++- .../base64encode/base64encode_vs90.vcproj | 178 +++++++++++++++- .../samples/deflate/deflate_vs80.vcproj | 181 +++++++++++++++- .../samples/deflate/deflate_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/dir/dir_vs80.vcproj | 181 +++++++++++++++- Foundation/samples/dir/dir_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/grep/grep_vs80.vcproj | 177 ++++++++++++++++ Foundation/samples/grep/grep_vs90.vcproj | 178 +++++++++++++++- .../samples/hmacmd5/hmacmd5_vs80.vcproj | 181 +++++++++++++++- .../samples/hmacmd5/hmacmd5_vs90.vcproj | 178 +++++++++++++++- .../samples/inflate/inflate_vs80.vcproj | 181 +++++++++++++++- .../samples/inflate/inflate_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/md5/md5_vs80.vcproj | 181 +++++++++++++++- Foundation/samples/md5/md5_vs90.vcproj | 178 +++++++++++++++- Foundation/samples/samples_vs80.sln | 76 ++++++- Foundation/samples/samples_vs90.sln | 76 ++++++- .../samples/uuidgen/uuidgen_vs80.vcproj | 181 +++++++++++++++- .../samples/uuidgen/uuidgen_vs90.vcproj | 178 +++++++++++++++- Foundation/testsuite/TestApp_vs80.vcproj | 10 +- Foundation/testsuite/TestApp_vs90.vcproj | 8 +- Foundation/testsuite/TestLibrary_vs80.vcproj | 149 +++++++++++++- Foundation/testsuite/TestLibrary_vs90.vcproj | 78 ++++++- Foundation/testsuite/TestSuite_vs80.vcproj | 12 +- Foundation/testsuite/TestSuite_vs90.vcproj | 13 +- Net/Net_vs80.vcproj | 18 +- Net/Net_vs90.vcproj | 17 +- Net/samples/EchoServer/EchoServer_vs80.vcproj | 181 +++++++++++++++- Net/samples/EchoServer/EchoServer_vs90.vcproj | 177 +++++++++++++++- .../HTTPFormServer/HTTPFormServer_vs80.vcproj | 181 +++++++++++++++- .../HTTPFormServer/HTTPFormServer_vs90.vcproj | 177 +++++++++++++++- .../HTTPLoadTest/HTTPLoadTest_vs80.vcproj | 181 +++++++++++++++- .../HTTPLoadTest/HTTPLoadTest_vs90.vcproj | 177 +++++++++++++++- .../HTTPTimeServer/HTTPTimeServer_vs80.vcproj | 181 +++++++++++++++- .../HTTPTimeServer/HTTPTimeServer_vs90.vcproj | 177 +++++++++++++++- Net/samples/Mail/Mail_vs80.vcproj | 181 +++++++++++++++- Net/samples/Mail/Mail_vs90.vcproj | 177 +++++++++++++++- Net/samples/Ping/Ping_vs80.vcproj | 181 +++++++++++++++- Net/samples/Ping/Ping_vs90.vcproj | 177 +++++++++++++++- Net/samples/SMTPLogger/SMTPLogger_vs80.vcproj | 181 +++++++++++++++- Net/samples/TimeServer/TimeServer_vs80.vcproj | 181 +++++++++++++++- Net/samples/TimeServer/TimeServer_vs90.vcproj | 177 +++++++++++++++- Net/samples/dict/dict_vs80.vcproj | 181 +++++++++++++++- Net/samples/dict/dict_vs90.vcproj | 177 +++++++++++++++- Net/samples/download/download_vs80.vcproj | 181 +++++++++++++++- Net/samples/download/download_vs90.vcproj | 177 +++++++++++++++- Net/samples/httpget/httpget_vs80.vcproj | 181 +++++++++++++++- Net/samples/httpget/httpget_vs90.vcproj | 177 +++++++++++++++- Net/samples/samples_vs80.sln | 48 ++++- Net/samples/samples_vs90.sln | 44 +++- Net/testsuite/TestSuite_vs80.vcproj | 14 +- Net/testsuite/TestSuite_vs90.vcproj | 13 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj | 24 +-- NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj | 8 +- .../HTTPSTimeServer_vs80.vcproj | 179 +++++++++++++++- .../HTTPSTimeServer_vs90.vcproj | 4 +- .../samples/download/download_vs80.vcproj | 185 ++++++++++++++++- .../samples/download/download_vs90.vcproj | 4 +- NetSSL_OpenSSL/samples/samples_vs80.sln | 10 + .../testsuite/TestSuite_vs80.vcproj | 22 +- .../testsuite/TestSuite_vs90.vcproj | 4 +- Util/Util_vs80.vcproj | 14 +- Util/Util_vs90.vcproj | 10 +- Util/samples/SampleApp/SampleApp_vs80.vcproj | 183 ++++++++++++++++- Util/samples/SampleApp/SampleApp_vs90.vcproj | 177 +++++++++++++++- .../SampleServer/SampleServer_vs80.vcproj | 177 ++++++++++++++++ .../SampleServer/SampleServer_vs90.vcproj | 177 +++++++++++++++- Util/samples/samples_vs80.sln | 10 + Util/samples/samples_vs90.sln | 12 +- Util/testsuite/TestSuite_vs80.vcproj | 7 +- Util/testsuite/TestSuite_vs90.vcproj | 12 +- XML/XML_vs80.vcproj | 12 +- XML/XML_vs90.vcproj | 12 +- XML/samples/DOMParser/DOMParser_vs80.vcproj | 181 +++++++++++++++- XML/samples/DOMParser/DOMParser_vs90.vcproj | 177 +++++++++++++++- XML/samples/DOMWriter/DOMWriter_vs80.vcproj | 181 +++++++++++++++- XML/samples/DOMWriter/DOMWriter_vs90.vcproj | 177 +++++++++++++++- .../PrettyPrint/PrettyPrint_vs80.vcproj | 181 +++++++++++++++- .../PrettyPrint/PrettyPrint_vs90.vcproj | 177 +++++++++++++++- XML/samples/SAXParser/SAXParser_vs80.vcproj | 181 +++++++++++++++- XML/samples/SAXParser/SAXParser_vs90.vcproj | 177 +++++++++++++++- XML/samples/samples_vs80.sln | 20 +- XML/samples/samples_vs90.sln | 18 ++ XML/testsuite/TestSuite_vs80.vcproj | 14 +- XML/testsuite/TestSuite_vs90.vcproj | 12 +- build_vs71.cmd | 71 ------- build_vs80.cmd | 71 ------- build_vs90.cmd | 71 ------- components | 1 + 148 files changed, 17180 insertions(+), 670 deletions(-) delete mode 100644 build_vs71.cmd delete mode 100644 build_vs80.cmd delete mode 100644 build_vs90.cmd diff --git a/ApacheConnector/samples/FormServer/FormServer_vs90.vcproj b/ApacheConnector/samples/FormServer/FormServer_vs90.vcproj index 01ab623e6..2a5c70092 100644 --- a/ApacheConnector/samples/FormServer/FormServer_vs90.vcproj +++ b/ApacheConnector/samples/FormServer/FormServer_vs90.vcproj @@ -69,7 +69,7 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="PocoFoundationd.lib" - OutputFile="bin\FormServerd.dll" + OutputFile="bin\$(ProjectName)d.dll" LinkIncremental="2" AdditionalLibraryDirectories="..\..\..\lib" GenerateDebugInformation="true" @@ -158,7 +158,7 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="PocoFoundation.lib" - OutputFile="bin\FormServer.dll" + OutputFile="bin\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\..\lib" GenerateDebugInformation="false" diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs90.vcproj b/ApacheConnector/samples/TimeServer/TimeServer_vs90.vcproj index ae38702d0..5d9de7cb5 100644 --- a/ApacheConnector/samples/TimeServer/TimeServer_vs90.vcproj +++ b/ApacheConnector/samples/TimeServer/TimeServer_vs90.vcproj @@ -69,7 +69,7 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="PocoFoundationd.lib" - OutputFile="bin\TimeServerd.dll" + OutputFile="bin\$(ProjectName)d.dll" LinkIncremental="2" AdditionalLibraryDirectories="..\..\..\lib" GenerateDebugInformation="true" @@ -158,7 +158,7 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="PocoFoundation.lib" - OutputFile="bin\TimeServer.dll" + OutputFile="bin\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\..\lib" GenerateDebugInformation="false" diff --git a/CppUnit/CppUnit_vs80.vcproj b/CppUnit/CppUnit_vs80.vcproj index 28dd2fd1b..b6c37fbb3 100644 --- a/CppUnit/CppUnit_vs80.vcproj +++ b/CppUnit/CppUnit_vs80.vcproj @@ -84,13 +84,13 @@ @@ -68,15 +68,15 @@ @@ -161,7 +161,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_VS90.sln b/Data/Data_VS90.sln index df4957d12..671f6142f 100644 --- a/Data/Data_VS90.sln +++ b/Data/Data_VS90.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_VS90.vcproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS90.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" @@ -10,17 +10,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 + debug_static|Win32 = debug_static|Win32 release_shared|Win32 = release_shared|Win32 + release_static|Win32 = release_static|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/Data_VS90.vcproj b/Data/Data_VS90.vcproj index 0a5759aa3..5707a6262 100644 --- a/Data/Data_VS90.vcproj +++ b/Data/Data_VS90.vcproj @@ -68,12 +68,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/ODBC/ODBC_VS80.sln b/Data/ODBC/ODBC_VS80.sln index 8a40c8bbf..069590a10 100644 --- a/Data/ODBC/ODBC_VS80.sln +++ b/Data/ODBC/ODBC_VS80.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +# Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS80.vcproj", "{1B30A91B-375F-11DB-837B-00123FC423B5}" ProjectSection(ProjectDependencies) = postProject {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5} @@ -10,17 +10,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 + debug_static|Win32 = debug_static|Win32 release_shared|Win32 = release_shared|Win32 + release_static|Win32 = release_static|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/ODBC/ODBC_VS80.vcproj b/Data/ODBC/ODBC_VS80.vcproj index 400e47dde..c1e6f45aa 100644 --- a/Data/ODBC/ODBC_VS80.vcproj +++ b/Data/ODBC/ODBC_VS80.vcproj @@ -17,8 +17,8 @@ @@ -68,15 +68,15 @@ @@ -161,7 +161,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -364,6 +508,22 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -359,6 +502,22 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/ODBC/testsuite/test.mdb b/Data/ODBC/testsuite/test.mdb index 4ff6be8a62c50d363a5f3168928a40882460e32f..9f4754bc839b432ef9c5d8b7b20e38765ac457a3 100644 GIT binary patch delta 377 zcmZo@U~hQ9w}FX|k!`ae-+RW%3VeK<1dj7h+`uxu)1HxM`d$S_%}EN*yh02JAhbC^ z;WIy@;N+M9h0Q4j^VW0wa4|upg(mYpP-dz-wQ(UMmy{rb1yGogfq|cqA>@_8q;npR z9U$~(-&b2pxwmpKL$w)B=S^UYXHh+=dUE5!ehx7fu+IPg_!%BZ@Gx)z&0q%#Z5PdC zd>yt~NMI}fW`zw81_7~g!)oSf6BsR6ErI^D+-^I8(NP{4c9U5$U4htg+6G1zZcrG2 T03*Zx&4L0O_^0pR&*%sMFj0a~ delta 170 zcmZp8z}L{gzJZC4k$JNq-+RW%3VeK<1dj7hJ}qxL`GGvkBn4+)K?Vd6+#I0rnV(T$ za!i22<`jc@>$&~7n4r>vlX)K~Z#H_s$R)$TAjlvI6lP>#;AdpGGQ+z@-0rahgx>7? wYHKO?P7Y?MHvQ?m35@X@7f$97V*zXW|Bs*Hfdmf&7f?GpP-weoCgbZc09z<2w*UYD diff --git a/Data/SQLite/SQLite_VS80.sln b/Data/SQLite/SQLite_VS80.sln index 0a304310c..cf38146f9 100644 --- a/Data/SQLite/SQLite_VS80.sln +++ b/Data/SQLite/SQLite_VS80.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +# Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_VS80.vcproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS80.vcproj", "{1B30A91B-375F-11DB-837B-00123FC423B5}" @@ -10,17 +10,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 + debug_static|Win32 = debug_static|Win32 release_shared|Win32 = release_shared|Win32 + release_static|Win32 = release_static|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/SQLite/SQLite_VS80.vcproj b/Data/SQLite/SQLite_VS80.vcproj index 2e4df720b..c33243d2c 100644 --- a/Data/SQLite/SQLite_VS80.vcproj +++ b/Data/SQLite/SQLite_VS80.vcproj @@ -17,8 +17,8 @@ @@ -68,15 +68,15 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/SQLite_VS90.sln b/Data/SQLite/SQLite_VS90.sln index b10472e94..79a730667 100644 --- a/Data/SQLite/SQLite_VS90.sln +++ b/Data/SQLite/SQLite_VS90.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_VS90.vcproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS90.vcproj", "{1B30A91B-375F-11DB-837B-00123FC423B5}" @@ -10,17 +10,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 + debug_static|Win32 = debug_static|Win32 release_shared|Win32 = release_shared|Win32 + release_static|Win32 = release_static|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 {1B30A91B-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32 + {1B30A91B-375F-11DB-837B-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/SQLite/SQLite_VS90.vcproj b/Data/SQLite/SQLite_VS90.vcproj index 165993d9c..da68f7595 100644 --- a/Data/SQLite/SQLite_VS90.vcproj +++ b/Data/SQLite/SQLite_VS90.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\include;.\src;..\..\Foundation\include;..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_DLL;SQLite_EXPORTS;NO_TCL;THREADSAFE" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_DLL;SQLite_EXPORTS;NO_TCL;THREADSAFE;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -69,12 +69,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/src/sqlite3.c b/Data/SQLite/src/sqlite3.c index 9dcdf846d..04d7070be 100644 --- a/Data/SQLite/src/sqlite3.c +++ b/Data/SQLite/src/sqlite3.c @@ -19,6 +19,15 @@ ** ** This amalgamation was generated on 2008-01-31 16:37:58 UTC. */ + +/* +++ Added for Poco::Data::SQLite Windows build. */ +#if defined(_MSC_VER) + #pragma warning( disable : 4018) /* conversion from 'double' to 'int', possible loss of data */ + #pragma warning( disable : 4244) /* signed/unsigned mismatch */ + #define _CRT_SECURE_NO_WARNINGS +#endif +/* --- Added for Poco::Data::SQLite Windows build. */ + #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 #ifndef SQLITE_PRIVATE diff --git a/Data/SQLite/testsuite/TestSuite_VS80.vcproj b/Data/SQLite/testsuite/TestSuite_VS80.vcproj index f0063ac83..59f47f94f 100644 --- a/Data/SQLite/testsuite/TestSuite_VS80.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS80.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,11 +66,11 @@ /> @@ -103,6 +104,7 @@ OutputDirectory="obj\release_shared" IntermediateDirectory="obj\release_shared" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" CharacterSet="2" > @@ -152,11 +154,186 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,7 +66,7 @@ /> @@ -152,7 +154,182 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,7 +66,7 @@ /> @@ -152,7 +154,182 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,11 +66,11 @@ /> @@ -103,6 +104,7 @@ OutputDirectory="obj\release_shared" IntermediateDirectory="obj\release_shared" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" CharacterSet="2" > @@ -152,11 +154,186 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -101,8 +101,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Foundation/Foundation_vs80.vcproj b/Foundation/Foundation_vs80.vcproj index 8acfd557d..4bf54b92a 100644 --- a/Foundation/Foundation_vs80.vcproj +++ b/Foundation/Foundation_vs80.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Foundation/samples/grep/grep_vs90.vcproj b/Foundation/samples/grep/grep_vs90.vcproj index 8d3db961a..a473108c4 100644 --- a/Foundation/samples/grep/grep_vs90.vcproj +++ b/Foundation/samples/grep/grep_vs90.vcproj @@ -5,6 +5,7 @@ Name="grep" ProjectGUID="{52626367-962B-44AA-9750-42F55EDA292E}" Keyword="Win32Proj" + TargetFrameworkVersion="0" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -68,7 +69,7 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="PocoFoundationd.lib" - OutputFile="bin\TestLibraryd.dll" + OutputFile="bin\$(ProjectName)d.dll" LinkIncremental="2" AdditionalLibraryDirectories="..\..\lib" GenerateDebugInformation="true" @@ -158,7 +159,7 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="PocoFoundation.lib" - OutputFile="bin\TestLibrary.dll" + OutputFile="bin\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\lib" GenerateDebugInformation="false" @@ -194,6 +195,148 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Foundation/testsuite/TestLibrary_vs90.vcproj b/Foundation/testsuite/TestLibrary_vs90.vcproj index 5910b4c45..e7f0c279e 100644 --- a/Foundation/testsuite/TestLibrary_vs90.vcproj +++ b/Foundation/testsuite/TestLibrary_vs90.vcproj @@ -5,6 +5,7 @@ Name="TestLibrary" ProjectGUID="{0955EB03-544B-4BD4-9C10-89CF38078F5F}" Keyword="Win32Proj" + TargetFrameworkVersion="0" > + + + + + + + + + + + + + + + + + + + diff --git a/Foundation/testsuite/TestSuite_vs80.vcproj b/Foundation/testsuite/TestSuite_vs80.vcproj index a96fd5e66..7dad54b67 100644 --- a/Foundation/testsuite/TestSuite_vs80.vcproj +++ b/Foundation/testsuite/TestSuite_vs80.vcproj @@ -67,7 +67,7 @@ @@ -294,7 +293,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\include;..\Foundation\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Net_EXPORTS;POCO_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Net_EXPORTS;POCO_STATIC;WINVER=0x0500" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -319,7 +318,7 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -265,8 +265,8 @@ diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj index ff6685e77..1c7f719ea 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs90.vcproj b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs90.vcproj index 972d73982..682688e5c 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs90.vcproj +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs90.vcproj @@ -66,7 +66,7 @@ @@ -157,7 +157,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,7 +156,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/SampleServer/SampleServer_vs90.vcproj b/Util/samples/SampleServer/SampleServer_vs90.vcproj index ec0bc581c..29f687523 100644 --- a/Util/samples/SampleServer/SampleServer_vs90.vcproj +++ b/Util/samples/SampleServer/SampleServer_vs90.vcproj @@ -66,11 +66,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +