Switch to Versioneer.py for version string generation (kotekan#664)

Sets the `kotekan` version using `versioneer`. Closes kotekan#663.

Co-authored-by: Rick Nitsche <[email protected]>

lib/version/make_version.cmake.in

@@ -45,12 +45,26 @@ execute_process(
 )
 
 execute_process(
-  COMMAND python3 ${SOURCE_DIR}/python/kotekan/version.py
+  COMMAND python ${SOURCE_DIR}/python/print_kotekan_version.py
   WORKING_DIRECTORY ${SOURCE_DIR}
   OUTPUT_VARIABLE KOTEKAN_VERSION
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+execute_process(
+  COMMAND git rev-parse --abbrev-ref HEAD
+  WORKING_DIRECTORY ${SOURCE_DIR}
+  OUTPUT_VARIABLE KOTEKAN_BRANCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Remove branch name if we are on master
+if (${KOTEKAN_BRANCH} MATCHES "master")
+    set(FULL_KOTEKAN_VERSION "${KOTEKAN_VERSION}")
+else()
+    set(FULL_KOTEKAN_VERSION "${KOTEKAN_BRANCH}.${KOTEKAN_VERSION}")
+endif()
+
 configure_file(
     ${CURRENT_SOURCE_DIR}/version.c.in
     ${CURRENT_BINARY_DIR}/version.c

lib/version/version.c.in

@@ -3,7 +3,7 @@
 
 #include "version.h"
 
-char * __kotekan_version = "@KOTEKAN_VERSION@";
+char * __kotekan_version = "@FULL_KOTEKAN_VERSION@";
 
 char * __git_branch = "@GIT_BRANCH@";
 

lib/version/version.h

@@ -16,7 +16,7 @@ extern "C" {
 
 /**
  * @brief Get the kotekan version string
- * See python/kotekan/version.py to see how this is generated
+ * The version is generated using versioneer, see python/_version.py
  * This version is updated every time make is called
  *
  * @return The kotekan version string

python/.gitattributes

@@ -0,0 +1 @@
+_version.py export-subst