De-duplicate git version string deduction into one new tool

mike-kfed · Feb 25, 2016 · 7fbddea · 7fbddea
1 parent dc2dfcd
commit 7fbddea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,8 +163,8 @@ else(DEFINED PROJECT_VERSION)
   if(NOT SOURCE_PACKAGE) # i.e., a git checkout
     # this part is setting the corresponding CMake variable which gets used for example when creating a source package
     execute_process(
-      COMMAND git describe --tags --dirty
-      COMMAND sed "s,^release-,,;s,-,+,;s,-,~,;" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PROJECT_VERSION
+      COMMAND ${CMAKE_SOURCE_DIR}/tools/get_git_version_string.sh OUTPUT_STRIP_TRAILING_WHITESPACE
+      OUTPUT_VARIABLE PROJECT_VERSION
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
     generate_version_gen_h()
   else(NOT SOURCE_PACKAGE)

diff --git a/tools/create_version_h.sh b/tools/create_version_h.sh
@@ -7,7 +7,7 @@ NEW_VERSION=$2
 
 VERSION_H_NEEDS_UPDATE=1
 if [ -z "$NEW_VERSION" ]; then
-  NEW_VERSION=`git describe --tags --dirty | sed 's,^release-,,;s,-,+,;s,-,~,;'`
+  NEW_VERSION=`./tools/get_git_version_string.sh`
 fi
 
 if [ -n  "`echo -e $NEW_VERSION | grep  Format`" ]; then

diff --git a/tools/get_git_version_string.sh b/tools/get_git_version_string.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+git describe --tags --dirty | sed 's,^release-,,;s,-,+,;s,-,~,;'