[Cmake-commits] [cmake-commits] king committed cmCTestBuildHandler.cxx 1.67 1.68 cmCTestBuildHandler.h 1.14 1.15
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Feb 4 14:34:14 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv14467/Source/CTest
Modified Files:
cmCTestBuildHandler.cxx cmCTestBuildHandler.h
Log Message:
ENH: Refactor Build.xml generation
This divides cmCTestBuildHandler::GenerateDartBuildOutput into three
methods to generate the header, content, and footer components of
Build.xml files. It will allow the content generation to be replaced
later.
Index: cmCTestBuildHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** cmCTestBuildHandler.h 14 Jan 2009 18:01:38 -0000 1.14
--- cmCTestBuildHandler.h 4 Feb 2009 19:34:12 -0000 1.15
***************
*** 87,94 ****
// generate the XML output
! void GenerateDartBuildOutput(std::ostream& os,
! std::vector<cmCTestBuildErrorWarning>,
! double elapsed_time);
!
std::string StartBuild;
--- 87,93 ----
// generate the XML output
! void GenerateXMLHeader(std::ostream& os);
! void GenerateXMLLogScraped(std::ostream& os);
! void GenerateXMLFooter(std::ostream& os, double elapsed_build_time);
std::string StartBuild;
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.67
retrieving revision 1.68
diff -C 2 -d -r1.67 -r1.68
*** cmCTestBuildHandler.cxx 14 Jan 2009 18:48:03 -0000 1.67
--- cmCTestBuildHandler.cxx 4 Feb 2009 19:34:12 -0000 1.68
***************
*** 474,487 ****
return -1;
}
! this->GenerateDartBuildOutput(
! xofs, this->ErrorsAndWarnings, elapsed_build_time);
return retVal;
}
! //----------------------------------------------------------------------
! void cmCTestBuildHandler::GenerateDartBuildOutput(
! std::ostream& os,
! std::vector<cmCTestBuildErrorWarning> ew,
! double elapsed_build_time)
{
this->CTest->StartXML(os, this->AppendXML);
--- 474,485 ----
return -1;
}
! this->GenerateXMLHeader(xofs);
! this->GenerateXMLLogScraped(xofs);
! this->GenerateXMLFooter(xofs, elapsed_build_time);
return retVal;
}
! //----------------------------------------------------------------------------
! void cmCTestBuildHandler::GenerateXMLHeader(std::ostream& os)
{
this->CTest->StartXML(os, this->AppendXML);
***************
*** 495,499 ****
--- 493,502 ----
this->CTest->GetCTestConfiguration("MakeCommand"))
<< "</BuildCommand>" << std::endl;
+ }
+ //----------------------------------------------------------------------------
+ void cmCTestBuildHandler::GenerateXMLLogScraped(std::ostream& os)
+ {
+ std::vector<cmCTestBuildErrorWarning>& ew = this->ErrorsAndWarnings;
std::vector<cmCTestBuildErrorWarning>::iterator it;
***************
*** 592,595 ****
--- 595,604 ----
}
}
+ }
+
+ //----------------------------------------------------------------------------
+ void cmCTestBuildHandler::GenerateXMLFooter(std::ostream& os,
+ double elapsed_build_time)
+ {
os << "\t<Log Encoding=\"base64\" Compression=\"/bin/gzip\">\n\t</Log>\n"
<< "\t<EndDateTime>" << this->EndBuild << "</EndDateTime>\n"
More information about the Cmake-commits
mailing list