From c2b2323cf18f721b8500ddaf70028897697136ad Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 19 Mar 2019 15:58:21 +0100
Subject: [PATCH] change version tags for python
---
CMakeModules/prepare_version.cmake | 13 -----------
CMakeModules/prepare_version_tag.cmake | 23 +++++++++++++++++++
.../python/binary_dist_windows/setup.py.in | 2 +-
.../api/python/source_dist_linux/setup.py.in | 2 +-
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/CMakeModules/prepare_version.cmake b/CMakeModules/prepare_version.cmake
index 901ef4c10..e9c41bd0e 100644
--- a/CMakeModules/prepare_version.cmake
+++ b/CMakeModules/prepare_version.cmake
@@ -1,16 +1,3 @@
-execute_process(COMMAND git describe --tags --dirty OUTPUT_VARIABLE VERSION)
-string(STRIP ${VERSION} VERSION)
-
-
-execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE BRANCH)
-string(STRIP ${BRANCH} BRANCH)
-
-if (${BRANCH} STREQUAL "develop")
- SET (ASAPO_VERSION ${BRANCH}.${VERSION})
-else()
- SET (ASAPO_VERSION ${BRANCH}.latest)
-endif()
-
string(TIMESTAMP TIMESTAMP "%H:%M:%S %d.%m.%Y UTC" UTC)
configure_file(${PROJECT_SOURCE_DIR}/common/cpp/include/common/version.h.in ${PROJECT_SOURCE_DIR}/common/cpp/include/common/version.h @ONLY)
diff --git a/CMakeModules/prepare_version_tag.cmake b/CMakeModules/prepare_version_tag.cmake
index 135c67ccf..c389a922c 100644
--- a/CMakeModules/prepare_version_tag.cmake
+++ b/CMakeModules/prepare_version_tag.cmake
@@ -10,3 +10,26 @@ else()
SET (ASAPO_VERSION ${BRANCH}.latest)
endif()
+execute_process(COMMAND git describe --tags --abbrev=0 OUTPUT_VARIABLE VERSION_TAGS)
+string(STRIP ${VERSION_TAGS} VERSION_TAGS)
+
+execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE VERSION_COMMIT)
+string(STRIP ${VERSION_COMMIT} VERSION_COMMIT)
+
+function(cleanup varname)
+ string (REPLACE "-" "_" out ${${varname}})
+ SET( ${varname} ${out} PARENT_SCOPE)
+endfunction()
+
+cleanup(BRANCH)
+
+
+if (${BRANCH} STREQUAL "develop")
+ SET (ASAPO_VERSION_PYTHON ${VERSION_TAGS}.${BRANCH}.${VERSION_COMMIT})
+else()
+ SET (ASAPO_VERSION_PYTHON ${VERSION_TAGS}.${BRANCH}.latest)
+endif()
+
+
+message("Asapo Version: " ${ASAPO_VERSION})
+message("Asapo Version Python: " ${ASAPO_VERSION_PYTHON})
\ No newline at end of file
diff --git a/worker/api/python/binary_dist_windows/setup.py.in b/worker/api/python/binary_dist_windows/setup.py.in
index 6eddd7eb6..cc896317e 100644
--- a/worker/api/python/binary_dist_windows/setup.py.in
+++ b/worker/api/python/binary_dist_windows/setup.py.in
@@ -2,7 +2,7 @@ import setuptools
setuptools.setup(
name ="asapo_worker",
- version = "@ASAPO_VERSION@",
+ version = "@ASAPO_VERSION_PYTHON@",
install_requires=['numpy'],
include_package_data=True,
packages=['asapo_worker'],
diff --git a/worker/api/python/source_dist_linux/setup.py.in b/worker/api/python/source_dist_linux/setup.py.in
index 0739c8ae8..90af3e669 100644
--- a/worker/api/python/source_dist_linux/setup.py.in
+++ b/worker/api/python/source_dist_linux/setup.py.in
@@ -15,7 +15,7 @@ ext_modules = [
setup(
name ="asapo_worker",
ext_modules = ext_modules,
- version = "@ASAPO_VERSION@",
+ version = "@ASAPO_VERSION_PYTHON@",
setup_requires=["numpy"],
install_requires=["numpy"]
)
--
GitLab