diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index ee612a6..dd8477e 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.86") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.90") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/README.md b/README.md index 5d023be..f3474b1 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) endif() if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 1.99.86 REQUIRED) + find_package(MyxCMake 1.99.90 REQUIRED) else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.86 REQUIRED) + find_package(MyxCMake 1.99.90 REQUIRED) else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) endif() diff --git a/create_release.sh b/create_release.sh deleted file mode 100755 index 858efdf..0000000 --- a/create_release.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -e - -V=$(cat VERSION) -D=build - -sed -i "s/CMake.*REQ/CMake $V REQ/" README.md -sed -i "s/VERSION \".*\"/VERSION \"$V\"/" MyxCMakeConfigVersion.cmake - -mkdir -p "$D/myx-cmake-$V/MyxCMake" -cp -ap CMakeLists.txt "$D/myx-cmake-$V" -cp -ap *.cmake lib backports "$D/myx-cmake-$V/MyxCMake" -pushd "$D" -tar Jcf "myx-cmake_${V}.orig.tar.xz" "myx-cmake-$V" -popd - -cp -ap debian "$D/myx-cmake-$V" -pushd "$D/myx-cmake-$V" -dch -D unstable -v "${V}-1" -m "New version." -dpkg-buildpackage -us -uc -popd - -rm -rf "$D/myx-cmake-$V" - -tar acf "$D/myx-cmake-$V.tar.xz" lib backports *.cmake diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 891ad2c..8ec1faa 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -project(myx-cmake VERSION 1.99.88 LANGUAGES) +project(myx-cmake VERSION 1.99.90 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 4c5e2a3..f2974d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (1.99.88) unstable; urgency=medium +myx-cmake (1.99.90) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index cc3e291..85079a7 100644 --- a/myx_setup.cmake +++ b/myx_setup.cmake @@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) endif() if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 1.99.88 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 1.99.90 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.88 REQUIRED) + find_package(MyxCMake 1.99.90 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) diff --git a/upload_release.sh b/upload_release.sh index a3d05a7..cffb634 100755 --- a/upload_release.sh +++ b/upload_release.sh @@ -3,11 +3,14 @@ set -e V=$(cat VERSION) -D=build +D="$(pwd)/build" git commit -a git tag $V git push --tags git tag -d $V git push --all -tea r c --repo cmake/myx -t $V --tag $V -a build/myx-cmake-$V.tar.xz +tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake-local-${V}.tar.xz" +tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake_${V}.dsc" +tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake_${V}.tar.xz" +tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake_${V}_all.deb"