[Cmake-commits] [cmake-commits] hoffman committed README 1.6 1.7 create-cmake-release.cmake 1.13 1.14 release_cmake.cmake 1.27 1.28 release_cmake.sh.in 1.17 1.18
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jan 27 10:34:19 EST 2009
Update of /cvsroot/CMake/CMake/Utilities/Release
In directory public:/mounts/ram/cvs-serv23311
Modified Files:
README create-cmake-release.cmake release_cmake.cmake
release_cmake.sh.in
Log Message:
ENH: change to use CMAKE_CREATE_VERSION from CMAKE_VERSION as CMAKE_VERSION is auto-defined now
Index: README
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/Release/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** README 24 Sep 2008 17:53:55 -0000 1.6
--- README 27 Jan 2009 15:34:09 -0000 1.7
***************
*** 3,7 ****
mkdir 2-4
cd 2-4
! cmake -DCMAKE_VERSION=CMake-2-4 -P ../create-cmake-release.cmake
./create-CMake-2-4.sh
--- 3,7 ----
mkdir 2-4
cd 2-4
! cmake -DCMAKE_CREATE_VERSION=CMake-2-4 -P ../create-cmake-release.cmake
./create-CMake-2-4.sh
***************
*** 16,20 ****
mkdir 2-4-7
cd 2-4-7
! cmake -DCMAKE_VERSION=CMake-2-4-7 -P ../create-cmake-release.cmake
./create-CMake-2-4.sh
--- 16,20 ----
mkdir 2-4-7
cd 2-4-7
! cmake -DCMAKE_CREATE_VERSION=CMake-2-4-7 -P ../create-cmake-release.cmake
./create-CMake-2-4.sh
Index: release_cmake.sh.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/Release/release_cmake.sh.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** release_cmake.sh.in 7 Mar 2008 19:03:31 -0000 1.17
--- release_cmake.sh.in 27 Jan 2009 15:34:14 -0000 1.18
***************
*** 51,66 ****
fi
echo "Create a directory to build in"
! rm -rf @CMAKE_RELEASE_DIRECTORY@/@CMAKE_VERSION at -build
check_exit_value $? "Remove build tree" || exit 1
! mkdir @CMAKE_RELEASE_DIRECTORY@/@CMAKE_VERSION at -build
check_exit_value $? "Create build directory" || exit 1
# make sure directory was created
! if [ ! -d @CMAKE_RELEASE_DIRECTORY@/@CMAKE_VERSION at -build ]; then
! echo "Could not create @CMAKE_RELEASE_DIRECTORY@/@CMAKE_VERSION at -build"
exit -1
fi
echo "Create initial cache"
! echo "@INITIAL_CACHE@" > @CMAKE_RELEASE_DIRECTORY@/@CMAKE_VERSION at -build/CMakeCache.txt
check_exit_value $? "Create initial cache" || exit 1
--- 51,66 ----
fi
echo "Create a directory to build in"
! rm -rf @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build
check_exit_value $? "Remove build tree" || exit 1
! mkdir @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build
check_exit_value $? "Create build directory" || exit 1
# make sure directory was created
! if [ ! -d @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build ]; then
! echo "Could not create @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build"
exit -1
fi
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
***************
*** 68,90 ****
#echo "cmake" | @CVS_COMMAND@ -d @CVSROOT@ login
! echo "Checkout the source for @CMAKE_VERSION@"
cd @CMAKE_RELEASE_DIRECTORY@
! @CMAKE_CHECKOUT@ -d @CMAKE_VERSION@ CMake
check_exit_value $? "Checkout cmake source" || exit 1
! cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_VERSION at -build
if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
echo "Run cmake to configure cmake"
! @CMAKE_CONFIGURE_PATH@ ../@CMAKE_VERSION@
check_exit_value $? "Configure cmake" || exit 1
else
if [ -z "@INSTALL_PREFIX@" ]; then
echo "Run cmake bootstrap --parallel=@PROCESSORS@"
! ../@CMAKE_VERSION@/bootstrap --parallel=@PROCESSORS@
check_exit_value $? "Bootstrap cmake" || exit 1
else
echo "Run cmake bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@"
! ../@CMAKE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@
check_exit_value $? "Bootstrap cmake" || exit 1
fi
--- 68,90 ----
#echo "cmake" | @CVS_COMMAND@ -d @CVSROOT@ login
! echo "Checkout the source for @CMAKE_CREATE_VERSION@"
cd @CMAKE_RELEASE_DIRECTORY@
! @CMAKE_CHECKOUT@ -d @CMAKE_CREATE_VERSION@ CMake
check_exit_value $? "Checkout cmake source" || exit 1
! cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION at -build
if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
echo "Run cmake to configure cmake"
! @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
check_exit_value $? "Configure cmake" || exit 1
else
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
Index: create-cmake-release.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/Release/create-cmake-release.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** create-cmake-release.cmake 19 Aug 2008 17:59:44 -0000 1.13
--- create-cmake-release.cmake 27 Jan 2009 15:34:09 -0000 1.14
***************
*** 1,5 ****
! if(NOT DEFINED CMAKE_VERSION)
! message(FATAL_ERROR "CMAKE_VERSION not defined")
! endif(NOT DEFINED CMAKE_VERSION)
set(RELEASE_SCRIPTS
--- 1,5 ----
! if(NOT DEFINED CMAKE_CREATE_VERSION)
! message(FATAL_ERROR "CMAKE_CREATE_VERSION not defined")
! endif(NOT DEFINED CMAKE_CREATE_VERSION)
set(RELEASE_SCRIPTS
***************
*** 19,33 ****
)
! file(WRITE create-${CMAKE_VERSION}.sh "#!/bin/sh")
make_directory(${CMAKE_CURRENT_SOURCE_DIR}/logs)
foreach(f ${RELEASE_SCRIPTS})
! file(APPEND create-${CMAKE_VERSION}.sh
"
! ${CMAKE_COMMAND} -DCMAKE_VERSION=${CMAKE_VERSION} -P ${CMAKE_ROOT}/Utilities/Release/${f} < /dev/null >& ${CMAKE_CURRENT_SOURCE_DIR}/logs/${f}-${CMAKE_VERSION}.log &
! xterm -geometry 80x10 -sb -sl 2000 -T ${f}-${CMAKE_VERSION}.log -e tail -f ${CMAKE_CURRENT_SOURCE_DIR}/logs/${f}-${CMAKE_VERSION}.log&")
endforeach(f)
! execute_process(COMMAND chmod a+x create-${CMAKE_VERSION}.sh)
! message("Run ./create-${CMAKE_VERSION}.sh")
--- 19,33 ----
)
! file(WRITE create-${CMAKE_CREATE_VERSION}.sh "#!/bin/sh")
make_directory(${CMAKE_CURRENT_SOURCE_DIR}/logs)
foreach(f ${RELEASE_SCRIPTS})
! file(APPEND create-${CMAKE_CREATE_VERSION}.sh
"
! ${CMAKE_COMMAND} -DCMAKE_CREATE_VERSION=${CMAKE_CREATE_VERSION} -P ${CMAKE_ROOT}/Utilities/Release/${f} < /dev/null >& ${CMAKE_CURRENT_SOURCE_DIR}/logs/${f}-${CMAKE_CREATE_VERSION}.log &
! xterm -geometry 80x10 -sb -sl 2000 -T ${f}-${CMAKE_CREATE_VERSION}.log -e tail -f ${CMAKE_CURRENT_SOURCE_DIR}/logs/${f}-${CMAKE_CREATE_VERSION}.log&")
endforeach(f)
! execute_process(COMMAND chmod a+x create-${CMAKE_CREATE_VERSION}.sh)
! message("Run ./create-${CMAKE_CREATE_VERSION}.sh")
Index: release_cmake.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/Release/release_cmake.cmake,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** release_cmake.cmake 12 Feb 2007 17:06:02 -0000 1.27
--- release_cmake.cmake 27 Jan 2009 15:34:10 -0000 1.28
***************
*** 27,46 ****
set(PROCESSORS 1)
endif(NOT DEFINED PROCESSORS)
! if(NOT DEFINED CMAKE_VERSION)
! message(FATAL_ERROR "CMAKE_VERSION not defined")
! endif(NOT DEFINED CMAKE_VERSION)
if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND)
! if("${CMAKE_VERSION}" STREQUAL "CVS")
set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -D now ")
! set( CMAKE_VERSION "CurrentCVS")
! else("${CMAKE_VERSION}" STREQUAL "CVS")
! set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -r ${CMAKE_VERSION} ")
! endif("${CMAKE_VERSION}" STREQUAL "CVS")
if(NOT DEFINED FINAL_PATH )
! set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build)
endif(NOT DEFINED FINAL_PATH )
--- 27,46 ----
set(PROCESSORS 1)
endif(NOT DEFINED PROCESSORS)
! if(NOT DEFINED CMAKE_CREATE_VERSION)
! message(FATAL_ERROR "CMAKE_CREATE_VERSION not defined")
! endif(NOT DEFINED CMAKE_CREATE_VERSION)
if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND)
! if("${CMAKE_CREATE_VERSION}" STREQUAL "CVS")
set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -D now ")
! set( CMAKE_CREATE_VERSION "CurrentCVS")
! else("${CMAKE_CREATE_VERSION}" STREQUAL "CVS")
! set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -r ${CMAKE_CREATE_VERSION} ")
! endif("${CMAKE_CREATE_VERSION}" STREQUAL "CVS")
if(NOT DEFINED FINAL_PATH )
! set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_CREATE_VERSION}-build)
endif(NOT DEFINED FINAL_PATH )
***************
*** 52,56 ****
endif(NOT DEFINED MAKE)
! message("Creating CMake release ${CMAKE_VERSION} on ${HOST} with parallel = ${PROCESSORS}")
# define a macro to run a remote command
--- 52,56 ----
endif(NOT DEFINED MAKE)
! message("Creating CMake release ${CMAKE_CREATE_VERSION} on ${HOST} with parallel = ${PROCESSORS}")
# define a macro to run a remote command
More information about the Cmake-commits
mailing list