1.99.90
This commit is contained in:
parent
a061ebb7a9
commit
11fede41d7
@ -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)
|
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
else()
|
else()
|
||||||
|
@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
|
|||||||
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
||||||
endif()
|
endif()
|
||||||
if(DEFINED ENV{MYX_CMAKE_DIR})
|
if(DEFINED ENV{MYX_CMAKE_DIR})
|
||||||
find_package(MyxCMake 1.99.86 REQUIRED)
|
find_package(MyxCMake 1.99.90 REQUIRED)
|
||||||
else()
|
else()
|
||||||
if(MYX_CMAKE_USE_SYSTEM)
|
if(MYX_CMAKE_USE_SYSTEM)
|
||||||
find_package(MyxCMake 1.99.86 REQUIRED)
|
find_package(MyxCMake 1.99.90 REQUIRED)
|
||||||
else()
|
else()
|
||||||
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
||||||
endif()
|
endif()
|
||||||
|
@ -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
|
|
2
debian/CMakeLists.txt
vendored
2
debian/CMakeLists.txt
vendored
@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
|
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)
|
include(GNUInstallDirs)
|
||||||
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
|
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
|
||||||
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
|||||||
myx-cmake (1.99.88) unstable; urgency=medium
|
myx-cmake (1.99.90) unstable; urgency=medium
|
||||||
|
|
||||||
* New version.
|
* New version.
|
||||||
|
|
||||||
|
@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR)
|
|||||||
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
||||||
endif()
|
endif()
|
||||||
if(DEFINED ENV{MYX_CMAKE_DIR})
|
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} ===")
|
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
|
||||||
else()
|
else()
|
||||||
if(MYX_CMAKE_USE_SYSTEM)
|
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} ===")
|
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
|
||||||
else()
|
else()
|
||||||
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
||||||
|
@ -3,11 +3,14 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
V=$(cat VERSION)
|
V=$(cat VERSION)
|
||||||
D=build
|
D="$(pwd)/build"
|
||||||
|
|
||||||
git commit -a
|
git commit -a
|
||||||
git tag $V
|
git tag $V
|
||||||
git push --tags
|
git push --tags
|
||||||
git tag -d $V
|
git tag -d $V
|
||||||
git push --all
|
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"
|
||||||
|
Loading…
Reference in New Issue
Block a user