[Cmake-commits] CMake branch, next, updated. v3.3.1-2676-g26f1c64

[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  26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4 (commit)
       via  321d8265d108dc9645a84975841d9d89124d471d (commit)
      from  51e62249592aedb7b5acfbe649004020efb5073d (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=26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4
commit 26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4
Merge: 51e6224 321d826
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 1 09:48:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 1 09:48:25 2015 -0400

    Merge topic 'release-scripts-osx-doc-dir' into next
    
    321d8265 Revert topic 'release-scripts-osx-doc-dir'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=321d8265d108dc9645a84975841d9d89124d471d
commit 321d8265d108dc9645a84975841d9d89124d471d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 1 09:47:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 1 09:47:36 2015 -0400

    Revert topic 'release-scripts-osx-doc-dir'
    
    The actual release tarballs use separate documentation tarball
    generation so the location of the html docs is not controlled
    by the per-machine release scripts.

diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index cd4c5a1..01f5b8b 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,7 +1,7 @@
 set(PROCESSORS 2)
 set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
 set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc  <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>  -shared-libgcc -lstdc++-static\\\")")
-set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
+set(INSTALL_PREFIX /)
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j2")
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index b147013..be1dfa9 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -1,7 +1,7 @@
 set(PROCESSORS 4)
 set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
 # set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc  <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>  -shared-libgcc -lstdc++-static\\\")")
-set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
+set(INSTALL_PREFIX /)
 set(HOST dashmacmini5)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j5")
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index 06e720f..76fdb3a 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -116,9 +116,15 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
     @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
     check_exit_value $? "Configure cmake" || exit 1
 else
-    echo  "Run cmake bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@"
-    ../@CMAKE_CREATE_VERSION@/bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@
-    check_exit_value $? "Bootstrap cmake" || exit 1
+    if [ -z "@INSTALL_PREFIX@" ]; then
+	echo  "Run cmake bootstrap --parallel=@PROCESSORS@"
+	../@CMAKE_CREATE_VERSION@/bootstrap --parallel=@PROCESSORS@
+	check_exit_value $? "Bootstrap cmake" || exit 1
+    else
+	echo  "Run cmake bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@"
+	../@CMAKE_CREATE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@
+	check_exit_value $? "Bootstrap cmake" || exit 1
+    fi
 fi
 
 echo "Build cmake with @MAKE@"

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

Summary of changes:
 Utilities/Release/dashmacmini2_release.cmake |    2 +-
 Utilities/Release/dashmacmini5_release.cmake |    2 +-
 Utilities/Release/release_cmake.sh.in        |   12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake