From 506a1943d10adbcff3ee6159015c6c98724e46c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <mr.harrylp@gmail.com>
Date: Thu, 10 Oct 2019 09:36:32 +0200
Subject: [PATCH] Update clang-format to newer version (8)

The old one is not easily accessible in current distros.
---
 etc/scripts/check_format.py | 14 ++++++++------
 style-format.cmake          |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/etc/scripts/check_format.py b/etc/scripts/check_format.py
index b2a06769..a8c32a6e 100644
--- a/etc/scripts/check_format.py
+++ b/etc/scripts/check_format.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
 Check involves applying clang-format and checking format of test designs
 documentation comments located above test fixture macros.
 
-Requires clang-format in version 3.9 installed on the system.
+Requires clang-format in version 8 installed in the system.
 """
 
 import sys
@@ -49,6 +49,7 @@
 DESIGN_EXTENSIONS = ('.cc',)
 CPP_EXTENSIONS = ('.c', '.cc', '.cpp', '.h', '.tpp', '.hpp')
 CLANG_FORMAT_BIN = ''
+REQUIRED_VERSION = str(8)
 
 
 def format_file(filepath):
@@ -129,19 +130,20 @@ def check_prerequisites():
 
     CLANG_FORMAT_BIN = find_clang_format()
     if not CLANG_FORMAT_BIN:
-        sys.exit('No clang-format in version 3.9 found.')
+        sys.exit('No clang-format in version ' + REQUIRED_VERSION + ' found.')
 
 
 def find_clang_format():
     """Find clang-format binary with appropriate version on system."""
 
     returncode, out = check_utils.run('clang-format --version', shell=True)
-    if returncode == 0 and b'version 3.9' in out:
+    if returncode == 0 and 'version ' + REQUIRED_VERSION in str(out):
         return 'clang-format'
 
-    returncode, _ = check_utils.run('clang-format-3.9 --version', shell=True)
+    alternative_binary = 'clang-format-' + REQUIRED_VERSION
+    returncode, _ = check_utils.run(alternative_binary + ' --version', shell=True)
     if returncode == 0:
-        return 'clang-format-3.9'
+        return alternative_binary
 
     return ''
 
diff --git a/style-format.cmake b/style-format.cmake
index 192c3805..f11d8f00 100644
--- a/style-format.cmake
+++ b/style-format.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/scripts/che
 		ERROR_QUIET)
 
 if ("${PREREQUISITES_CHECK_ERROR}" GREATER "0")
-	message(WARNING "code-format.py prerequisites check failed - code style and formatting is disabled\nclang-format 3.9 is required")
+	message(WARNING "code-format.py prerequisites check failed - code style and formatting is disabled. clang-format 8 is required")
 	return()
 endif ()