diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2017-08-03 10:42:05 +0300 |
|---|---|---|
| committer | Kacper Michajłow <kasper93@gmail.com> | 2017-08-14 00:00:41 +0300 |
| commit | 82adfbdb6af6c4c0fb7cccf4f9afba511ce862e2 (patch) | |
| tree | 69ad00ea5abf228d242e71710287d718e6b3e08f /contrib | |
| parent | 1fda105e3b9e5e6c8d2e5254701a8b3761f335ff (diff) | |
Update to astyle 3.0.1.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pre-commit.sh | 4 | ||||
| -rwxr-xr-x | contrib/run_astyle.bat | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/contrib/pre-commit.sh b/contrib/pre-commit.sh index 3236810f6..6bdba7217 100644 --- a/contrib/pre-commit.sh +++ b/contrib/pre-commit.sh @@ -1,5 +1,5 @@ #!/bin/bash -# (C) 2013-2015 see Authors.txt +# (C) 2013-2015, 2017 see Authors.txt # # This file is part of MPC-HC. # @@ -39,7 +39,7 @@ versioncheck_version=6 versioncheck_path=contrib/pre-commit.sh astyle_config=contrib/astyle.ini astyle_extensions=(cpp h) -astyle_version='Artistic Style Version 2.05.1' +astyle_version='Artistic Style Version 3.0.1' checkyear_extensions=(bat cpp h hlsl iss po py sh) checkyear_pattern1='\(C\) (([0-9][0-9][0-9][0-9]-)?[0-9][0-9][0-9][0-9](, )?)+ see Authors.txt' year=$(date +%Y) diff --git a/contrib/run_astyle.bat b/contrib/run_astyle.bat index 08e4b05d5..f36e24cd6 100755 --- a/contrib/run_astyle.bat +++ b/contrib/run_astyle.bat @@ -1,5 +1,5 @@ @ECHO OFF -REM (C) 2012-2016 see Authors.txt +REM (C) 2012-2017 see Authors.txt REM REM This file is part of MPC-HC. REM @@ -21,8 +21,8 @@ SETLOCAL SET "FILE_DIR=%~dp0" PUSHD "%FILE_DIR%" -SET "AStyleVerReq=2.05.1" -astyle --version 2>NUL || (ECHO. & ECHO ERROR: AStyle not found & GOTO End) +SET "AStyleVerReq=3.0.1" +astyle --ascii --version 2>NUL || (ECHO. & ECHO ERROR: AStyle not found & GOTO End) CALL :SubCheckVer || GOTO End @@ -30,10 +30,10 @@ CALL :SubCheckVer || GOTO End TITLE Running astyle using %FILE_DIR%astyle.ini IF "%~1" == "" ( - astyle -r --options=astyle.ini ..\*.cpp - astyle -r --options=astyle.ini --keep-one-line-blocks ..\*.h + astyle --ascii -r --options=astyle.ini ..\*.cpp + astyle --ascii -r --options=astyle.ini --keep-one-line-blocks ..\*.h ) ELSE ( - FOR %%G IN (%*) DO astyle --options=astyle.ini %%G + FOR %%G IN (%*) DO astyle --ascii --options=astyle.ini %%G ) IF %ERRORLEVEL% NEQ 0 ECHO. & ECHO ERROR: Something went wrong! @@ -49,7 +49,7 @@ EXIT /B :SubCheckVer TITLE Checking astyle version -FOR /F "tokens=4 delims= " %%A IN ('astyle --version 2^>^&1 NUL') DO ( +FOR /F "tokens=4 delims= " %%A IN ('astyle --ascii --version 2^>^&1 NUL') DO ( SET "AStyleVer=%%A" ) |