[Cmake-commits] [cmake-commits] king committed cmGeneratedFileStream.cxx 1.20 1.21 cmLocalUnixMakefileGenerator3.cxx 1.262 1.263 cmTarget.cxx 1.244 1.245

[cmake-commits at cmake.org]

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

Modified Files:
	cmGeneratedFileStream.cxx cmLocalUnixMakefileGenerator3.cxx 
	cmTarget.cxx 
Log Message:
ENH: On VMS use _dir and _tmp, not .dir and .tmp

The VMS posix path emulation does not handle multiple '.' characters in
file names in all cases.  This avoids adding extra '.'s to file and
directory names for target directories and generated files.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.262
retrieving revision 1.263
diff -C 2 -d -r1.262 -r1.263
*** cmLocalUnixMakefileGenerator3.cxx	24 Feb 2009 20:37:09 -0000	1.262
--- cmLocalUnixMakefileGenerator3.cxx	10 Jun 2009 17:03:11 -0000	1.263
***************
*** 2159,2163 ****
--- 2159,2167 ----
    std::string dir = cmake::GetCMakeFilesDirectoryPostSlash();
    dir += target.GetName();
+ #if defined(__VMS)
+   dir += "_dir";
+ #else
    dir += ".dir";
+ #endif
    return dir;
  }

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.244
retrieving revision 1.245
diff -C 2 -d -r1.244 -r1.245
*** cmTarget.cxx	1 May 2009 14:39:44 -0000	1.244
--- cmTarget.cxx	10 Jun 2009 17:03:11 -0000	1.245
***************
*** 931,935 ****
--- 931,939 ----
    dir += "/";
    dir += this->Name;
+ #if defined(__VMS)
+   dir += "_dir";
+ #else
    dir += ".dir";
+ #endif
    return dir;
  }

Index: cmGeneratedFileStream.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGeneratedFileStream.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** cmGeneratedFileStream.cxx	15 Apr 2009 13:57:56 -0000	1.20
--- cmGeneratedFileStream.cxx	10 Jun 2009 17:03:11 -0000	1.21
***************
*** 151,155 ****
--- 151,159 ----
    // Create the name of the temporary file.
    this->TempName = name;
+ #if defined(__VMS)
+   this->TempName += "_tmp";
+ #else
    this->TempName += ".tmp";
+ #endif
  
    // Make sure the temporary file that will be used is not present.