From a8a35fab2edfdd2846e64252b59a98b1dd9688db Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Wed, 31 Jan 2018 10:03:41 +0100
Subject: [PATCH] runastyle.bat: Adapt functionality from bash script (#1068)

Add astyle version check.
Changed "test/cfg/*.cpp" sources to "test/cfg/*.c*" to match C files
also.
Use a variable for the program name.
---
 runastyle.bat | 58 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/runastyle.bat b/runastyle.bat
index 4e8245240..2274bde67 100644
--- a/runastyle.bat
+++ b/runastyle.bat
@@ -1,21 +1,47 @@
 @REM Script to run AStyle on the sources
+@REM The version check in this script is used to avoid commit battles
+@REM between different developers that use different astyle versions as
+@REM different versions might have different output (this has happened in
+@REM the past).
+
+@REM If project management wishes to take a newer astyle version into use
+@REM just change this string to match the start of astyle version string.
+set ASTYLE_VERSION="Artistic Style Version 3.0.1"
+set ASTYLE="astyle"
+
+set DETECTED_VERSION=""
+for /f "tokens=*" %%i in ('%ASTYLE% --version') do set DETECTED_VERSION=%%i
+echo %DETECTED_VERSION% | findstr /b /c:%ASTYLE_VERSION% > nul && (
+    echo "%DETECTED_VERSION%" matches %ASTYLE_VERSION%
+) || (
+    echo You should use: %ASTYLE_VERSION%
+    echo Detected: "%DETECTED_VERSION%"
+    goto EXIT_ERROR
+)
 
 @SET STYLE=--style=kr --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0
 @SET OPTIONS=--pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines --attach-classes --attach-namespaces
 
-astyle %STYLE% %OPTIONS% cli/*.cpp
-astyle %STYLE% %OPTIONS% cli/*.h
-astyle %STYLE% %OPTIONS% democlient/*.cpp
-astyle %STYLE% %OPTIONS% gui/*.cpp
-astyle %STYLE% %OPTIONS% gui/*.h
-astyle %STYLE% %OPTIONS% -r gui/test/*.cpp
-astyle %STYLE% %OPTIONS% -r gui/test/*.h
-astyle %STYLE% %OPTIONS% lib/*.cpp
-astyle %STYLE% %OPTIONS% lib/*.h
-astyle %STYLE% %OPTIONS% test/*.cpp
-astyle %STYLE% %OPTIONS% test/cfg/*.cpp
-astyle %STYLE% %OPTIONS% test/*.h
-astyle %STYLE% %OPTIONS% -r tools/*.cpp
-astyle %STYLE% %OPTIONS% -r tools/*.h
-astyle %STYLE% %OPTIONS% -r samples/*.c
-astyle %STYLE% %OPTIONS% -r samples/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% cli/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% cli/*.h
+%ASTYLE% %STYLE% %OPTIONS% democlient/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% gui/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% gui/*.h
+%ASTYLE% %STYLE% %OPTIONS% -r gui/test/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% -r gui/test/*.h
+%ASTYLE% %STYLE% %OPTIONS% lib/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% lib/*.h
+%ASTYLE% %STYLE% %OPTIONS% test/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% test/cfg/*.c*
+%ASTYLE% %STYLE% %OPTIONS% test/*.h
+
+%ASTYLE% %STYLE% %OPTIONS% -r tools/*.cpp
+%ASTYLE% %STYLE% %OPTIONS% -r tools/*.h
+
+%ASTYLE% %STYLE% %OPTIONS% -r samples/*.c
+%ASTYLE% %STYLE% %OPTIONS% -r samples/*.cpp
+
+goto :EOF
+
+:EXIT_ERROR
+exit /b 1