diff --git a/Utilities/cmake_release_config_darwin b/Utilities/cmake_release_config_darwin index 1a67f02f9..473dfd131 100644 --- a/Utilities/cmake_release_config_darwin +++ b/Utilities/cmake_release_config_darwin @@ -1,5 +1,3 @@ -RELEASE_TAG="Release-1-4" -VERSION="1.4.7" PLATFORM="darwin" CC="cc" CXX="c++" diff --git a/Utilities/cmake_release_config_hpux b/Utilities/cmake_release_config_hpux index c74d60b93..c31201e38 100644 --- a/Utilities/cmake_release_config_hpux +++ b/Utilities/cmake_release_config_hpux @@ -1,5 +1,3 @@ -RELEASE_TAG="Release-1-4" -VERSION="1.4.7" PLATFORM="hpux-static" CC="cc" CXX="aCC" diff --git a/Utilities/cmake_release_config_irix b/Utilities/cmake_release_config_irix index 43d4f6097..69d3eb82c 100644 --- a/Utilities/cmake_release_config_irix +++ b/Utilities/cmake_release_config_irix @@ -1,5 +1,3 @@ -RELEASE_TAG="Release-1-4" -VERSION="1.4.7" PLATFORM="irix65" CC="cc" CXX="CC" diff --git a/Utilities/cmake_release_config_linux b/Utilities/cmake_release_config_linux index e3468a95f..24424f4f4 100644 --- a/Utilities/cmake_release_config_linux +++ b/Utilities/cmake_release_config_linux @@ -1,5 +1,3 @@ -RELEASE_TAG="Release-1-4" -VERSION="1.4.7" PLATFORM="x86-linux-static" CREATE_SOURCE_TARBALL="yes" CURSES_LIBRARY="/usr/lib/libcurses.a" diff --git a/Utilities/cmake_release_config_osf b/Utilities/cmake_release_config_osf index 3f3f0c553..2e913a034 100644 --- a/Utilities/cmake_release_config_osf +++ b/Utilities/cmake_release_config_osf @@ -1,5 +1,3 @@ -RELEASE_TAG="Release-1-4" -VERSION="1.4.7" PLATFORM="alpha-osf" CC="cc" CXX="cxx" diff --git a/Utilities/cmake_release_config_sun b/Utilities/cmake_release_config_sun index a8f735bbc..6d0c06563 100644 --- a/Utilities/cmake_release_config_sun +++ b/Utilities/cmake_release_config_sun @@ -1,5 +1,3 @@ -RELEASE_TAG="Release-1-4" -VERSION="1.4.7" PLATFORM="sparc-sunos57-static" CURSES_LIBRARY="/usr/lib/libcurses.a" FORM_LIBRARY="/usr/lib/libform.a" diff --git a/Utilities/cmake_release_cygwin.sh b/Utilities/cmake_release_cygwin.sh index ae5e48444..9f98c40f7 100755 --- a/Utilities/cmake_release_cygwin.sh +++ b/Utilities/cmake_release_cygwin.sh @@ -4,12 +4,18 @@ # directory from a separate CMake checkout. # -CVS_TAG="-r Release-1-4" +# Find our own script's location. +SELFPATH=`cd \`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd` + +# Read version numbers. +. ${SELFPATH}/cmake_release_version.sh + +CVS_TAG="-r ${CURRENT_TAG}" PKG=cmake -VER=1.4.7 -REL=1 -PREVER=1.4.6 -PREREL=1 +VER="${CURRENT_VERSION}" +REL="${CURRENT_RELEASE}" +PREVER="${PREVIOUS_VERSION}" +PREREL="${PREVIOUS_RELEASE}" CVSROOT=":pserver:anonymous@www.cmake.org:/cvsroot/CMake" FULLPKG="${PKG}-${VER}-${REL}" diff --git a/Utilities/cmake_release_unix_config.sh b/Utilities/cmake_release_unix_config.sh index 1f8cefbd4..3ad9e6a78 100755 --- a/Utilities/cmake_release_unix_config.sh +++ b/Utilities/cmake_release_unix_config.sh @@ -13,8 +13,6 @@ if test "x$1" = "x"; then echo " $0 " echo "" echo "Sample configuration file:" - echo " RELEASE_TAG=\"Release-1-4\"" - echo " VERSION=\"1.4\"" echo " PLATFORM=\"x86-linux\"" exit 1 fi @@ -65,6 +63,9 @@ BUILD_TESTING:BOOL=OFF EOF } +SELFPATH=`cd \`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd` +. ${SELFPATH}/cmake_release_version.sh + #----------------------------------------------------------------------------- # Configuration options. echo "Reading configuration from ${CONFIG_FILE}..." @@ -77,6 +78,8 @@ fi export CC CXX CFLAGS CXXFLAGS # Select directories. +RELEASE_TAG="${CURRENT_TAG}" +VERSION="${CURRENT_VERSION}" INSTALL_DIR="${RELEASE_ROOT}/Install" TARBALL_DIR="${RELEASE_ROOT}/Tarballs" SOURCE_DIR="${RELEASE_ROOT}/CMake-$VERSION" diff --git a/Utilities/cmake_release_version.sh b/Utilities/cmake_release_version.sh new file mode 100755 index 000000000..d04747a6b --- /dev/null +++ b/Utilities/cmake_release_version.sh @@ -0,0 +1,7 @@ +CURRENT_TAG="Release-1-6" +CURRENT_VERSION="1.6.0" +CURRENT_RELEASE="1" + +# Cygwin packages need previous version/release. +PREVIOUS_VERSION="1.4.7" +PREVIOUS_RELEASE="1"