Merge PR #195 into development

* upstream/pr/195/head:
  cmake: make set_version more robust against insufficient python versions
  tools: Decode command output properly.
  build: Don't write site_config.hpp if it hasn't changed.

Signed-off-by: Torbjörn Klatt <[email protected]>

Author: torbjoernk

CMakeLists.txt

@@ -155,8 +155,9 @@ message(STATUS "****************************************************************
 message(STATUS "Configuring sources")
 update_site_config()
 
+find_package(PythonInterp REQUIRED)
 add_custom_target(set_version ALL
-    COMMAND ${pfasst_SOURCE_DIR}/tools/get_pfasst_version.sh
+    COMMAND ${PYTHON_EXECUTABLE} ${pfasst_SOURCE_DIR}/tools/get_pfasst_version.py
     WORKING_DIRECTORY ${pfasst_SOURCE_DIR}
     COMMENT "Updating PFASST++ version number"
     USES_TERMINAL

cmake/site_config.hpp.in

@@ -12,7 +12,7 @@ using namespace std;
 
 namespace pfasst
 {
-  static constexpr const char* VERSION = "pfasst_VERSION";
+  static constexpr const char* VERSION = "@pfasst_VERSION@";
 }  // ::pfasst
 
 #endif  // _PFASST__SITE_CONFIG_HPP

cmake/utility_functions.cmake

@@ -33,6 +33,9 @@ macro(update_site_config)
     if(pfasst_RANDOM_SEED)
         add_definitions(-DPFASST_DEFAULT_RANDOM_SEED)
     endif()
+    execute_process(COMMAND git describe --dirty
+                    OUTPUT_VARIABLE pfasst_VERSION
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
     configure_file(
         "${pfasst_SOURCE_DIR}/cmake/site_config.hpp.in"
         "${CMAKE_CURRENT_SOURCE_DIR}/include/pfasst/site_config.hpp"

tools/get_pfasst_version.py

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+from __future__ import print_function
+
+from sys import version_info
+
+if version_info[0] == 2 and version_info[1] < 7:
+    raise SystemExit("Insufficient Python Interpreter Version (%s < 2.7)" % (version_info,))
+
+import re
+import subprocess
+
+from os.path import dirname, abspath, join
+
+# get git version
+version = subprocess.check_output(['git', 'describe', '--dirty']).decode().strip()
+
+# read in site_config.hpp
+base = dirname(dirname(abspath(__file__)))
+site_config = abspath(join(base, 'include', 'pfasst', 'site_config.hpp'))
+
+with open(site_config, 'r') as f:
+    config = f.read()
+
+# reset version
+new_config = re.sub('VERSION = "[^"]*"', 'VERSION = "{version}"'.format(version=version), config)
+
+# write site_config if it has changed
+if config != new_config:
+    with open(site_config, 'w') as f:
+        f.write(new_config)
+    print("PFASST++ version set to: %s" % (version,))
+else:
+    print("PFASST++ version did not change (still %s)" % (version,))