[Cmake-commits] CMake branch, next, updated. v2.8.2-863-g9ac4286

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9ac4286f9c011be39fd5d3bb45b248a54cf853dd (commit)
       via  775697d5f5e8812dc642d1e21e7bc5405df943cd (commit)
      from  a36448038aab791189a09f9b0a1bdbf002b896f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ac4286f9c011be39fd5d3bb45b248a54cf853dd
commit 9ac4286f9c011be39fd5d3bb45b248a54cf853dd
Merge: a364480 775697d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 21 10:06:51 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 10:06:51 2010 -0400

    Merge topic 'fix_windows7_untar' into next
    
    775697d Add a delay after untar on windows to make external project work on windows 7


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=775697d5f5e8812dc642d1e21e7bc5405df943cd
commit 775697d5f5e8812dc642d1e21e7bc5405df943cd
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 21 10:04:04 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Sep 21 10:04:04 2010 -0400

    Add a delay after untar on windows to make external project work on windows 7
    
    OK, on windows 7 after we untar some files,
    sometimes we can not rename the directory after
    the untar is done. This breaks the external project
    untar and rename code.  So, by default we will wait
    1/10th of a second after the untar.  If CMAKE_UNTAR_DELAY
    is set in the env, its value will be used instead of 100.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index e6c7bb0..1e3b018 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1574,6 +1574,24 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
           cmSystemTools::Error("Problem extracting tar: ", outFile.c_str());
           return 1;
           }
+#ifdef WIN32
+        // OK, on windows 7 after we untar some files,
+        // sometimes we can not rename the directory after
+        // the untar is done. This breaks the external project
+        // untar and rename code.  So, by default we will wait
+        // 1/10th of a second after the untar.  If CMAKE_UNTAR_DELAY
+        // is set in the env, its value will be used instead of 100.
+        int delay = 100;
+        const char* delayVar = cmSystemTools::GetEnv("CMAKE_UNTAR_DELAY");
+        if(delayVar)
+          {
+          delay = atoi(delayVar);
+          }
+        if(delay)
+          {
+          cmSystemTools::Delay(delay);
+          }
+#endif
         }
       return 0;
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmake.cxx |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake