[Cmake-commits] CMake branch, master, updated. 7849674012189c4337d05dbc5b2926d3c12951fe

[cmake-commits at cmake.org]

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, master has been updated
       via  7849674012189c4337d05dbc5b2926d3c12951fe (commit)
      from  22e9f2d0abf4ca7ff0b8551ba1be2ce6a3530336 (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=7849674012189c4337d05dbc5b2926d3c12951fe
commit 7849674012189c4337d05dbc5b2926d3c12951fe
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue Apr 20 15:03:20 2010 -0400

    Fix release scripts.

diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index 5bec13a..fcf67bc 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -1,6 +1,6 @@
 set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseDirectory")
 set(CONFIGURE_WITH_CMAKE TRUE)
-set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake\\ 2.6/bin/cmake.exe")
+set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake\\ 2.8/bin/cmake.exe")
 set(PROCESSORS 8)
 set(HOST dash2win64)
 set(CPACK_BINARY_GENERATORS "NSIS ZIP")
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 645557b..12bfa6a 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,4 +1,6 @@
 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(INSTALL_PREFIX /)
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index ee56f39..b2ca348 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -69,6 +69,13 @@ echo "Create initial cache"
 echo "@INITIAL_CACHE@" > @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build/CMakeCache.txt
 check_exit_value $? "Create initial cache" || exit 1
 
+# create a user override file user.txt if USER_OVERRIDE is set,
+# and append the cache variable to the cache
+if [ ! -z "@USER_OVERRIDE@" ]; then
+  echo "@USER_OVERRIDE@" >  @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build/user.txt
+  echo "CMAKE_USER_MAKE_RULES_OVERRIDE:FILEPATH=@CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build/user.txt" >> @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build/CMakeCache.txt
+fi
+
 echo "Checkout the source for @CMAKE_CREATE_VERSION@"
 cd @CMAKE_RELEASE_DIRECTORY@ 
 if [ ! -z "@GIT_COMMAND@" ]; then
diff --git a/Utilities/Release/v20n250_aix_release.cmake b/Utilities/Release/v20n250_aix_release.cmake
index 876c84d..88eb8d0 100644
--- a/Utilities/Release/v20n250_aix_release.cmake
+++ b/Utilities/Release/v20n250_aix_release.cmake
@@ -5,8 +5,8 @@ set(CVS_COMMAND /vol/local/bin/cvs)
 set(HOST "sshserv.centers.ihost.com" )
 set(EXTRA_HOP "rsh v20n250" )
 set(MAKE_PROGRAM "make")
-set(CC "xlc")
-set(CXX "xlC")
+set(CC "xlc_r")
+set(CXX "xlC_r")
 set(FC "xlf")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release

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

Summary of changes:
 Utilities/Release/dash2win64_release.cmake   |    2 +-
 Utilities/Release/dashmacmini2_release.cmake |    2 ++
 Utilities/Release/release_cmake.sh.in        |    7 +++++++
 Utilities/Release/v20n250_aix_release.cmake  |    4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake