[Cmake-commits] [cmake-commits] david.cole committed cmCPackNSISGenerator.cxx 1.38 1.39

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackNSISGenerator.cxx 
Log Message:
BUG: Fix for issue #7470. Allow spaces in the path names of installed files with the NSIS CPack generator and component-based installs. Add an installed file to the CPackComponents test: it failed before the fix; now it passes.


Index: cmCPackNSISGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -C 2 -d -r1.38 -r1.39
*** cmCPackNSISGenerator.cxx	10 Oct 2008 21:08:00 -0000	1.38
--- cmCPackNSISGenerator.cxx	20 Jan 2009 19:29:41 -0000	1.39
***************
*** 794,811 ****
              << component->Name << "\n";
    std::vector<std::string>::iterator pathIt;
!   for (pathIt = component->Files.begin(); 
!        pathIt != component->Files.end(); 
!        ++pathIt) 
      {
!     macrosOut << "  Delete \"$INSTDIR\\" 
!               << cmSystemTools::ConvertToWindowsOutputPath(pathIt->c_str())
                << "\"\n";
      }
!   for (pathIt = component->Directories.begin(); 
!        pathIt != component->Directories.end(); 
!        ++pathIt) 
      {
!     macrosOut << "  RMDir \"$INSTDIR\\" 
!               << cmSystemTools::ConvertToWindowsOutputPath(pathIt->c_str())
                << "\"\n";
      }
--- 794,816 ----
              << component->Name << "\n";
    std::vector<std::string>::iterator pathIt;
!   std::string path;
!   for (pathIt = component->Files.begin();
!        pathIt != component->Files.end();
!        ++pathIt)
      {
!     path = *pathIt;
!     cmSystemTools::ReplaceString(path, "/", "\\");
!     macrosOut << "  Delete \"$INSTDIR\\"
!               << path.c_str()
                << "\"\n";
      }
!   for (pathIt = component->Directories.begin();
!        pathIt != component->Directories.end();
!        ++pathIt)
      {
!     path = *pathIt;
!     cmSystemTools::ReplaceString(path, "/", "\\");
!     macrosOut << "  RMDir \"$INSTDIR\\"
!               << path.c_str()
                << "\"\n";
      }