[Cmake-commits] CMake branch, next, updated. v3.6.2-2567-g7936f11

[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  7936f112b7f00097e9e7919fff9c89ad12ab6c75 (commit)
       via  93300f36237372cdf3c84be725acf7d2eae0a65c (commit)
      from  ec794f43e489b5ac5dc6c780f5205b388f77a308 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7936f112b7f00097e9e7919fff9c89ad12ab6c75
commit 7936f112b7f00097e9e7919fff9c89ad12ab6c75
Merge: ec794f4 93300f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 08:58:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 08:58:56 2016 -0400

    Merge topic 'win64-binary-docs' into next
    
    93300f36 Utilities/Release: Add html docs to Windows 64-bit binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93300f36237372cdf3c84be725acf7d2eae0a65c
commit 93300f36237372cdf3c84be725acf7d2eae0a65c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 08:52:39 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 08:55:29 2016 -0400

    Utilities/Release: Add html docs to Windows 64-bit binary
    
    The 64-bit Windows binary is built in our second batch because it is
    built on the same host as the 32-bit Windows binary.  When the
    documentation generation was first added, it was not included in the
    second batch because at the time that batch only included the Cygwin
    binary.  Therefore the 64-bit Windows binary has been missing the
    documentation since it was first created for CMake 3.6.
    
    Since then the Cygwin binary was dropped so the second batch only
    contains the 64-bit Windows binary.  Add the docs to it.
    
    Closes: #16333

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 7b144f1..3af1b03 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -66,7 +66,6 @@ endfunction()
 
 write_docs_shell_script("create-${CMAKE_CREATE_VERSION}-docs.sh")
 write_batch_shell_script("create-${CMAKE_CREATE_VERSION}-batch1.sh" ${RELEASE_SCRIPTS_BATCH_1})
-unset(CMAKE_DOC_TARBALL) # No pre-built docs in second batch.
 write_batch_shell_script("create-${CMAKE_CREATE_VERSION}-batch2.sh" ${RELEASE_SCRIPTS_BATCH_2})
 
 message("Run one at a time:

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

Summary of changes:
 Utilities/Release/create-cmake-release.cmake |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake