[Cmake-commits] [cmake-commits] hoffman committed cmCPackDebGenerator.cxx 1.20.2.1 1.20.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCPackDebGenerator.cxx 
Log Message:
ENH: merge in main tree for RC 6


Index: cmCPackDebGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackDebGenerator.cxx,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C 2 -d -r1.20.2.1 -r1.20.2.2
*** cmCPackDebGenerator.cxx	30 Mar 2008 13:09:47 -0000	1.20.2.1
--- cmCPackDebGenerator.cxx	2 Apr 2008 13:16:12 -0000	1.20.2.2
***************
*** 201,204 ****
--- 201,228 ----
    cmd += cmakeExecutable;
    cmd += "\" -E tar cfz control.tar.gz ./control ./md5sums";
+   const char* controlExtra = 
+     this->GetOption("CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA");
+   if( controlExtra )
+     { 
+     std::vector<std::string> controlExtraList;
+     cmSystemTools::ExpandListArgument(controlExtra, controlExtraList);
+     for(std::vector<std::string>::iterator i = 
+           controlExtraList.begin(); i != controlExtraList.end(); ++i)
+       {
+       std::string filenamename = 
+         cmsys::SystemTools::GetFilenameName(i->c_str());
+       std::string localcopy = toplevel;
+       localcopy += "/";
+       localcopy += filenamename;
+       // if we can copy the file, it means it does exist, let's add it:
+       if( cmsys::SystemTools::CopyFileIfDifferent(
+             i->c_str(), localcopy.c_str()) )
+         {
+         // debian is picky and need relative to ./ path in the tar.gz
+         cmd += " ./";
+         cmd += filenamename;
+         }
+       }
+     }
    res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
      &retVal, toplevel, this->GeneratorVerbose, 0);