[Bf-blender-cvs] [65aebd0c11f] master: GNUmakefile: move clang format utility

Campbell Barton noreply at git.blender.org
Tue Apr 16 16:50:03 CEST 2019


Commit: 65aebd0c11f9fd820b4dda34c7053ed7a138bcb1
Author: Campbell Barton
Date:   Tue Apr 16 16:47:05 2019 +0200
Branches: master
https://developer.blender.org/rB65aebd0c11f9fd820b4dda34c7053ed7a138bcb1

GNUmakefile: move clang format utility

Makes more sense to place in 'utils_maintenance'.

===================================================================

M	GNUmakefile
M	build_files/windows/format.cmd

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index 5a835baf10a..b85e69a2cac 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -517,7 +517,7 @@ update: .FORCE
 
 format: .FORCE
 	PATH="../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
-		python3 source/tools/utils/clang_format_paths.py --expand-tabs $(PATHS)
+		python3 source/tools/utils_maintenance/clang_format_paths.py --expand-tabs $(PATHS)
 
 
 # -----------------------------------------------------------------------------
diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd
index b33ebdcbe5d..820263507fe 100644
--- a/build_files/windows/format.cmd
+++ b/build_files/windows/format.cmd
@@ -1,6 +1,6 @@
 REM TODO(sergey): Switch to Python from libraries when available.
 set PYTHON="python.exe"
-set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils\clang_format_paths.py
+set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py
 
 REM The formatting script expects clang-format to be in the current PATH.
 set PATH=%BUILD_VS_LIBDIR%\llvm\bin;%PATH%



More information about the Bf-blender-cvs mailing list