[Cmake-commits] [cmake-commits] hoffman committed cmCPackGenerator.cxx 1.18.2.1 1.18.2.2 cmCPackOSXX11Generator.cxx 1.6.2.1 1.6.2.2 cmCPackPackageMakerGenerator.cxx 1.29.2.1 1.29.2.2 cmCPackTGZGenerator.cxx 1.19.4.1 1.19.4.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv13963/Source/CPack

Modified Files:
      Tag: CMake-2-8
	cmCPackGenerator.cxx cmCPackOSXX11Generator.cxx 
	cmCPackPackageMakerGenerator.cxx cmCPackTGZGenerator.cxx 
Log Message:
Merge in changes for RC 3


Index: cmCPackOSXX11Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackOSXX11Generator.cxx,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** cmCPackOSXX11Generator.cxx	1 Oct 2009 21:21:11 -0000	1.6.2.1
--- cmCPackOSXX11Generator.cxx	9 Oct 2009 20:11:23 -0000	1.6.2.2
***************
*** 150,155 ****
                  "Compress disk image using command: " 
                  << dmgCmd.str().c_str() << std::endl);
!   bool res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output,
!     &retVal, 0, this->GeneratorVerbose, 0);
    if ( !res || retVal )
      {
--- 150,168 ----
                  "Compress disk image using command: " 
                  << dmgCmd.str().c_str() << std::endl);
!   // since we get random dashboard failures with this one
!   // try running it more than once
!   int numTries = 4;
!   bool res;
!   while(numTries > 0)
!     {
!     res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output,
!                                           &retVal, 0, 
!                                           this->GeneratorVerbose, 0);
!     if(res && retVal)
!       {
!       numTries = -1;
!       }
!     numTries--;
!     }
    if ( !res || retVal )
      {

Index: cmCPackPackageMakerGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.cxx,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -C 2 -d -r1.29.2.1 -r1.29.2.2
*** cmCPackPackageMakerGenerator.cxx	1 Oct 2009 21:21:11 -0000	1.29.2.1
--- cmCPackPackageMakerGenerator.cxx	9 Oct 2009 20:11:24 -0000	1.29.2.2
***************
*** 322,327 ****
    std::string output;
    int retVal = 1;
!   bool res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output,
!     &retVal, 0, this->GeneratorVerbose, 0);
    if ( !res || retVal )
      {
--- 322,338 ----
    std::string output;
    int retVal = 1;
!   int numTries = 4;
!   bool res;
!   while(numTries > 0)
!     {
!     res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output,
!                                           &retVal, 0, this->GeneratorVerbose, 
!                                           0);
!     if(res && retVal)
!       {
!       numTries = -1;
!       }
!     numTries--;
!     }
    if ( !res || retVal )
      {

Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -C 2 -d -r1.19.4.1 -r1.19.4.2
*** cmCPackTGZGenerator.cxx	1 Oct 2009 21:21:11 -0000	1.19.4.1
--- cmCPackTGZGenerator.cxx	9 Oct 2009 20:11:24 -0000	1.19.4.2
***************
*** 177,186 ****
      uLong x = mydata->CRC;
      for (n = 0; n < 4; n++) {
!       buffer[n] = (int)(x & 0xff);
        x >>= 8;
      }
      x = mydata->ZLibStream.total_in;
      for (n = 0; n < 4; n++) {
!       buffer[n+4] = (int)(x & 0xff);
        x >>= 8;
      }
--- 177,186 ----
      uLong x = mydata->CRC;
      for (n = 0; n < 4; n++) {
!       buffer[n] = static_cast<char>(x & 0xff);
        x >>= 8;
      }
      x = mydata->ZLibStream.total_in;
      for (n = 0; n < 4; n++) {
!       buffer[n+4] = static_cast<char>(x & 0xff);
        x >>= 8;
      }

Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C 2 -d -r1.18.2.1 -r1.18.2.2
*** cmCPackGenerator.cxx	1 Oct 2009 21:21:11 -0000	1.18.2.1
--- cmCPackGenerator.cxx	9 Oct 2009 20:11:22 -0000	1.18.2.2
***************
*** 391,396 ****
    const char* cmakeScripts
      = this->GetOption("CPACK_INSTALL_SCRIPT");
-   std::string currentWorkingDirectory =
-     cmSystemTools::GetCurrentWorkingDirectory();
    if ( cmakeScripts && *cmakeScripts )
      {
--- 391,394 ----
***************
*** 461,466 ****
    const char* cmakeGenerator
      = this->GetOption("CPACK_CMAKE_GENERATOR");
-   std::string currentWorkingDirectory =
-     cmSystemTools::GetCurrentWorkingDirectory();
    if ( cmakeProjects && *cmakeProjects )
      {
--- 459,462 ----