diff options
Diffstat (limited to 'Utilities/Release/cmake_release.sh.in')
| -rwxr-xr-x | Utilities/Release/cmake_release.sh.in | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/Utilities/Release/cmake_release.sh.in b/Utilities/Release/cmake_release.sh.in index 29dd9e7..cd63c01 100755 --- a/Utilities/Release/cmake_release.sh.in +++ b/Utilities/Release/cmake_release.sh.in @@ -23,7 +23,7 @@ # # Release version number. -TAG="ParaView-@CMake_VERSION_MAJOR@-@CMake_VERSION_MINOR@-@CMake_VERSION_PATCH@" +TAG="CMake-@CMake_VERSION_MAJOR@-@CMake_VERSION_MINOR@-@CMake_VERSION_PATCH@" VERSION="@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@.@CMake_VERSION_PATCH@" CMAKE_VERSION="@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@" RELEASE="1" @@ -248,7 +248,7 @@ clean() { cd "${HOME}" && echo "Cleaning up ${RELEASE_ROOT}" && - rm -rf "${RELEASE_ROOT_NAME}" + rm -rf ${RELEASE_ROOT_NAME}/* } #----------------------------------------------------------------------------- @@ -310,16 +310,21 @@ checkout() { [ -z "${DONE_checkout}" ] || return 0 ; DONE_checkout="yes" config || return 1 - echo "Exporting cmake from cvs ..." && + echo "Updating CMake from cvs ..." && ( + if [ -d cmake-${VERSION}/CVS ]; then + cd cmake-${VERSION} && + cvs -q -z3 -d $CVSROOT update -dAP -r ${TAG} + else rm -rf cmake-${VERSION} && rm -rf CheckoutTemp && mkdir CheckoutTemp && cd CheckoutTemp && - cvs -q -z3 -d $CVSROOT export -r ${TAG} CMake && + cvs -q -z3 -d $CVSROOT co -r ${TAG} CMake && mv CMake ../cmake-${VERSION} && cd .. && rm -rf CheckoutTemp + fi ) >Logs/checkout.log 2>&1 || error_log Logs/checkout.log } @@ -337,7 +342,7 @@ source_tarball() ( mkdir -p Tarballs && rm -rf Tarballs/cmake-${VERSION}.tar* && - tar cvf Tarballs/cmake-${VERSION}.tar cmake-${VERSION} && + tar cvf Tarballs/cmake-${VERSION}.tar --exclude CVS cmake-${VERSION} && gzip -c Tarballs/cmake-${VERSION}.tar >Tarballs/cmake-${VERSION}.tar.gz && compress Tarballs/cmake-${VERSION}.tar ) >Logs/source_tarball.log 2>&1 || error_log Logs/source_tarball.log @@ -540,7 +545,7 @@ cygwin_source_tarball() ( mkdir -p Cygwin && rm -rf Cygwin/cmake-${VERSION}.tar.bz2 && - tar cvjf Cygwin/cmake-${VERSION}.tar.bz2 cmake-${VERSION} + tar cvjf Cygwin/cmake-${VERSION}.tar.bz2 --exclude CVS cmake-${VERSION} ) >Logs/cygwin_source_tarball.log 2>&1 || error_log Logs/cygwin_source_tarball.log } @@ -555,7 +560,7 @@ cygwin_source_patch() mkdir -p Cygwin && rm -rf Cygwin/Patched && mkdir -p Cygwin/Patched && - (tar c cmake-${VERSION} | (cd Cygwin/Patched; tar x)) && + (tar c --exclude CVS cmake-${VERSION} | (cd Cygwin/Patched; tar x)) && cd Cygwin/Patched && mkdir -p cmake-${VERSION}/CYGWIN-PATCHES && ( @@ -593,7 +598,12 @@ This will create: Port Notes: -<none> +The directory /usr/share/cmake-${VERSION}/include is purposely not +located at /usr/include/cmake-${VERSION} or /usr/include/cmake. The +files it contains are not meant for inclusion in any C or C++ program. +They are used for compiling dynamically loadable CMake commands inside +projects that provide them. CMake will automatically provide the +proper include path when the files are needed. ------------------ @@ -605,16 +615,14 @@ EOF cat > cmake-${VERSION}/CYGWIN-PATCHES/setup.hint <<EOF # CMake setup.hint file for cygwin setup.exe program category: Devel -requires: libncurses6 cygwin +requires: libncurses7 cygwin sdesc: "A cross platform build manger" ldesc: "CMake is a cross platform build manager. It allows you to specify build parameters for C and C++ programs in a cross platform manner. For cygwin Makefiles will be generated. CMake is also capable of generating microsoft project files, nmake, and borland makefiles. CMake can also perform system inspection operations like finding installed libraries and header files." -prev: ${PREVIOUS_VERSION}-${PREVIOUS_RELEASE} -curr: ${VERSION}-${RELEASE} EOF ) && dos2unix cmake-${VERSION}/CYGWIN-PATCHES/setup.hint && cp cmake-${VERSION}/CYGWIN-PATCHES/setup.hint ../setup.hint && - (diff -urN "../../cmake-${VERSION}" "cmake-${VERSION}" > "../cmake-${VERSION}-${RELEASE}.patch"; [ "$?" = "1" ]) + (diff -x CVS -urN "../../cmake-${VERSION}" "cmake-${VERSION}" > "../cmake-${VERSION}-${RELEASE}.patch"; [ "$?" = "1" ]) ) >Logs/cygwin_source_patch.log 2>&1 || error_log Logs/cygwin_source_patch.log } @@ -717,18 +725,27 @@ osx_install() echo "Running make install for OSX package ..." && ( rm -rf OSX && - mkdir -p OSX/Package_Root/Applications && - mkdir -p OSX/Resources/PreFlight && - mkdir -p OSX/Resources/PostFlight && + mkdir -p OSX/Resources && ( cd "cmake-${VERSION}-${PLATFORM}" && ${MAKE} install DESTDIR="${RELEASE_ROOT}/OSX/Package_Root" ) && - cp cmake-${VERSION}/Copyright.txt OSX/Resources/License.txt && - cp -r cmake-${VERSION}-${PLATFORM}/bin/CMake.app OSX/Package_Root/Applications && - echo "APPL????" > OSX/Package_Root/Applications/CMake.app/Contents/PkgInfo && - cp "${WX_RESOURCES}" OSX/Package_Root/Applications/CMake.app/Contents/Resources/wxCMakeSetup.rsrc + cp cmake-${VERSION}/Copyright.txt OSX/Resources/License.txt ) >Logs/osx_install.log 2>&1 || error_log Logs/osx_install.log +# Use this version when the wxCMakeSetup dialog is restored: +# ( +# rm -rf OSX && +# mkdir -p OSX/Resources && +# mkdir -p OSX/Package_Root/Applications && +# ( +# cd "cmake-${VERSION}-${PLATFORM}" && +# ${MAKE} install DESTDIR="${RELEASE_ROOT}/OSX/Package_Root" +# ) && +# cp cmake-${VERSION}/Copyright.txt OSX/Resources/License.txt && +# cp -r cmake-${VERSION}-${PLATFORM}/bin/CMake.app OSX/Package_Root/Applications && +# echo "APPL????" > OSX/Package_Root/Applications/CMake.app/Contents/PkgInfo && +# cp "${WX_RESOURCES}" OSX/Package_Root/Applications/CMake.app/Contents/Resources/wxCMakeSetup.rsrc +# ) >Logs/osx_install.log 2>&1 || error_log Logs/osx_install.log } #----------------------------------------------------------------------------- |