[Cmake-commits] [cmake-commits] king committed cmCTestSubmitHandler.cxx 1.44 1.45

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv18004/Source/CTest

Modified Files:
	cmCTestSubmitHandler.cxx 
Log Message:
ENH: Disable the xmlrpc drop method by default

We've chosen to drop our default dependence on xmlrpc.  Thus we disable
the corresponding CTest submission method and remove the sources for
building xmlrpc locally.  Users can re-enable the method by setting the
CTEST_USE_XMLRPC option to use a system-installed xmlrpc library.


Index: cmCTestSubmitHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSubmitHandler.cxx,v
retrieving revision 1.44
retrieving revision 1.45
diff -C 2 -d -r1.44 -r1.45
*** cmCTestSubmitHandler.cxx	11 Apr 2009 13:29:27 -0000	1.44
--- cmCTestSubmitHandler.cxx	11 Jun 2009 15:24:56 -0000	1.45
***************
*** 728,731 ****
--- 728,732 ----
  
  //----------------------------------------------------------------------------
+ #if defined(CTEST_USE_XMLRPC)
  bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const cmStdString& localprefix,
    const std::set<cmStdString>& files,
***************
*** 825,828 ****
--- 826,838 ----
    return true;
  }
+ #else
+ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(cmStdString const&,
+                                              std::set<cmStdString> const&,
+                                              cmStdString const&,
+                                              cmStdString const&)
+ {
+   return false;
+ }
+ #endif
  
  //----------------------------------------------------------------------------
***************
*** 1138,1141 ****
--- 1148,1152 ----
    else if ( dropMethod == "xmlrpc" )
      {
+ #if defined(CTEST_USE_XMLRPC)
      ofs << "Using drop method: XML-RPC" << std::endl;
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using XML-RPC submit method"
***************
*** 1155,1158 ****
--- 1166,1175 ----
      ofs << "   Submission successful" << std::endl;
      return 0;
+ #else
+     cmCTestLog(this->CTest, ERROR_MESSAGE,
+                "   Submission method \"xmlrpc\" not compiled into CTest!"
+                << std::endl);
+     return -1;
+ #endif
      }
    else if ( dropMethod == "scp" )