[Cmake-commits] [cmake-commits] alex committed cmCTestScriptHandler.h 1.20 1.21 cmCTestScriptHandler.cxx 1.48 1.49

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestScriptHandler.h cmCTestScriptHandler.cxx 
Log Message:
STYLE: rename InitCache to InitialCache, since it contains the contents for
the initial cache and is not e.g. a flag which shows whether the cache
should be initialized

Alex


Index: cmCTestScriptHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** cmCTestScriptHandler.h	9 Jan 2009 17:05:23 -0000	1.20
--- cmCTestScriptHandler.h	11 Jul 2009 20:27:28 -0000	1.21
***************
*** 152,156 ****
    cmStdString UpdateCmd;
    cmStdString CTestEnv;
!   cmStdString InitCache;
    cmStdString CMakeCmd;
    cmStdString CMOutFile;
--- 152,156 ----
    cmStdString UpdateCmd;
    cmStdString CTestEnv;
!   cmStdString InitialCache;
    cmStdString CMakeCmd;
    cmStdString CMOutFile;

Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -C 2 -d -r1.48 -r1.49
*** cmCTestScriptHandler.cxx	25 Jun 2009 20:39:10 -0000	1.48
--- cmCTestScriptHandler.cxx	11 Jul 2009 20:27:28 -0000	1.49
***************
*** 118,122 ****
    this->UpdateCmd = "";
    this->CTestEnv = "";
!   this->InitCache = "";
    this->CMakeCmd = "";
    this->CMOutFile = "";
--- 118,122 ----
    this->UpdateCmd = "";
    this->CTestEnv = "";
!   this->InitialCache = "";
    this->CMakeCmd = "";
    this->CMOutFile = "";
***************
*** 489,493 ****
    this->CTestEnv
      = this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT");
!   this->InitCache
      = this->Makefile->GetSafeDefinition("CTEST_INITIAL_CACHE");
    this->CMakeCmd
--- 489,493 ----
    this->CTestEnv
      = this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT");
!   this->InitialCache
      = this->Makefile->GetSafeDefinition("CTEST_INITIAL_CACHE");
    this->CMakeCmd
***************
*** 880,884 ****
  
    // put the initial cache into the bin dir
!   if (!this->InitCache.empty())
      {
      std::string cacheFile = this->BinaryDir;
--- 880,884 ----
  
    // put the initial cache into the bin dir
!   if (!this->InitialCache.empty())
      {
      std::string cacheFile = this->BinaryDir;
***************
*** 891,895 ****
        }
  
!     fout.write(this->InitCache.c_str(), this->InitCache.size());
  
      // Make sure the operating system has finished writing the file
--- 891,895 ----
        }
  
!     fout.write(this->InitialCache.c_str(), this->InitialCache.size());
  
      // Make sure the operating system has finished writing the file