From fb4ec706cdf8d56c8b18f43100c5a6ae7fcdb607 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 5 Jun 2019 07:30:45 -0600 Subject: make.bat: Support optional paths for `make format` make.bat now supports optional parameters to restrict the formatting to a specific folder. Multiple paths may be given example: make.bat format source/blender/blenkernel source/blender/gpu --- build_files/windows/format.cmd | 2 +- build_files/windows/parse_arguments.cmd | 2 ++ build_files/windows/show_help.cmd | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index 04610944e16..9dd6f1fc83b 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -20,6 +20,6 @@ set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths REM The formatting script expects clang-format to be in the current PATH. set PATH=%CF_PATH%;%PATH% -%PYTHON% %FORMAT_PATHS% +%PYTHON% %FORMAT_PATHS% %FORMAT_ARGS% :EOF diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 0f87f8787c4..8c8b473dbcf 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -93,6 +93,8 @@ if NOT "%1" == "" ( set VERBOSE=1 ) else if "%1" == "format" ( set FORMAT=1 + set FORMAT_ARGS=%2 %3 %4 %5 %6 %7 %8 %9 + goto EOF ) else ( echo Command "%1" unknown, aborting! exit /b 1 diff --git a/build_files/windows/show_help.cmd b/build_files/windows/show_help.cmd index 5ac59939eec..08a6c40731c 100644 --- a/build_files/windows/show_help.cmd +++ b/build_files/windows/show_help.cmd @@ -13,6 +13,7 @@ echo - update ^(Update both SVN and GIT^) echo - code_update ^(Update only GIT^) echo - nobuild ^(only generate project files^) echo - showhash ^(Show git hashes of source tree^) +echo - format [path] ^(Format the source using clang-format, path is optional, requires python 3.x to be available^) echo. echo Configuration options echo - verbose ^(enable diagnostic output during configuration^) -- cgit v1.2.3