[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7316-g0cfd274

[Brad King]

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  0cfd274e41883024b48911789dacaa3c9d49850b (commit)
       via  9b7cd0990e0a64d7fe289549e36f858cc8871b71 (commit)
       via  460b0f5db55d48ebf9ca01fd979a7f69f53009c2 (commit)
      from  e27be1b5ee8d53089418b770ad7f1d4b56c7172d (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=0cfd274e41883024b48911789dacaa3c9d49850b
commit 0cfd274e41883024b48911789dacaa3c9d49850b
Merge: e27be1b 9b7cd09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 28 13:24:35 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 28 13:24:35 2014 -0500

    Merge topic 'doc-release-tarball' into next
    
    9b7cd099 Utilities/Release: Use in-PATH sphinx-build on dash2win64
    460b0f5d Utilities/Release: Fix 'git archive' invocation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b7cd0990e0a64d7fe289549e36f858cc8871b71
commit 9b7cd0990e0a64d7fe289549e36f858cc8871b71
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 28 13:24:21 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 28 13:24:47 2014 -0500

    Utilities/Release: Use in-PATH sphinx-build on dash2win64

diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake
index 77b2699..4b8c257 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -10,7 +10,6 @@ set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE
 CTEST_TEST_TIMEOUT:STRING=7200
 DART_TESTING_TIMEOUT:STRING=7200
-SPHINX_EXECUTABLE:FILEPATH=/cygdrive/c/Python26-x86/Scripts/sphinx-build.exe
 SPHINX_HTML:BOOL=ON
 SPHINX_MAN:BOOL=ON
 ")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=460b0f5db55d48ebf9ca01fd979a7f69f53009c2
commit 460b0f5db55d48ebf9ca01fd979a7f69f53009c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 28 10:58:06 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 28 10:58:23 2014 -0500

    Utilities/Release: Fix 'git archive' invocation
    
    Tell it not to consider the current work tree location.

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index d83566c..95428b6 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -50,7 +50,7 @@ function(write_docs_shell_script filename)
 
 name=${name} &&
 inst=\"\$PWD/\$name\"
-git archive --prefix=\${name}-src/ ${CMAKE_CREATE_VERSION} | tar x &&
+(GIT_WORK_TREE=x git archive --prefix=\${name}-src/ ${CMAKE_CREATE_VERSION}) | tar x &&
 rm -rf \${name}-build &&
 mkdir \${name}-build &&
 cd \${name}-build &&

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

Summary of changes:
 Utilities/Release/create-cmake-release.cmake |    2 +-
 Utilities/Release/dash2win64_cygwin.cmake    |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake