From 28b208ae6f884e1985b95daa3e8e8fa56d0bd52f Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 5 Oct 2022 15:04:56 +0300 Subject: [PATCH] 1.99.94 --- Makefile | 14 +++++++++----- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- README.md | 4 ++-- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- upload_release.sh | 17 ----------------- 8 files changed, 17 insertions(+), 30 deletions(-) delete mode 100755 upload_release.sh diff --git a/Makefile b/Makefile index 852864b..652b7d8 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,12 @@ pack: cp -ap $(TOP_DIR)/myx_setup.cmake $(PACK_DIR) cd $(PACK_DIR); tar acf $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz * -#cp -ap *.cmake lib backports "$D/myx-cmake-$V/MyxCMake" -#pushd "$D" -#tar Jcf "myx-cmake_${V}.orig.tar.xz" "myx-cmake-$V" -#popd - +upload: + git tag $(V) + tea r c --repo cmake/myx -t $(V) --tag $(V) \ + -a $(BUILD_DIR)/myx-cmake_$(V).dsc \ + -a $(BUILD_DIR)/myx-cmake_$(V).tar.xz \ + -a $(BUILD_DIR)/myx-cmake_$(V)_all.deb \ + -a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz + git tag -d $(V) + git push diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 403a095..d5c945e 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.93") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.94") 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 72015b5..dc4a8a6 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.93 REQUIRED) + find_package(MyxCMake 1.99.94 REQUIRED) else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.93 REQUIRED) + find_package(MyxCMake 1.99.94 REQUIRED) else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) endif() diff --git a/VERSION b/VERSION index d39a50d..7db3ce6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.99.93 +1.99.94 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 0dfe83b..97a5a02 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.93 LANGUAGES) +project(myx-cmake VERSION 1.99.94 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index f511f20..9dfc6fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (1.99.93) unstable; urgency=medium +myx-cmake (1.99.94) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 06d1aae..447c034 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.93 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 1.99.94 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.93 REQUIRED) + find_package(MyxCMake 1.99.94 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 deleted file mode 100755 index 97fdf8a..0000000 --- a/upload_release.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -e - -V=$(cat VERSION) -D="$(pwd)/build" - -git commit -a -git tag $V -git push --all -tea r c --repo cmake/myx -t $V --tag $V \ - -a "$D"/myx-cmake_${V}.dsc \ - -a "$D"/myx-cmake_${V}.tar.xz \ - -a "$D"/myx-cmake_${V}_all.deb \ - -a "$D"/myx-cmake-local-${V}.tar.xz -git tag -d $V -git pushall