[cmake-commits] hoffman committed SystemTools.cxx 1.157.2.11 1.157.2.12 SystemTools.cxx.bak 1.1.2.2 NONE

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv8820/Source/kwsys

Modified Files:
      Tag: CMake-2-4
	SystemTools.cxx 
Removed Files:
      Tag: CMake-2-4
	SystemTools.cxx.bak 
Log Message:
ENH: merge in changes from main tree, including fix for exception stuff in vs 7


--- SystemTools.cxx.bak DELETED ---

Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.157.2.11
retrieving revision 1.157.2.12
diff -u -d -r1.157.2.11 -r1.157.2.12
--- SystemTools.cxx	5 Feb 2007 18:21:32 -0000	1.157.2.11
+++ SystemTools.cxx	15 Feb 2007 17:45:08 -0000	1.157.2.12
@@ -2599,8 +2599,20 @@
   // Transform the path back to a string.
   kwsys_stl::string newPath = SystemTools::JoinPath(out_components);
 
-  // Update the translation table with this potentially new path.
-  SystemTools::AddTranslationPath(newPath.c_str(), in_path);
+  // Update the translation table with this potentially new path.  I am not
+  // sure why this line is here, it seems really questionable, but yet I
+  // would put good money that if I remove it something will break, basically
+  // from what I can see it created a mapping from the collapsed path, to be
+  // replaced by the input path, which almost completely does the opposite of
+  // this function, the only thing preventing this from happening a lot is
+  // that if the in_path has a .. in it, then it is not added to the
+  // translation table. So for most calls this either does nothing due to the
+  // ..  or it adds a translation between identical paths as nothing was
+  // collapsed, so I am going to try to comment it out, and see what hits the
+  // fan, hopefully quickly.
+  // Commented out line below:
+  //SystemTools::AddTranslationPath(newPath.c_str(), in_path);
+
   SystemTools::CheckTranslationPath(newPath);
 #ifdef _WIN32
   newPath = SystemTools::GetActualCaseForPath(newPath.c_str());