From e47d438d74b339afe531164f4ace063a5d7ae8a2 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Fri, 26 Jul 2019 07:50:59 +0200 Subject: [PATCH] Update .gitattributes and renormalize files git add --renormalize . --- .gitattributes | 50 +- .github/ISSUE_TEMPLATE/Bug_report.md | 50 +- .github/ISSUE_TEMPLATE/Feature_request.md | 34 +- extern/xmlrpcpp/xmlrpcpp/test/FileClient.cpp | 216 ++++---- extern/xmlrpcpp/xmlrpcpp/test/FileClient.dsp | 192 +++---- extern/xmlrpcpp/xmlrpcpp/test/HelloClient.dsp | 192 +++---- extern/xmlrpcpp/xmlrpcpp/test/HelloServer.dsp | 192 +++---- .../xmlrpcpp/test/TestBase64Client.cpp | 90 +-- .../xmlrpcpp/test/TestBase64Client.dsp | 192 +++---- .../xmlrpcpp/test/TestBase64Server.cpp | 136 ++--- .../xmlrpcpp/test/TestBase64Server.dsp | 192 +++---- extern/xmlrpcpp/xmlrpcpp/test/TestValues.cpp | 466 ++++++++-------- extern/xmlrpcpp/xmlrpcpp/test/TestValues.dsp | 190 +++---- .../xmlrpcpp/test/TestValuesWin32.cpp | 506 ++++++++--------- extern/xmlrpcpp/xmlrpcpp/test/TestXml.cpp | 106 ++-- extern/xmlrpcpp/xmlrpcpp/test/TestXml.dsp | 192 +++---- extern/xmlrpcpp/xmlrpcpp/test/Validator.cpp | 414 +++++++------- extern/xmlrpcpp/xmlrpcpp/test/Validator.dsp | 190 +++---- .../xmlrpcpp/test/arrayOfStructsTest.xml | 510 ++++++++--------- .../xmlrpcpp/test/countTheEntities.xml | 20 +- .../xmlrpcpp/xmlrpcpp/test/easyStructTest.xml | 58 +- extern/xmlrpcpp/xmlrpcpp/test/echo.xml | 18 +- .../xmlrpcpp/xmlrpcpp/test/echoStructTest.xml | 522 +++++++++--------- extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsp | 366 ++++++------ extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsw | 298 +++++----- 25 files changed, 2703 insertions(+), 2689 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1d115a68871..b9b32454c63 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,23 +1,37 @@ -/scripts/debian/ export-ignore -/src/devices/dimax_u2c/blob/ export-ignore +.appveyor.yml export-ignore +.clang-format export-ignore +.coveralls.yml export-ignore .gitattributes export-ignore +.github/ export-ignore .gitignore export-ignore .mailmap export-ignore -.appveyor.yml export-ignore -.coveralls.yml export-ignore .travis.yml export-ignore -*.c whitespace=tab-in-indent -*.h whitespace=tab-in-indent -*.cpp whitespace=tab-in-indent -*.hpp whitespace=tab-in-indent -*.cc whitespace=tab-in-indent -*.txt whitespace=tab-in-indent -*.cmake whitespace=tab-in-indent -*.qml whitespace=tab-in-indent -*.inl whitespace=tab-in-indent -*.dox whitespace=tab-in-indent -*.xml whitespace=tab-in-indent -*.inl whitespace=tab-in-indent -*.thrift whitespace=tab-in-indent -*.msg whitespace=tab-in-indent +*.txt whitespace=trailing-space,space-before-tab,tab-in-indent +*.md whitespace=trailing-space,space-before-tab,tab-in-indent +*.dox whitespace=trailing-space,space-before-tab,tab-in-indent +*.qml whitespace=trailing-space,space-before-tab,tab-in-indent +*.msg whitespace=trailing-space,space-before-tab,tab-in-indent + +*.c whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.h whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.hpp whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.cc whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.thrift whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.xml whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 +*.qrc whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4 + + +CMakeLists.txt whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=2 +*.cmake whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=2 + +*.vcproj text eol=crlf +*.dsp text eol=crlf +*.dsw text eol=crlf + +*.png binary +*.jpg binary +*.gif binary +*.tiff binary +*.ico binary diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index fe49e4377f3..c010beae5ad 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -1,25 +1,25 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Configuration (please complete the following information):** - - OS: - - yarp version: -- compiler: - -**Additional context** -Add any other context about the problem here. +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Configuration (please complete the following information):** + - OS: + - yarp version: +- compiler: + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md index 375207e18a8..b904f1f842c 100644 --- a/.github/ISSUE_TEMPLATE/Feature_request.md +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -1,17 +1,17 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/extern/xmlrpcpp/xmlrpcpp/test/FileClient.cpp b/extern/xmlrpcpp/xmlrpcpp/test/FileClient.cpp index 81d9f3e409c..a0f79ee3524 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/FileClient.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/FileClient.cpp @@ -1,108 +1,108 @@ -// FileClient.cpp : A simple xmlrpc client. Usage: FileClient serverHost serverPort xmlfile -// Reads an xmlrpc request from the specified xmlfile and calls the method on the server. -// -// Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows) - -#include "XmlRpc.h" -#include -#include -#include - -using namespace XmlRpc; - -std::string parseRequest(std::string const& xml, XmlRpcValue& params); - - -int main(int argc, char* argv[]) -{ - if (argc != 4) { - std::cerr << "Usage: FileClient serverHost serverPort requestXmlFile\n"; - return -1; - } - int port = atoi(argv[2]); - - XmlRpc::setVerbosity(5); - XmlRpcClient c(argv[1], port); - - // - std::ifstream infile(argv[3]); - if (infile.fail()) { - std::cerr << "Could not open file '" << argv[3] << "'.\n"; - return -1; - } - - // Suck in the file. This is a one-liner in good compilers (which vc++ 6 is not)... - infile.seekg(0L, std::ios::end); - long nb = infile.tellg(); - infile.clear(); - infile.seekg(0L); - char* b = new char[nb+1]; - infile.read(b, nb); - b[nb] = 0; - - std::cout << "Read file.\n"; - - // Find the methodName and parse the params - std::string s(b); - XmlRpcValue params; - std::string name = parseRequest(s, params); - - if (name.empty()) { - std::cerr << "Could not parse file\n"; - return -1; - } - - for (;;) { - XmlRpcValue result; - std::cout << "Calling " << name << std::endl; - if (c.execute(name.c_str(), params, result)) - std::cout << result << "\n\n"; - else - std::cout << "Error calling '" << name << "'\n\n"; - std::cout << "Again? [y]: "; - std::string ans; - std::cin >> ans; - if (ans != "" && ans != "y") break; - } - - return 0; -} - - -// -std::string -parseRequest(std::string const& xml, XmlRpcValue& params) -{ - const char METHODNAME_TAG[] = ""; - const char PARAMS_TAG[] = ""; - const char PARAMS_ETAG[] = ""; - const char PARAM_TAG[] = ""; - const char PARAM_ETAG[] = ""; - - int offset = 0; // Number of chars parsed from the request - - std::string methodName = XmlRpcUtil::parseTag(METHODNAME_TAG, xml, &offset); - XmlRpcUtil::log(3, "XmlRpcServerConnection::parseRequest: parsed methodName %s.", methodName.c_str()); - - if (! methodName.empty() && XmlRpcUtil::findTag(PARAMS_TAG, xml, &offset)) - { - int nArgs = 0; - while (XmlRpcUtil::nextTagIs(PARAM_TAG, xml, &offset)) { - std::cout << "Parsing arg " << nArgs+1 << std::endl; - XmlRpcValue arg(xml, &offset); - if ( ! arg.valid()) { - std::cerr << "Invalid argument\n"; - return std::string(); - } - std::cout << "Adding arg " << nArgs+1 << " to params array." << std::endl; - params[nArgs++] = arg; - (void) XmlRpcUtil::nextTagIs(PARAM_ETAG, xml, &offset); - } - - XmlRpcUtil::log(3, "XmlRpcServerConnection::parseRequest: parsed %d params.", nArgs); - - (void) XmlRpcUtil::nextTagIs(PARAMS_ETAG, xml, &offset); - } - - return methodName; -} +// FileClient.cpp : A simple xmlrpc client. Usage: FileClient serverHost serverPort xmlfile +// Reads an xmlrpc request from the specified xmlfile and calls the method on the server. +// +// Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows) + +#include "XmlRpc.h" +#include +#include +#include + +using namespace XmlRpc; + +std::string parseRequest(std::string const& xml, XmlRpcValue& params); + + +int main(int argc, char* argv[]) +{ + if (argc != 4) { + std::cerr << "Usage: FileClient serverHost serverPort requestXmlFile\n"; + return -1; + } + int port = atoi(argv[2]); + + XmlRpc::setVerbosity(5); + XmlRpcClient c(argv[1], port); + + // + std::ifstream infile(argv[3]); + if (infile.fail()) { + std::cerr << "Could not open file '" << argv[3] << "'.\n"; + return -1; + } + + // Suck in the file. This is a one-liner in good compilers (which vc++ 6 is not)... + infile.seekg(0L, std::ios::end); + long nb = infile.tellg(); + infile.clear(); + infile.seekg(0L); + char* b = new char[nb+1]; + infile.read(b, nb); + b[nb] = 0; + + std::cout << "Read file.\n"; + + // Find the methodName and parse the params + std::string s(b); + XmlRpcValue params; + std::string name = parseRequest(s, params); + + if (name.empty()) { + std::cerr << "Could not parse file\n"; + return -1; + } + + for (;;) { + XmlRpcValue result; + std::cout << "Calling " << name << std::endl; + if (c.execute(name.c_str(), params, result)) + std::cout << result << "\n\n"; + else + std::cout << "Error calling '" << name << "'\n\n"; + std::cout << "Again? [y]: "; + std::string ans; + std::cin >> ans; + if (ans != "" && ans != "y") break; + } + + return 0; +} + + +// +std::string +parseRequest(std::string const& xml, XmlRpcValue& params) +{ + const char METHODNAME_TAG[] = ""; + const char PARAMS_TAG[] = ""; + const char PARAMS_ETAG[] = ""; + const char PARAM_TAG[] = ""; + const char PARAM_ETAG[] = ""; + + int offset = 0; // Number of chars parsed from the request + + std::string methodName = XmlRpcUtil::parseTag(METHODNAME_TAG, xml, &offset); + XmlRpcUtil::log(3, "XmlRpcServerConnection::parseRequest: parsed methodName %s.", methodName.c_str()); + + if (! methodName.empty() && XmlRpcUtil::findTag(PARAMS_TAG, xml, &offset)) + { + int nArgs = 0; + while (XmlRpcUtil::nextTagIs(PARAM_TAG, xml, &offset)) { + std::cout << "Parsing arg " << nArgs+1 << std::endl; + XmlRpcValue arg(xml, &offset); + if ( ! arg.valid()) { + std::cerr << "Invalid argument\n"; + return std::string(); + } + std::cout << "Adding arg " << nArgs+1 << " to params array." << std::endl; + params[nArgs++] = arg; + (void) XmlRpcUtil::nextTagIs(PARAM_ETAG, xml, &offset); + } + + XmlRpcUtil::log(3, "XmlRpcServerConnection::parseRequest: parsed %d params.", nArgs); + + (void) XmlRpcUtil::nextTagIs(PARAMS_ETAG, xml, &offset); + } + + return methodName; +} diff --git a/extern/xmlrpcpp/xmlrpcpp/test/FileClient.dsp b/extern/xmlrpcpp/xmlrpcpp/test/FileClient.dsp index 65ada0f3c8b..1173af062c8 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/FileClient.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/FileClient.dsp @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="FileClient" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=FileClient - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "FileClient.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "FileClient.mak" CFG="FileClient - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "FileClient - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "FileClient - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "FileClient - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "FileClient - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "FileClient - Win32 Release" -# Name "FileClient - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\FileClient.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="FileClient" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=FileClient - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "FileClient.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "FileClient.mak" CFG="FileClient - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "FileClient - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "FileClient - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "FileClient - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "FileClient - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "FileClient - Win32 Release" +# Name "FileClient - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\FileClient.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/HelloClient.dsp b/extern/xmlrpcpp/xmlrpcpp/test/HelloClient.dsp index 2580caf5535..c7c8fc03a91 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/HelloClient.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/HelloClient.dsp @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="HelloClient" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=HelloClient - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "HelloClient.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "HelloClient.mak" CFG="HelloClient - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "HelloClient - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "HelloClient - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "HelloClient - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "HelloClient - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "HelloClient - Win32 Release" -# Name "HelloClient - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\HelloClient.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="HelloClient" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=HelloClient - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "HelloClient.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "HelloClient.mak" CFG="HelloClient - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "HelloClient - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "HelloClient - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "HelloClient - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "HelloClient - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "HelloClient - Win32 Release" +# Name "HelloClient - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\HelloClient.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/HelloServer.dsp b/extern/xmlrpcpp/xmlrpcpp/test/HelloServer.dsp index 4feaeed9467..a5dd0ebf302 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/HelloServer.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/HelloServer.dsp @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="HelloServer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=HelloServer - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "HelloServer.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "HelloServer.mak" CFG="HelloServer - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "HelloServer - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "HelloServer - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "HelloServer - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "HelloServer - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "HelloServer - Win32 Release" -# Name "HelloServer - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\HelloServer.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="HelloServer" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=HelloServer - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "HelloServer.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "HelloServer.mak" CFG="HelloServer - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "HelloServer - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "HelloServer - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "HelloServer - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "HelloServer - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "HelloServer - Win32 Release" +# Name "HelloServer - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\HelloServer.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Client.cpp b/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Client.cpp index de954386052..5cebf56f579 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Client.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Client.cpp @@ -1,45 +1,45 @@ -// TestBase64Client.cpp : A simple xmlrpc client that returns a png file -// encoded as base64 data to the client. -// -// Usage: TestBase64Client serverHost serverPort outputfile -// Requests a png file from the specified server and saves it in outputfile. -// Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows) - -#include "XmlRpc.h" -#include -#include -#include - -using namespace XmlRpc; - -int main(int argc, char* argv[]) -{ - if (argc != 4) { - std::cerr << "Usage: TestBase64Client serverHost serverPort outputFile\n"; - return -1; - } - int port = atoi(argv[2]); - - //XmlRpc::setVerbosity(5); - XmlRpcClient c(argv[1], port); - - XmlRpcValue noArgs, result; - if (c.execute("TestBase64", noArgs, result)) - { - const XmlRpcValue::BinaryData& data = result; - std::ofstream outfile(argv[3], std::ios::binary | std::ios::trunc); - if (outfile.fail()) - std::cerr << "Error opening " << argv[3] << " for output.\n"; - else - { - int n = int(data.size()); - for (int i=0; i +#include +#include + +using namespace XmlRpc; + +int main(int argc, char* argv[]) +{ + if (argc != 4) { + std::cerr << "Usage: TestBase64Client serverHost serverPort outputFile\n"; + return -1; + } + int port = atoi(argv[2]); + + //XmlRpc::setVerbosity(5); + XmlRpcClient c(argv[1], port); + + XmlRpcValue noArgs, result; + if (c.execute("TestBase64", noArgs, result)) + { + const XmlRpcValue::BinaryData& data = result; + std::ofstream outfile(argv[3], std::ios::binary | std::ios::trunc); + if (outfile.fail()) + std::cerr << "Error opening " << argv[3] << " for output.\n"; + else + { + int n = int(data.size()); + for (int i=0; i -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=TestBase64Client - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TestBase64Client.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TestBase64Client.mak" CFG="TestBase64Client - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TestBase64Client - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "TestBase64Client - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TestBase64Client - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "TestBase64Client - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "TestBase64Client - Win32 Release" -# Name "TestBase64Client - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\TestBase64Client.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="TestBase64Client" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=TestBase64Client - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "TestBase64Client.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "TestBase64Client.mak" CFG="TestBase64Client - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "TestBase64Client - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "TestBase64Client - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "TestBase64Client - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "TestBase64Client - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "TestBase64Client - Win32 Release" +# Name "TestBase64Client - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\TestBase64Client.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.cpp b/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.cpp index 7cb4a633586..c9165929929 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.cpp @@ -1,68 +1,68 @@ -// TestBase64Server.cpp : Simple XMLRPC server example. Usage: TestBase64Server serverPort -// -#if defined(_MSC_VER) -# pragma warning(disable:4786) // identifier was truncated in debug info -#endif - - -#include -#include -#include -#include - - -#include "XmlRpc.h" -using namespace XmlRpc; - - -// The server -XmlRpcServer s; - -// No arguments, result is Base64-encoded pngnow.png data. -class TestBase64 : public XmlRpcServerMethod -{ -public: - TestBase64(XmlRpcServer* s) : XmlRpcServerMethod("TestBase64", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::ifstream infile("pngnow.png", std::ios::binary); - if (infile.fail()) - infile.open("../pngnow.png", std::ios::binary); - if (infile.fail()) - result = "Could not open file pngnow.png"; - else { - - XmlRpcValue::BinaryData& data = result; - int n = 0; - for (;; ++n) { - char c = infile.get(); - if (infile.eof()) break; - data.push_back(c); - } - std::cerr << "Read " << n << " bytes from pngnow.png\n"; - } - } -} TestBase64(&s); // This constructor registers the method with the server - - - -int main(int argc, char* argv[]) -{ - if (argc != 2) { - std::cerr << "Usage: TestBase64Server serverPort\n"; - return -1; - } - int port = atoi(argv[1]); - - //XmlRpc::setVerbosity(5); - - // Create the server socket on the specified port - s.bindAndListen(port); - - // Wait for requests indefinitely - s.work(-1.0); - - return 0; -} - +// TestBase64Server.cpp : Simple XMLRPC server example. Usage: TestBase64Server serverPort +// +#if defined(_MSC_VER) +# pragma warning(disable:4786) // identifier was truncated in debug info +#endif + + +#include +#include +#include +#include + + +#include "XmlRpc.h" +using namespace XmlRpc; + + +// The server +XmlRpcServer s; + +// No arguments, result is Base64-encoded pngnow.png data. +class TestBase64 : public XmlRpcServerMethod +{ +public: + TestBase64(XmlRpcServer* s) : XmlRpcServerMethod("TestBase64", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::ifstream infile("pngnow.png", std::ios::binary); + if (infile.fail()) + infile.open("../pngnow.png", std::ios::binary); + if (infile.fail()) + result = "Could not open file pngnow.png"; + else { + + XmlRpcValue::BinaryData& data = result; + int n = 0; + for (;; ++n) { + char c = infile.get(); + if (infile.eof()) break; + data.push_back(c); + } + std::cerr << "Read " << n << " bytes from pngnow.png\n"; + } + } +} TestBase64(&s); // This constructor registers the method with the server + + + +int main(int argc, char* argv[]) +{ + if (argc != 2) { + std::cerr << "Usage: TestBase64Server serverPort\n"; + return -1; + } + int port = atoi(argv[1]); + + //XmlRpc::setVerbosity(5); + + // Create the server socket on the specified port + s.bindAndListen(port); + + // Wait for requests indefinitely + s.work(-1.0); + + return 0; +} + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.dsp b/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.dsp index 8d8480fa98b..0a00d3309ca 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestBase64Server.dsp @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="TestBase64Server" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=TestBase64Server - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TestBase64Server.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TestBase64Server.mak" CFG="TestBase64Server - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TestBase64Server - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "TestBase64Server - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TestBase64Server - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /Fr /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "TestBase64Server - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "TestBase64Server - Win32 Release" -# Name "TestBase64Server - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\TestBase64Server.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="TestBase64Server" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=TestBase64Server - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "TestBase64Server.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "TestBase64Server.mak" CFG="TestBase64Server - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "TestBase64Server - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "TestBase64Server - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "TestBase64Server - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /Fr /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "TestBase64Server - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "TestBase64Server - Win32 Release" +# Name "TestBase64Server - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\TestBase64Server.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestValues.cpp b/extern/xmlrpcpp/xmlrpcpp/test/TestValues.cpp index e770e51cae1..ad726f1cfbf 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestValues.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestValues.cpp @@ -1,233 +1,233 @@ -// TestValues.cpp : Test XML encoding and decoding of XmlRpcValues. - -#include - -#include "XmlRpcValue.h" - - -#include -#include - - -using namespace XmlRpc; - - -void testBoolean() -{ - XmlRpcValue booleanFalse(false); - XmlRpcValue booleanTrue(true); - int offset = 0; - XmlRpcValue booleanFalseXml("0", &offset); - offset = 0; - XmlRpcValue booleanTrueXml("1", &offset); - assert(booleanFalse != booleanTrue); - assert(booleanFalse == booleanFalseXml); - assert(booleanFalse != booleanTrueXml); - - if (bool(booleanFalse)) - assert(false); - - if ( ! bool(booleanTrue)) - assert(false); -} - -// Int -void testInt() -{ - XmlRpcValue int0(0); - XmlRpcValue int1(1); - XmlRpcValue int10(10); - XmlRpcValue int_1(-1); - int offset = 0; - XmlRpcValue int0Xml("0", &offset); - offset = 0; - XmlRpcValue int9Xml("9", &offset); - assert(int0 == int0Xml); - assert(int(int10) - int(int1) == int(int9Xml)); - assert(9 == int(int9Xml)); - assert(int(int10) + int(int_1) == int(int9Xml)); -} - -void testDouble() -{ - // Double - XmlRpcValue d(43.7); - int offset = 0; - XmlRpcValue dXml("56.3", &offset); - assert(double(d) + double(dXml) == 100.0); // questionable practice... -} - -void testString() -{ - // String - XmlRpcValue s("Now is the time <&"); - char csxml[] = "Now is the time <&"; - std::string ssxml = csxml; - int offset = 0; - XmlRpcValue vscXml(csxml, &offset); - offset = 0; - XmlRpcValue vssXml(ssxml, &offset); - assert(s == vscXml); - assert(s == vssXml); - offset = 0; - XmlRpcValue fromXml(vssXml.toXml(), &offset); - assert(s == fromXml); - - // Empty or blank strings with no tags - std::string emptyStringXml(""); - offset = 0; - XmlRpcValue emptyStringVal1(emptyStringXml, &offset); - XmlRpcValue emptyStringVal2(""); - assert(emptyStringVal1 == emptyStringVal2); - - emptyStringXml = " "; - offset = 0; - XmlRpcValue blankStringVal(emptyStringXml, &offset); - assert(std::string(blankStringVal) == " "); -} - - -void testDateTime() -{ - // DateTime - int offset = 0; - XmlRpcValue dateTime("19040101T03:12:35", &offset); - struct tm &t = dateTime; - assert(t.tm_year == 1904 && t.tm_min == 12); -} - - -void testArray(XmlRpcValue const& d) -{ - // Array - XmlRpcValue a; - a.setSize(4); - a[0] = 1; - a[1] = std::string("two"); - a[2] = 43.7; - a[3] = "four"; - assert(int(a[0]) == 1); - assert(a[2] == d); - - char csaXml[] = - "\n" - " \n" - " 1 \n" - " two\n" - " 43.7\n" - " four\n" - " \n" - ""; - - int offset = 0; - XmlRpcValue aXml(csaXml, &offset); - assert(a == aXml); -} - -void testStruct() -{ - // Struct - XmlRpcValue struct1; - struct1["i4"] = 1; - struct1["str"] = "two"; - struct1["d"] = 43.7; - - XmlRpcValue a; - a.setSize(4); - a[0] = 1; - a[1] = std::string("two"); - a[2] = 43.7; - a[3] = "four"; - - assert(struct1["d"] == a[2]); - - char csStructXml[] = - "\n" - " \n" - " i4 \n" - " 1 \n" - " \n" - " \n" - " d \n" - " 43.7\n" - " \n" - " \n" - " str \n" - " two\n" - " \n" - ""; - - int offset = 0; - XmlRpcValue structXml(csStructXml, &offset); - assert(struct1 == structXml); - - XmlRpcValue astruct; - astruct["array"] = a; - assert(astruct["array"][2] == struct1["d"]); - - for (int i=0; i<10; i++) { - XmlRpcValue Event; - Event["Name"] = "string"; - - Event.clear(); - - const int NELMTS = 100; - int ii; - - for (ii=0; ii< NELMTS; ++ii) { - char buf[40]; - sprintf(buf,"%d", ii); - Event[std::string(buf)] = buf; - } - - Event.clear(); - - for (ii=0; ii< NELMTS; ++ii) { - char buf[40]; - sprintf(buf,"%d", ii); - if (ii != NELMTS/2) - Event[std::string(buf)] = ii; - else - for (int jj=0; jj< NELMTS; ++jj) { - char bufj[40]; - sprintf(bufj,"%d", jj); - Event[std::string(buf)][std::string(bufj)] = bufj; - } - } - - for (ii=0; ii< NELMTS; ++ii) { - char buf[40]; - sprintf(buf,"%d", ii); - if (ii != NELMTS/2) - assert(Event[std::string(buf)] == XmlRpcValue(ii)); - else - assert(Event[std::string(buf)].size() == NELMTS); - } - } -} - - - -int main(int argc, char* argv[]) -{ - testBoolean(); - - testInt(); - - - testDouble(); - - - testString(); - - - testDateTime(); - - - testArray(43.7); - - - testStruct(); - - return 0; -} +// TestValues.cpp : Test XML encoding and decoding of XmlRpcValues. + +#include + +#include "XmlRpcValue.h" + + +#include +#include + + +using namespace XmlRpc; + + +void testBoolean() +{ + XmlRpcValue booleanFalse(false); + XmlRpcValue booleanTrue(true); + int offset = 0; + XmlRpcValue booleanFalseXml("0", &offset); + offset = 0; + XmlRpcValue booleanTrueXml("1", &offset); + assert(booleanFalse != booleanTrue); + assert(booleanFalse == booleanFalseXml); + assert(booleanFalse != booleanTrueXml); + + if (bool(booleanFalse)) + assert(false); + + if ( ! bool(booleanTrue)) + assert(false); +} + +// Int +void testInt() +{ + XmlRpcValue int0(0); + XmlRpcValue int1(1); + XmlRpcValue int10(10); + XmlRpcValue int_1(-1); + int offset = 0; + XmlRpcValue int0Xml("0", &offset); + offset = 0; + XmlRpcValue int9Xml("9", &offset); + assert(int0 == int0Xml); + assert(int(int10) - int(int1) == int(int9Xml)); + assert(9 == int(int9Xml)); + assert(int(int10) + int(int_1) == int(int9Xml)); +} + +void testDouble() +{ + // Double + XmlRpcValue d(43.7); + int offset = 0; + XmlRpcValue dXml("56.3", &offset); + assert(double(d) + double(dXml) == 100.0); // questionable practice... +} + +void testString() +{ + // String + XmlRpcValue s("Now is the time <&"); + char csxml[] = "Now is the time <&"; + std::string ssxml = csxml; + int offset = 0; + XmlRpcValue vscXml(csxml, &offset); + offset = 0; + XmlRpcValue vssXml(ssxml, &offset); + assert(s == vscXml); + assert(s == vssXml); + offset = 0; + XmlRpcValue fromXml(vssXml.toXml(), &offset); + assert(s == fromXml); + + // Empty or blank strings with no tags + std::string emptyStringXml(""); + offset = 0; + XmlRpcValue emptyStringVal1(emptyStringXml, &offset); + XmlRpcValue emptyStringVal2(""); + assert(emptyStringVal1 == emptyStringVal2); + + emptyStringXml = " "; + offset = 0; + XmlRpcValue blankStringVal(emptyStringXml, &offset); + assert(std::string(blankStringVal) == " "); +} + + +void testDateTime() +{ + // DateTime + int offset = 0; + XmlRpcValue dateTime("19040101T03:12:35", &offset); + struct tm &t = dateTime; + assert(t.tm_year == 1904 && t.tm_min == 12); +} + + +void testArray(XmlRpcValue const& d) +{ + // Array + XmlRpcValue a; + a.setSize(4); + a[0] = 1; + a[1] = std::string("two"); + a[2] = 43.7; + a[3] = "four"; + assert(int(a[0]) == 1); + assert(a[2] == d); + + char csaXml[] = + "\n" + " \n" + " 1 \n" + " two\n" + " 43.7\n" + " four\n" + " \n" + ""; + + int offset = 0; + XmlRpcValue aXml(csaXml, &offset); + assert(a == aXml); +} + +void testStruct() +{ + // Struct + XmlRpcValue struct1; + struct1["i4"] = 1; + struct1["str"] = "two"; + struct1["d"] = 43.7; + + XmlRpcValue a; + a.setSize(4); + a[0] = 1; + a[1] = std::string("two"); + a[2] = 43.7; + a[3] = "four"; + + assert(struct1["d"] == a[2]); + + char csStructXml[] = + "\n" + " \n" + " i4 \n" + " 1 \n" + " \n" + " \n" + " d \n" + " 43.7\n" + " \n" + " \n" + " str \n" + " two\n" + " \n" + ""; + + int offset = 0; + XmlRpcValue structXml(csStructXml, &offset); + assert(struct1 == structXml); + + XmlRpcValue astruct; + astruct["array"] = a; + assert(astruct["array"][2] == struct1["d"]); + + for (int i=0; i<10; i++) { + XmlRpcValue Event; + Event["Name"] = "string"; + + Event.clear(); + + const int NELMTS = 100; + int ii; + + for (ii=0; ii< NELMTS; ++ii) { + char buf[40]; + sprintf(buf,"%d", ii); + Event[std::string(buf)] = buf; + } + + Event.clear(); + + for (ii=0; ii< NELMTS; ++ii) { + char buf[40]; + sprintf(buf,"%d", ii); + if (ii != NELMTS/2) + Event[std::string(buf)] = ii; + else + for (int jj=0; jj< NELMTS; ++jj) { + char bufj[40]; + sprintf(bufj,"%d", jj); + Event[std::string(buf)][std::string(bufj)] = bufj; + } + } + + for (ii=0; ii< NELMTS; ++ii) { + char buf[40]; + sprintf(buf,"%d", ii); + if (ii != NELMTS/2) + assert(Event[std::string(buf)] == XmlRpcValue(ii)); + else + assert(Event[std::string(buf)].size() == NELMTS); + } + } +} + + + +int main(int argc, char* argv[]) +{ + testBoolean(); + + testInt(); + + + testDouble(); + + + testString(); + + + testDateTime(); + + + testArray(43.7); + + + testStruct(); + + return 0; +} diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestValues.dsp b/extern/xmlrpcpp/xmlrpcpp/test/TestValues.dsp index f62da8cb1d5..f902a700e09 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestValues.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestValues.dsp @@ -1,95 +1,95 @@ -# Microsoft Developer Studio Project File - Name="TestValues" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=TestValues - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TestValues.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TestValues.mak" CFG="TestValues - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TestValues - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "TestValues - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TestValues - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" - -!ELSEIF "$(CFG)" == "TestValues - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /MDd /W3 /GX /Zi /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FR /FD /c -# SUBTRACT CPP /nologo -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "TestValues - Win32 Release" -# Name "TestValues - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\TestValuesWin32.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="TestValues" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=TestValues - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "TestValues.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "TestValues.mak" CFG="TestValues - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "TestValues - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "TestValues - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "TestValues - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" + +!ELSEIF "$(CFG)" == "TestValues - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /MDd /W3 /GX /Zi /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FR /FD /c +# SUBTRACT CPP /nologo +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "TestValues - Win32 Release" +# Name "TestValues - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\TestValuesWin32.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestValuesWin32.cpp b/extern/xmlrpcpp/xmlrpcpp/test/TestValuesWin32.cpp index f4cdafdeab4..29658cdccd5 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestValuesWin32.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestValuesWin32.cpp @@ -1,253 +1,253 @@ -// TestValues.cpp : Test XML encoding and decoding of XmlRpcValues. - -#define _CRTDBG_MAP_ALLOC -#include -#include - -#include "XmlRpcValue.h" - - -#include -#include - - -using namespace XmlRpc; - - -void testBoolean() -{ - XmlRpcValue booleanFalse(false); - XmlRpcValue booleanTrue(true); - int offset = 0; - XmlRpcValue booleanFalseXml("0", &offset); - offset = 0; - XmlRpcValue booleanTrueXml("1", &offset); - assert(booleanFalse != booleanTrue); - assert(booleanFalse == booleanFalseXml); - assert(booleanFalse == booleanFalseXml); - if (booleanFalse) - assert(false); - - if (booleanTrue) - assert( ! false); - else - assert(false); -} - -// Int -void testInt() -{ - XmlRpcValue int0(0); - XmlRpcValue int1(1); - XmlRpcValue int10(10); - XmlRpcValue int_1(-1); - int offset = 0; - XmlRpcValue int0Xml("0", &offset); - offset = 0; - XmlRpcValue int9Xml("9", &offset); - assert(int0 == int0Xml); - assert(int(int10) - int(int1) == int(int9Xml)); - assert(9 == int(int9Xml)); - assert(int(int10) + int(int_1) == int(int9Xml)); -} - -void testDouble() -{ - // Double - XmlRpcValue d(43.7); - int offset = 0; - XmlRpcValue dXml("56.3", &offset); - assert(double(d) + double(dXml) == 100.0); // questionable practice... -} - -void testString() -{ - // String - XmlRpcValue s("Now is the time <&"); - char csxml[] = "Now is the time <&"; - std::string ssxml = csxml; - int offset = 0; - XmlRpcValue vscXml(csxml, &offset); - offset = 0; - XmlRpcValue vssXml(ssxml, &offset); - assert(s == vscXml); - assert(s == vssXml); - offset = 0; - XmlRpcValue fromXml(vssXml.toXml(), &offset); - assert(s == fromXml); - - // Empty or blank strings with no tags - std::string emptyStringXml(""); - offset = 0; - XmlRpcValue emptyStringVal1(emptyStringXml, &offset); - XmlRpcValue emptyStringVal2(""); - assert(emptyStringVal1 == emptyStringVal2); - - emptyStringXml = " "; - offset = 0; - XmlRpcValue blankStringVal(emptyStringXml, &offset); - assert(std::string(blankStringVal) == " "); -} - - -void testDateTime() -{ - // DateTime - int offset = 0; - XmlRpcValue dateTime("19040101T03:12:35", &offset); - struct tm &t = dateTime; - assert(t.tm_year == 1904 && t.tm_min == 12); -} - - -void testArray(XmlRpcValue const& d) -{ - // Array - XmlRpcValue a; - a.setSize(4); - a[0] = 1; - a[1] = std::string("two"); - a[2] = 43.7; - a[3] = "four"; - assert(int(a[0]) == 1); - assert(a[2] == d); - - char csaXml[] = - "\n" - " \n" - " 1 \n" - " two\n" - " 43.7\n" - " four\n" - " \n" - ""; - - int offset = 0; - XmlRpcValue aXml(csaXml, &offset); - assert(a == aXml); -} - -void testStruct() -{ - // Struct - XmlRpcValue struct1; - struct1["i4"] = 1; - struct1["str"] = "two"; - struct1["d"] = 43.7; - - XmlRpcValue a; - a.setSize(4); - a[0] = 1; - a[1] = std::string("two"); - a[2] = 43.7; - a[3] = "four"; - - assert(struct1["d"] == a[2]); - - char csStructXml[] = - "\n" - " \n" - " i4 \n" - " 1 \n" - " \n" - " \n" - " d \n" - " 43.7\n" - " \n" - " \n" - " str \n" - " two\n" - " \n" - ""; - - int offset = 0; - XmlRpcValue structXml(csStructXml, &offset); - assert(struct1 == structXml); - - XmlRpcValue astruct; - astruct["array"] = a; - assert(astruct["array"][2] == struct1["d"]); - - for (int i=0; i<10; i++) { - XmlRpcValue Event; - Event["Name"] = "string"; - - Event.clear(); - - const int NELMTS = 100; - int ii; - - for (ii=0; ii< NELMTS; ++ii) { - char buf[40]; - sprintf(buf,"%d", ii); - Event[buf] = buf; - } - - Event.clear(); - - for (ii=0; ii< NELMTS; ++ii) { - char buf[40]; - sprintf(buf,"%d", ii); - if (ii != NELMTS/2) - Event[buf] = ii; - else - for (int jj=0; jj< NELMTS; ++jj) { - char bufj[40]; - sprintf(bufj,"%d", jj); - Event[buf][bufj] = bufj; - } - } - - for (ii=0; ii< NELMTS; ++ii) { - char buf[40]; - sprintf(buf,"%d", ii); - if (ii != NELMTS/2) - assert(Event[buf] == XmlRpcValue(ii)); - else - assert(Event[buf].size() == NELMTS); - } - } -} - - - -int main(int argc, char* argv[]) -{ - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - testBoolean(); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - testInt(); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - - testDouble(); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - - testString(); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - - testDateTime(); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - - testArray(43.7); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - - testStruct(); - _CrtDumpMemoryLeaks(); - _CrtCheckMemory( ); - - return 0; -} +// TestValues.cpp : Test XML encoding and decoding of XmlRpcValues. + +#define _CRTDBG_MAP_ALLOC +#include +#include + +#include "XmlRpcValue.h" + + +#include +#include + + +using namespace XmlRpc; + + +void testBoolean() +{ + XmlRpcValue booleanFalse(false); + XmlRpcValue booleanTrue(true); + int offset = 0; + XmlRpcValue booleanFalseXml("0", &offset); + offset = 0; + XmlRpcValue booleanTrueXml("1", &offset); + assert(booleanFalse != booleanTrue); + assert(booleanFalse == booleanFalseXml); + assert(booleanFalse == booleanFalseXml); + if (booleanFalse) + assert(false); + + if (booleanTrue) + assert( ! false); + else + assert(false); +} + +// Int +void testInt() +{ + XmlRpcValue int0(0); + XmlRpcValue int1(1); + XmlRpcValue int10(10); + XmlRpcValue int_1(-1); + int offset = 0; + XmlRpcValue int0Xml("0", &offset); + offset = 0; + XmlRpcValue int9Xml("9", &offset); + assert(int0 == int0Xml); + assert(int(int10) - int(int1) == int(int9Xml)); + assert(9 == int(int9Xml)); + assert(int(int10) + int(int_1) == int(int9Xml)); +} + +void testDouble() +{ + // Double + XmlRpcValue d(43.7); + int offset = 0; + XmlRpcValue dXml("56.3", &offset); + assert(double(d) + double(dXml) == 100.0); // questionable practice... +} + +void testString() +{ + // String + XmlRpcValue s("Now is the time <&"); + char csxml[] = "Now is the time <&"; + std::string ssxml = csxml; + int offset = 0; + XmlRpcValue vscXml(csxml, &offset); + offset = 0; + XmlRpcValue vssXml(ssxml, &offset); + assert(s == vscXml); + assert(s == vssXml); + offset = 0; + XmlRpcValue fromXml(vssXml.toXml(), &offset); + assert(s == fromXml); + + // Empty or blank strings with no tags + std::string emptyStringXml(""); + offset = 0; + XmlRpcValue emptyStringVal1(emptyStringXml, &offset); + XmlRpcValue emptyStringVal2(""); + assert(emptyStringVal1 == emptyStringVal2); + + emptyStringXml = " "; + offset = 0; + XmlRpcValue blankStringVal(emptyStringXml, &offset); + assert(std::string(blankStringVal) == " "); +} + + +void testDateTime() +{ + // DateTime + int offset = 0; + XmlRpcValue dateTime("19040101T03:12:35", &offset); + struct tm &t = dateTime; + assert(t.tm_year == 1904 && t.tm_min == 12); +} + + +void testArray(XmlRpcValue const& d) +{ + // Array + XmlRpcValue a; + a.setSize(4); + a[0] = 1; + a[1] = std::string("two"); + a[2] = 43.7; + a[3] = "four"; + assert(int(a[0]) == 1); + assert(a[2] == d); + + char csaXml[] = + "\n" + " \n" + " 1 \n" + " two\n" + " 43.7\n" + " four\n" + " \n" + ""; + + int offset = 0; + XmlRpcValue aXml(csaXml, &offset); + assert(a == aXml); +} + +void testStruct() +{ + // Struct + XmlRpcValue struct1; + struct1["i4"] = 1; + struct1["str"] = "two"; + struct1["d"] = 43.7; + + XmlRpcValue a; + a.setSize(4); + a[0] = 1; + a[1] = std::string("two"); + a[2] = 43.7; + a[3] = "four"; + + assert(struct1["d"] == a[2]); + + char csStructXml[] = + "\n" + " \n" + " i4 \n" + " 1 \n" + " \n" + " \n" + " d \n" + " 43.7\n" + " \n" + " \n" + " str \n" + " two\n" + " \n" + ""; + + int offset = 0; + XmlRpcValue structXml(csStructXml, &offset); + assert(struct1 == structXml); + + XmlRpcValue astruct; + astruct["array"] = a; + assert(astruct["array"][2] == struct1["d"]); + + for (int i=0; i<10; i++) { + XmlRpcValue Event; + Event["Name"] = "string"; + + Event.clear(); + + const int NELMTS = 100; + int ii; + + for (ii=0; ii< NELMTS; ++ii) { + char buf[40]; + sprintf(buf,"%d", ii); + Event[buf] = buf; + } + + Event.clear(); + + for (ii=0; ii< NELMTS; ++ii) { + char buf[40]; + sprintf(buf,"%d", ii); + if (ii != NELMTS/2) + Event[buf] = ii; + else + for (int jj=0; jj< NELMTS; ++jj) { + char bufj[40]; + sprintf(bufj,"%d", jj); + Event[buf][bufj] = bufj; + } + } + + for (ii=0; ii< NELMTS; ++ii) { + char buf[40]; + sprintf(buf,"%d", ii); + if (ii != NELMTS/2) + assert(Event[buf] == XmlRpcValue(ii)); + else + assert(Event[buf].size() == NELMTS); + } + } +} + + + +int main(int argc, char* argv[]) +{ + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + testBoolean(); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + testInt(); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + + testDouble(); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + + testString(); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + + testDateTime(); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + + testArray(43.7); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + + testStruct(); + _CrtDumpMemoryLeaks(); + _CrtCheckMemory( ); + + return 0; +} diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestXml.cpp b/extern/xmlrpcpp/xmlrpcpp/test/TestXml.cpp index 4fa707d6b3d..2107df11d25 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestXml.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestXml.cpp @@ -1,53 +1,53 @@ -// TestXml.cpp : Test XML encoding and decoding. -// The characters <>&'" are illegal in xml and must be encoded. - - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -#include -// If you are using MSVC++6, you should update to fix -// BUG: getline Template Function Reads Extra Character -#include -#include -#include - -#include "XmlRpcUtil.h" - -using namespace XmlRpc; - - -int main(int argc, char* argv[]) -{ - // Basic tests - std::string empty; - assert(empty == XmlRpcUtil::xmlEncode(empty)); - assert(empty == XmlRpcUtil::xmlDecode(empty)); - assert(empty == XmlRpcUtil::xmlEncode("")); - assert(empty == XmlRpcUtil::xmlDecode("")); - - std::string raw("<>&'\""); - assert(XmlRpcUtil::xmlDecode(XmlRpcUtil::xmlEncode(raw)) == raw); - - std::cout << "Basic tests passed.\n"; - - // Interactive tests - std::string s; - for (;;) { - std::cout << "\nEnter line of raw text to encode:\n"; - std::getline(std::cin, s); - if (s.empty()) break; - - std::cout << XmlRpcUtil::xmlEncode(s) << std::endl; - } - - for (;;) { - std::cout << "\nEnter line of xml-encoded text to decode:\n"; - std::getline(std::cin, s); - if (s.empty()) break; - - std::cout << XmlRpcUtil::xmlDecode(s) << std::endl; - } - - return 0; -} - +// TestXml.cpp : Test XML encoding and decoding. +// The characters <>&'" are illegal in xml and must be encoded. + + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + +#include +// If you are using MSVC++6, you should update to fix +// BUG: getline Template Function Reads Extra Character +#include +#include +#include + +#include "XmlRpcUtil.h" + +using namespace XmlRpc; + + +int main(int argc, char* argv[]) +{ + // Basic tests + std::string empty; + assert(empty == XmlRpcUtil::xmlEncode(empty)); + assert(empty == XmlRpcUtil::xmlDecode(empty)); + assert(empty == XmlRpcUtil::xmlEncode("")); + assert(empty == XmlRpcUtil::xmlDecode("")); + + std::string raw("<>&'\""); + assert(XmlRpcUtil::xmlDecode(XmlRpcUtil::xmlEncode(raw)) == raw); + + std::cout << "Basic tests passed.\n"; + + // Interactive tests + std::string s; + for (;;) { + std::cout << "\nEnter line of raw text to encode:\n"; + std::getline(std::cin, s); + if (s.empty()) break; + + std::cout << XmlRpcUtil::xmlEncode(s) << std::endl; + } + + for (;;) { + std::cout << "\nEnter line of xml-encoded text to decode:\n"; + std::getline(std::cin, s); + if (s.empty()) break; + + std::cout << XmlRpcUtil::xmlDecode(s) << std::endl; + } + + return 0; +} + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/TestXml.dsp b/extern/xmlrpcpp/xmlrpcpp/test/TestXml.dsp index 7fba0e45af0..791976dfe14 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/TestXml.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/TestXml.dsp @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="TestXml" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=TestXml - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TestXml.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TestXml.mak" CFG="TestXml - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TestXml - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "TestXml - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TestXml - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "TestXml - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" - -!ENDIF - -# Begin Target - -# Name "TestXml - Win32 Release" -# Name "TestXml - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\TestXml.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="TestXml" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=TestXml - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "TestXml.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "TestXml.mak" CFG="TestXml - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "TestXml - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "TestXml - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "TestXml - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "TestXml - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "TestXml - Win32 Release" +# Name "TestXml - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\TestXml.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/Validator.cpp b/extern/xmlrpcpp/xmlrpcpp/test/Validator.cpp index 16d2e791895..95ce1cc9fc2 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/Validator.cpp +++ b/extern/xmlrpcpp/xmlrpcpp/test/Validator.cpp @@ -1,207 +1,207 @@ -// Validator.cpp : XMLRPC server based on the compliancy test at validator.xmlrpc.com. -// -#include "XmlRpc.h" -using namespace XmlRpc; - -#include - - -XmlRpcServer s; - - -// One argument is passed, an array of structs, each with a member named curly with -// an integer value. Return the sum of those values. - -class ArrayOfStructsTest : public XmlRpcServerMethod -{ -public: - ArrayOfStructsTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.arrayOfStructsTest", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "ArrayOfStructsTest\n"; - XmlRpcValue& arg1 = params[0]; - int n = arg1.size(), sum = 0; - for (int i=0; i, &, ' and ". -// The handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, -// ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes. -// To validate, the numbers must be correct. - -class CountTheEntities : public XmlRpcServerMethod -{ -public: - CountTheEntities(XmlRpcServer* s) : XmlRpcServerMethod("validator1.countTheEntities", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "CountTheEntities\n"; - std::string& arg = params[0]; - int ctLeftAngleBrackets = 0; - int ctRightAngleBrackets = 0; - int ctAmpersands = 0; - int ctApostrophes = 0; - int ctQuotes = 0; - - int n = int(arg.length()); - for (int i=0; i': ++ctRightAngleBrackets; break; - case '&': ++ctAmpersands; break; - case '\'': ++ctApostrophes; break; - case '\"': ++ctQuotes; break; - } - - result["ctLeftAngleBrackets"] = ctLeftAngleBrackets; - result["ctRightAngleBrackets"] = ctRightAngleBrackets; - result["ctAmpersands"] = ctAmpersands; - result["ctApostrophes"] = ctApostrophes; - result["ctQuotes"] = ctQuotes; - } -} countTheEntities(&s); - - - -// This handler takes a single parameter, a struct, containing at least three elements -// named moe, larry and curly, all s. Your handler must add the three numbers and -// return the result. - -class EasyStructTest : public XmlRpcServerMethod -{ -public: - EasyStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.easyStructTest", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "EasyStructTest\n"; - XmlRpcValue& arg1 = params[0]; - int sum = int(arg1["moe"]) + int(arg1["larry"]) + int(arg1["curly"]); - result = sum; - } -} easyStructTest(&s); - - -// This handler takes a single parameter, a struct. Your handler must return the struct. - -class EchoStructTest : public XmlRpcServerMethod -{ -public: - EchoStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.echoStructTest", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "EchoStructTest\n"; - result = params[0]; - } -} echoStructTest(&s); - - - -// This handler takes six parameters, and returns an array containing all the parameters. - -class ManyTypesTest : public XmlRpcServerMethod -{ -public: - ManyTypesTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.manyTypesTest", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "ManyTypesTest\n"; - result = params; - } -} manyTypesTest(&s); - - - -// This handler takes a single parameter, which is an array containing between 100 and -// 200 elements. Each of the items is a string, your handler must return a string -// containing the concatenated text of the first and last elements. - - -class ModerateSizeArrayCheck : public XmlRpcServerMethod -{ -public: - ModerateSizeArrayCheck(XmlRpcServer* s) : XmlRpcServerMethod("validator1.moderateSizeArrayCheck", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "ModerateSizeArrayCheck\n"; - std::string s = params[0][0]; - s += params[0][params[0].size()-1]; - result = s; - } -} moderateSizeArrayCheck(&s); - - -// This handler takes a single parameter, a struct, that models a daily calendar. -// At the top level, there is one struct for each year. Each year is broken down -// into months, and months into days. Most of the days are empty in the struct -// you receive, but the entry for April 1, 2000 contains a least three elements -// named moe, larry and curly, all s. Your handler must add the three numbers -// and return the result. - -class NestedStructTest : public XmlRpcServerMethod -{ -public: - NestedStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.nestedStructTest", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "NestedStructTest\n"; - XmlRpcValue& dayStruct = params[0]["2000"]["04"]["01"]; - int sum = int(dayStruct["moe"]) + int(dayStruct["larry"]) + int(dayStruct["curly"]); - result = sum; - } -} nestedStructTest(&s); - - - -// This handler takes one parameter, and returns a struct containing three elements, -// times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000. - -class SimpleStructReturnTest : public XmlRpcServerMethod -{ -public: - SimpleStructReturnTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.simpleStructReturnTest", s) {} - - void execute(XmlRpcValue& params, XmlRpcValue& result) - { - std::cerr << "SimpleStructReturnTest\n"; - int n = params[0]; - result["times10"] = n * 10; - result["times100"] = n * 100; - result["times1000"] = n * 1000; - } -} simpleStructReturnTest(&s); - - - -int main(int argc, char* argv[]) -{ - if (argc != 2) { - std::cerr << "Usage: Validator port\n"; - return -1; - } - int port = atoi(argv[1]); - - XmlRpc::setVerbosity(5); - - // Create the server socket on the specified port - s.bindAndListen(port); - - // Wait for requests indefinitely - s.work(-1.0); - - return 0; -} - +// Validator.cpp : XMLRPC server based on the compliancy test at validator.xmlrpc.com. +// +#include "XmlRpc.h" +using namespace XmlRpc; + +#include + + +XmlRpcServer s; + + +// One argument is passed, an array of structs, each with a member named curly with +// an integer value. Return the sum of those values. + +class ArrayOfStructsTest : public XmlRpcServerMethod +{ +public: + ArrayOfStructsTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.arrayOfStructsTest", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "ArrayOfStructsTest\n"; + XmlRpcValue& arg1 = params[0]; + int n = arg1.size(), sum = 0; + for (int i=0; i, &, ' and ". +// The handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, +// ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes. +// To validate, the numbers must be correct. + +class CountTheEntities : public XmlRpcServerMethod +{ +public: + CountTheEntities(XmlRpcServer* s) : XmlRpcServerMethod("validator1.countTheEntities", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "CountTheEntities\n"; + std::string& arg = params[0]; + int ctLeftAngleBrackets = 0; + int ctRightAngleBrackets = 0; + int ctAmpersands = 0; + int ctApostrophes = 0; + int ctQuotes = 0; + + int n = int(arg.length()); + for (int i=0; i': ++ctRightAngleBrackets; break; + case '&': ++ctAmpersands; break; + case '\'': ++ctApostrophes; break; + case '\"': ++ctQuotes; break; + } + + result["ctLeftAngleBrackets"] = ctLeftAngleBrackets; + result["ctRightAngleBrackets"] = ctRightAngleBrackets; + result["ctAmpersands"] = ctAmpersands; + result["ctApostrophes"] = ctApostrophes; + result["ctQuotes"] = ctQuotes; + } +} countTheEntities(&s); + + + +// This handler takes a single parameter, a struct, containing at least three elements +// named moe, larry and curly, all s. Your handler must add the three numbers and +// return the result. + +class EasyStructTest : public XmlRpcServerMethod +{ +public: + EasyStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.easyStructTest", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "EasyStructTest\n"; + XmlRpcValue& arg1 = params[0]; + int sum = int(arg1["moe"]) + int(arg1["larry"]) + int(arg1["curly"]); + result = sum; + } +} easyStructTest(&s); + + +// This handler takes a single parameter, a struct. Your handler must return the struct. + +class EchoStructTest : public XmlRpcServerMethod +{ +public: + EchoStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.echoStructTest", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "EchoStructTest\n"; + result = params[0]; + } +} echoStructTest(&s); + + + +// This handler takes six parameters, and returns an array containing all the parameters. + +class ManyTypesTest : public XmlRpcServerMethod +{ +public: + ManyTypesTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.manyTypesTest", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "ManyTypesTest\n"; + result = params; + } +} manyTypesTest(&s); + + + +// This handler takes a single parameter, which is an array containing between 100 and +// 200 elements. Each of the items is a string, your handler must return a string +// containing the concatenated text of the first and last elements. + + +class ModerateSizeArrayCheck : public XmlRpcServerMethod +{ +public: + ModerateSizeArrayCheck(XmlRpcServer* s) : XmlRpcServerMethod("validator1.moderateSizeArrayCheck", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "ModerateSizeArrayCheck\n"; + std::string s = params[0][0]; + s += params[0][params[0].size()-1]; + result = s; + } +} moderateSizeArrayCheck(&s); + + +// This handler takes a single parameter, a struct, that models a daily calendar. +// At the top level, there is one struct for each year. Each year is broken down +// into months, and months into days. Most of the days are empty in the struct +// you receive, but the entry for April 1, 2000 contains a least three elements +// named moe, larry and curly, all s. Your handler must add the three numbers +// and return the result. + +class NestedStructTest : public XmlRpcServerMethod +{ +public: + NestedStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.nestedStructTest", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "NestedStructTest\n"; + XmlRpcValue& dayStruct = params[0]["2000"]["04"]["01"]; + int sum = int(dayStruct["moe"]) + int(dayStruct["larry"]) + int(dayStruct["curly"]); + result = sum; + } +} nestedStructTest(&s); + + + +// This handler takes one parameter, and returns a struct containing three elements, +// times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000. + +class SimpleStructReturnTest : public XmlRpcServerMethod +{ +public: + SimpleStructReturnTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.simpleStructReturnTest", s) {} + + void execute(XmlRpcValue& params, XmlRpcValue& result) + { + std::cerr << "SimpleStructReturnTest\n"; + int n = params[0]; + result["times10"] = n * 10; + result["times100"] = n * 100; + result["times1000"] = n * 1000; + } +} simpleStructReturnTest(&s); + + + +int main(int argc, char* argv[]) +{ + if (argc != 2) { + std::cerr << "Usage: Validator port\n"; + return -1; + } + int port = atoi(argv[1]); + + XmlRpc::setVerbosity(5); + + // Create the server socket on the specified port + s.bindAndListen(port); + + // Wait for requests indefinitely + s.work(-1.0); + + return 0; +} + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/Validator.dsp b/extern/xmlrpcpp/xmlrpcpp/test/Validator.dsp index 12058c15edc..c87f32d2bf3 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/Validator.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/test/Validator.dsp @@ -1,95 +1,95 @@ -# Microsoft Developer Studio Project File - Name="Validator" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Validator - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Validator.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Validator.mak" CFG="Validator - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Validator - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Validator - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Validator - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zd /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" - -!ELSEIF "$(CFG)" == "Validator - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\debug" - -!ENDIF - -# Begin Target - -# Name "Validator - Win32 Release" -# Name "Validator - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Validator.cpp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="Validator" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=Validator - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Validator.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Validator.mak" CFG="Validator - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Validator - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Validator - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Validator - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zd /O2 /I "..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" + +!ELSEIF "$(CFG)" == "Validator - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 xmlrpc.lib 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\debug" + +!ENDIF + +# Begin Target + +# Name "Validator - Win32 Release" +# Name "Validator - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\Validator.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/test/arrayOfStructsTest.xml b/extern/xmlrpcpp/xmlrpcpp/test/arrayOfStructsTest.xml index 5690a184d6b..ec033782b97 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/arrayOfStructsTest.xml +++ b/extern/xmlrpcpp/xmlrpcpp/test/arrayOfStructsTest.xml @@ -1,255 +1,255 @@ - - - validator1.arrayOfStructsTest - - - - - - - - curly - - -84 - - - - larry - - 87 - - - - moe - - 77 - - - - - - - - curly - - -46 - - - - larry - - 27 - - - - moe - - 33 - - - - - - - - curly - - -70 - - - - larry - - 89 - - - - moe - - 30 - - - - - - - - curly - - -90 - - - - larry - - 42 - - - - moe - - 6 - - - - - - - - curly - - -28 - - - - larry - - 96 - - - - moe - - 92 - - - - - - - - curly - - -31 - - - - larry - - 81 - - - - moe - - 85 - - - - - - - - curly - - -18 - - - - larry - - 62 - - - - moe - - 9 - - - - - - - - curly - - -98 - - - - larry - - 79 - - - - moe - - 66 - - - - - - - - curly - - -3 - - - - larry - - 59 - - - - moe - - 80 - - - - - - - - curly - - -83 - - - - larry - - 27 - - - - moe - - 19 - - - - - - - - curly - - -85 - - - - larry - - 4 - - - - moe - - 16 - - - - - - - - - - + + + validator1.arrayOfStructsTest + + + + + + + + curly + + -84 + + + + larry + + 87 + + + + moe + + 77 + + + + + + + + curly + + -46 + + + + larry + + 27 + + + + moe + + 33 + + + + + + + + curly + + -70 + + + + larry + + 89 + + + + moe + + 30 + + + + + + + + curly + + -90 + + + + larry + + 42 + + + + moe + + 6 + + + + + + + + curly + + -28 + + + + larry + + 96 + + + + moe + + 92 + + + + + + + + curly + + -31 + + + + larry + + 81 + + + + moe + + 85 + + + + + + + + curly + + -18 + + + + larry + + 62 + + + + moe + + 9 + + + + + + + + curly + + -98 + + + + larry + + 79 + + + + moe + + 66 + + + + + + + + curly + + -3 + + + + larry + + 59 + + + + moe + + 80 + + + + + + + + curly + + -83 + + + + larry + + 27 + + + + moe + + 19 + + + + + + + + curly + + -85 + + + + larry + + 4 + + + + moe + + 16 + + + + + + + + + + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/countTheEntities.xml b/extern/xmlrpcpp/xmlrpcpp/test/countTheEntities.xml index b37495ada5f..33e478ffb45 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/countTheEntities.xml +++ b/extern/xmlrpcpp/xmlrpcpp/test/countTheEntities.xml @@ -1,10 +1,10 @@ - - - validator1.countTheEntities - - - &''<&"'>ehv<>iu'<<qo>"z"f - - - - + + + validator1.countTheEntities + + + &''<&"'>ehv<>iu'<<qo>"z"f + + + + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/easyStructTest.xml b/extern/xmlrpcpp/xmlrpcpp/test/easyStructTest.xml index a0a8634fd8e..34d77a4b8c8 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/easyStructTest.xml +++ b/extern/xmlrpcpp/xmlrpcpp/test/easyStructTest.xml @@ -1,29 +1,29 @@ - - - validator1.easyStructTest - - - - - curly - - -78 - - - - larry - - 23 - - - - moe - - 38 - - - - - - - + + + validator1.easyStructTest + + + + + curly + + -78 + + + + larry + + 23 + + + + moe + + 38 + + + + + + + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/echo.xml b/extern/xmlrpcpp/xmlrpcpp/test/echo.xml index 6aeff92a7a1..4940a6bc52a 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/echo.xml +++ b/extern/xmlrpcpp/xmlrpcpp/test/echo.xml @@ -1,9 +1,9 @@ - - - echo - - Hello Chris - 123 - - - + + + echo + + Hello Chris + 123 + + + diff --git a/extern/xmlrpcpp/xmlrpcpp/test/echoStructTest.xml b/extern/xmlrpcpp/xmlrpcpp/test/echoStructTest.xml index 6cbb472f6e3..8ce3f8317fd 100644 --- a/extern/xmlrpcpp/xmlrpcpp/test/echoStructTest.xml +++ b/extern/xmlrpcpp/xmlrpcpp/test/echoStructTest.xml @@ -1,261 +1,261 @@ - - - validator1.echoStructTest - - - - - substruct0 - - - - curly - - -76 - - - - larry - - 31 - - - - moe - - 44 - - - - - - - substruct1 - - - - curly - - -9 - - - - larry - - 42 - - - - moe - - 57 - - - - - - - substruct2 - - - - curly - - -15 - - - - larry - - 69 - - - - moe - - 78 - - - - - - - substruct3 - - - - curly - - -91 - - - - larry - - 66 - - - - moe - - 4 - - - - - - - substruct4 - - - - curly - - -47 - - - - larry - - 66 - - - - moe - - 8 - - - - - - - substruct5 - - - - curly - - -68 - - - - larry - - 26 - - - - moe - - 87 - - - - - - - substruct6 - - - - curly - - -59 - - - - larry - - 20 - - - - moe - - 74 - - - - - - - substruct7 - - - - curly - - -57 - - - - larry - - 30 - - - - moe - - 75 - - - - - - - substruct8 - - - - curly - - -34 - - - - larry - - 33 - - - - moe - - 30 - - - - - - - substruct9 - - - - curly - - -64 - - - - larry - - 98 - - - - moe - - 17 - - - - - - - - - - + + + validator1.echoStructTest + + + + + substruct0 + + + + curly + + -76 + + + + larry + + 31 + + + + moe + + 44 + + + + + + + substruct1 + + + + curly + + -9 + + + + larry + + 42 + + + + moe + + 57 + + + + + + + substruct2 + + + + curly + + -15 + + + + larry + + 69 + + + + moe + + 78 + + + + + + + substruct3 + + + + curly + + -91 + + + + larry + + 66 + + + + moe + + 4 + + + + + + + substruct4 + + + + curly + + -47 + + + + larry + + 66 + + + + moe + + 8 + + + + + + + substruct5 + + + + curly + + -68 + + + + larry + + 26 + + + + moe + + 87 + + + + + + + substruct6 + + + + curly + + -59 + + + + larry + + 20 + + + + moe + + 74 + + + + + + + substruct7 + + + + curly + + -57 + + + + larry + + 30 + + + + moe + + 75 + + + + + + + substruct8 + + + + curly + + -34 + + + + larry + + 33 + + + + moe + + 30 + + + + + + + substruct9 + + + + curly + + -64 + + + + larry + + 98 + + + + moe + + 17 + + + + + + + + + + diff --git a/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsp b/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsp index 7f5212b68bf..d5bfbffdb33 100644 --- a/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsp +++ b/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsp @@ -1,183 +1,183 @@ -# Microsoft Developer Studio Project File - Name="xmlrpc" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=xmlrpc - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "xmlrpc.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "xmlrpc.mak" CFG="xmlrpc - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "xmlrpc - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "xmlrpc - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "xmlrpc - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zd /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "xmlrpc - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /FR /FD /c -# SUBTRACT CPP /nologo /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "xmlrpc - Win32 Release" -# Name "xmlrpc - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\src\XmlRpcClient.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcDispatch.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcServer.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcServerConnection.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcServerMethod.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcSocket.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcSource.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcUtil.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcValue.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\src\base64.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpc.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcClient.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcDispatch.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcServer.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcServerConnection.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcServerMethod.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcSocket.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcSource.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcUtil.h -# End Source File -# Begin Source File - -SOURCE=.\src\XmlRpcValue.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\README.html -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="xmlrpc" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=xmlrpc - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "xmlrpc.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "xmlrpc.mak" CFG="xmlrpc - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xmlrpc - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "xmlrpc - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xmlrpc - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zd /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /FR /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "xmlrpc - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /FR /FD /c +# SUBTRACT CPP /nologo /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "xmlrpc - Win32 Release" +# Name "xmlrpc - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\XmlRpcClient.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcDispatch.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcServer.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcServerConnection.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcServerMethod.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcSocket.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcSource.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcUtil.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcValue.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\src\base64.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpc.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcClient.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcDispatch.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcServer.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcServerConnection.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcServerMethod.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcSocket.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcSource.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcUtil.h +# End Source File +# Begin Source File + +SOURCE=.\src\XmlRpcValue.h +# End Source File +# End Group +# Begin Source File + +SOURCE=.\README.html +# End Source File +# End Target +# End Project diff --git a/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsw b/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsw index 6c199897721..c24adb31dda 100644 --- a/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsw +++ b/extern/xmlrpcpp/xmlrpcpp/xmlrpc.dsw @@ -1,149 +1,149 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "FileClient"=".\Test\FileClient.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "HelloClient"=".\Test\HelloClient.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "HelloServer"=".\Test\HelloServer.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "TestBase64Client"=".\Test\TestBase64Client.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "TestBase64Server"=".\Test\TestBase64Server.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "TestValues"=".\Test\TestValues.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "TestXml"=".\Test\TestXml.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "Validator"=".\Test\Validator.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlrpc - End Project Dependency -}}} - -############################################################################### - -Project: "xmlrpc"=".\xmlrpc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "FileClient"=".\Test\FileClient.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "HelloClient"=".\Test\HelloClient.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "HelloServer"=".\Test\HelloServer.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "TestBase64Client"=".\Test\TestBase64Client.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "TestBase64Server"=".\Test\TestBase64Server.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "TestValues"=".\Test\TestValues.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "TestXml"=".\Test\TestXml.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "Validator"=".\Test\Validator.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name xmlrpc + End Project Dependency +}}} + +############################################################################### + +Project: "xmlrpc"=".\xmlrpc.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### +