[Cmake-commits] [cmake-commits] hoffman committed cmCPackCygwinBinaryGenerator.cxx 1.4 1.5 cmCPackCygwinSourceGenerator.cxx 1.4 1.5 cmCPackGenerator.cxx 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackCygwinBinaryGenerator.cxx 
	cmCPackCygwinSourceGenerator.cxx cmCPackGenerator.cxx 
Log Message:
ENH: fix crash in cpack when CPACK_CYGWIN_PATCH_NUMBER not specified


Index: cmCPackCygwinBinaryGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackCygwinBinaryGenerator.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmCPackCygwinBinaryGenerator.cxx	7 Mar 2008 16:06:44 -0000	1.4
--- cmCPackCygwinBinaryGenerator.cxx	13 Mar 2008 01:54:27 -0000	1.5
***************
*** 107,111 ****
                    << std::endl);
      }
!   this->OutputExtension += 
    this->OutputExtension += ".tar.bz2";
    return this->OutputExtension.c_str();
--- 107,111 ----
                    << std::endl);
      }
!   this->OutputExtension += patchNumber;
    this->OutputExtension += ".tar.bz2";
    return this->OutputExtension.c_str();

Index: cmCPackCygwinSourceGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackCygwinSourceGenerator.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmCPackCygwinSourceGenerator.cxx	31 Oct 2007 12:50:17 -0000	1.4
--- cmCPackCygwinSourceGenerator.cxx	13 Mar 2008 01:54:27 -0000	1.5
***************
*** 125,129 ****
      = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
    outerTarFile += "-";
!   outerTarFile += this->GetOption("CPACK_CYGWIN_PATCH_NUMBER");
    outerTarFile += "-src.tar";
    std::string buildScript = cmSystemTools::GetFilenameName(
--- 125,136 ----
      = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
    outerTarFile += "-";
!   const char* patch = this->GetOption("CPACK_CYGWIN_PATCH_NUMBER");
!   if(!patch)
!     {
!     cmCPackLogger(cmCPackLog::LOG_WARNING, "CPACK_CYGWIN_PATCH_NUMBER"
!                   << " not specified, defaulting to 1\n");
!     patch = "1";
!     }
!   outerTarFile += patch;
    outerTarFile += "-src.tar";
    std::string buildScript = cmSystemTools::GetFilenameName(
***************
*** 177,181 ****
  {
    this->OutputExtension = "-";
!   this->OutputExtension += this->GetOption("CPACK_CYGWIN_PATCH_NUMBER");
    this->OutputExtension += "-src.tar.bz2";
    return this->OutputExtension.c_str();
--- 184,195 ----
  {
    this->OutputExtension = "-";
!   const char* patch = this->GetOption("CPACK_CYGWIN_PATCH_NUMBER"); 
!   if(!patch)
!     {
!     cmCPackLogger(cmCPackLog::LOG_WARNING, "CPACK_CYGWIN_PATCH_NUMBER"
!                   << " not specified, defaulting to 1\n");
!     patch = "1";
!     }
!   this->OutputExtension += patch;
    this->OutputExtension += "-src.tar.bz2";
    return this->OutputExtension.c_str();

Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmCPackGenerator.cxx	7 Mar 2008 16:06:44 -0000	1.5
--- cmCPackGenerator.cxx	13 Mar 2008 01:54:27 -0000	1.6
***************
*** 818,822 ****
  const char* cmCPackGenerator::GetOption(const char* op)
  { 
!   return this->MakefileMap->GetDefinition(op);
  }
  
--- 818,830 ----
  const char* cmCPackGenerator::GetOption(const char* op)
  { 
!   const char* ret = this->MakefileMap->GetDefinition(op);
!   if(!ret)
!     { 
!     cmCPackLogger(cmCPackLog::LOG_DEBUG, 
!                   "Warning, GetOption return NULL for: "
!                   << op 
!                   << std::endl);
!     }
!   return ret;
  }