From f780fb813ae7420b6ee94cc7de48e66a00ec5508 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 14 Apr 2020 10:56:46 +0200
Subject: [PATCH] use latest tag for all except master
---
CMakeModules/prepare_version_tag.cmake | 15 +++++----------
docs/doxygen/CMakeLists.txt | 6 +++---
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/CMakeModules/prepare_version_tag.cmake b/CMakeModules/prepare_version_tag.cmake
index 1855b7d6f..4a29f6bbf 100644
--- a/CMakeModules/prepare_version_tag.cmake
+++ b/CMakeModules/prepare_version_tag.cmake
@@ -1,4 +1,4 @@
-execute_process(COMMAND git describe --tags --dirty
+execute_process(COMMAND git describe --tags --abbrev=0
OUTPUT_VARIABLE VERSION
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
string(STRIP ${VERSION} VERSION)
@@ -8,17 +8,12 @@ execute_process(COMMAND git rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
string(STRIP ${BRANCH} BRANCH)
-if (${BRANCH} STREQUAL "develop")
+if (${BRANCH} STREQUAL "master")
SET (ASAPO_VERSION ${BRANCH}.${VERSION})
else()
SET (ASAPO_VERSION ${BRANCH}.latest)
endif()
-execute_process(COMMAND git describe --tags --abbrev=0
- OUTPUT_VARIABLE ASAPO_VERSION_TAG
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-string(STRIP ${ASAPO_VERSION_TAG} ASAPO_VERSION_TAG)
-
execute_process(COMMAND git rev-parse --short HEAD
OUTPUT_VARIABLE VERSION_COMMIT
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
@@ -39,10 +34,10 @@ endif()
-if (${BRANCH} STREQUAL "develop")
- SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION_TAG}.${BRANCH}.${VERSION_COMMIT})
+if (${BRANCH} STREQUAL "master")
+ SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION})
else()
- SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION_TAG}.${BRANCH}.latest)
+ SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION}.${BRANCH}.latest)
endif()
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
index 52fbc17f8..60f04d6bd 100644
--- a/docs/doxygen/CMakeLists.txt
+++ b/docs/doxygen/CMakeLists.txt
@@ -6,19 +6,19 @@ if(DOXYGEN_EXECUTABLE)
add_custom_target(
docs-cpp-producer
COMMAND
- PROJECT_NUMBER=${ASAPO_VERSION_TAG}-${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
+ PROJECT_NUMBER=${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
WORKING_DIRECTORY producer
)
add_custom_target(
docs-cpp-consumer
COMMAND
- PROJECT_NUMBER=${ASAPO_VERSION_TAG}-${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
+ PROJECT_NUMBER=${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
WORKING_DIRECTORY consumer
)
add_custom_target(
docs-cpp ALL
COMMAND
- PROJECT_NUMBER=${ASAPO_VERSION_TAG}-${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
+ PROJECT_NUMBER=${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
)
add_dependencies(docs-cpp docs-cpp-producer docs-cpp-consumer)
else()
--
GitLab