[Cmake-commits] [cmake-commits] king committed cmCTestCoverageHandler.cxx 1.67 1.68 cmCTestCoverageHandler.h 1.19 1.20

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestCoverageHandler.cxx cmCTestCoverageHandler.h 
Log Message:
ENH: Generate a central list of target directories

This generalizes the previous CMakeFiles/LabelFiles.txt created at the
top of the build tree to a CMakeFiles/TargetDirectories.txt file.  It
lists the target support directories for all targets in the project.
Labels can still be loaded by looking for Labels.txt files in each
target directory.


Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.67
retrieving revision 1.68
diff -C 2 -d -r1.67 -r1.68
*** cmCTestCoverageHandler.cxx	2 Mar 2009 20:33:18 -0000	1.67
--- cmCTestCoverageHandler.cxx	9 Mar 2009 16:19:26 -0000	1.68
***************
*** 1750,1756 ****
    std::string fileList = this->CTest->GetBinaryDir();
    fileList += cmake::GetCMakeFilesDirectory();
!   fileList += "/LabelFiles.txt";
    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
!              " label file list [" << fileList << "]\n");
    std::ifstream finList(fileList.c_str());
    std::string line;
--- 1750,1756 ----
    std::string fileList = this->CTest->GetBinaryDir();
    fileList += cmake::GetCMakeFilesDirectory();
!   fileList += "/TargetDirectories.txt";
    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
!              " target directory list [" << fileList << "]\n");
    std::ifstream finList(fileList.c_str());
    std::string line;
***************
*** 1762,1770 ****
  
  //----------------------------------------------------------------------
! void cmCTestCoverageHandler::LoadLabels(const char* fname)
  {
    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               " loading labels from [" << fname << "]\n");
-   std::ifstream fin(fname);
    bool inTarget = true;
    std::string source;
--- 1762,1777 ----
  
  //----------------------------------------------------------------------
! void cmCTestCoverageHandler::LoadLabels(const char* dir)
  {
+   std::string fname = dir;
+   fname += "/Labels.txt";
+   std::ifstream fin(fname.c_str());
+   if(!fin)
+     {
+     return;
+     }
+ 
    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               " loading labels from [" << fname << "]\n");
    bool inTarget = true;
    std::string source;

Index: cmCTestCoverageHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmCTestCoverageHandler.h	2 Mar 2009 20:33:18 -0000	1.19
--- cmCTestCoverageHandler.h	9 Mar 2009 16:19:27 -0000	1.20
***************
*** 153,159 ****
    int GetLabelId(std::string const& label);
  
!   // Load reading and writing methods.
    void LoadLabels();
!   void LoadLabels(const char* fname);
    void WriteXMLLabels(std::ofstream& os, std::string const& source);
  
--- 153,159 ----
    int GetLabelId(std::string const& label);
  
!   // Label reading and writing methods.
    void LoadLabels();
!   void LoadLabels(const char* dir);
    void WriteXMLLabels(std::ofstream& os, std::string const& source);