From f7500d2bda13f65f912f5f8eb34c4a2fb340e8f2 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 4 Oct 2022 19:30:08 +0300 Subject: [PATCH] 1.99.80 --- MyxCMakeConfigVersion.cmake | 2 +- README.md | 4 ++-- VERSION | 2 +- lib/TargetSetup.cmake | 2 +- upload_release.sh | 13 +++++++++++++ 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100755 upload_release.sh diff --git a/MyxCMakeConfigVersion.cmake b/MyxCMakeConfigVersion.cmake index 0b489c3..729c42c 100644 --- a/MyxCMakeConfigVersion.cmake +++ b/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.78") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.80") 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 f86f0bd..78b9076 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.78 REQUIRED) + find_package(MyxCMake 1.99.80 REQUIRED) else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.78 REQUIRED) + find_package(MyxCMake 1.99.80 REQUIRED) else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) endif() diff --git a/VERSION b/VERSION index 23d0a9a..12593b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.99.78 +1.99.80 diff --git a/lib/TargetSetup.cmake b/lib/TargetSetup.cmake index ae09967..7727ab4 100644 --- a/lib/TargetSetup.cmake +++ b/lib/TargetSetup.cmake @@ -32,7 +32,7 @@ function(myx_target_setup NAME) ${CMAKE_BINARY_DIR}/share # Ссылка на каталог настроек COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc - ${CMAKE_BINARY_DIR}/etc) + ${CMAKE_BINARY_DIR}/etc ) add_dependencies(${NAME} ${NAME}-populate-cmake-binary-dir) endif() diff --git a/upload_release.sh b/upload_release.sh new file mode 100755 index 0000000..a3d05a7 --- /dev/null +++ b/upload_release.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e + +V=$(cat VERSION) +D=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