1.99.94
This commit is contained in:
parent
38b8da8bf5
commit
28b208ae6f
14
Makefile
14
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
|
||||
|
@ -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()
|
||||
|
@ -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()
|
||||
|
2
debian/CMakeLists.txt
vendored
2
debian/CMakeLists.txt
vendored
@ -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
|
||||
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
||||
myx-cmake (1.99.93) unstable; urgency=medium
|
||||
myx-cmake (1.99.94) unstable; urgency=medium
|
||||
|
||||
* New version.
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user