From 36e82b775933c511bb3f4dac9f3d572bf6fe0672 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Sat, 16 Jun 2018 12:29:38 -0600 Subject: [PATCH] make.bat: Fix `make showhashes` not working. broke in recent refactor. --- build_files/windows/show_hashes.cmd | 6 +++--- make.bat | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build_files/windows/show_hashes.cmd b/build_files/windows/show_hashes.cmd index ff036733946..441e5bcabf2 100644 --- a/build_files/windows/show_hashes.cmd +++ b/build_files/windows/show_hashes.cmd @@ -3,10 +3,10 @@ if "%GIT%" == "" ( goto EOF ) cd "%BLENDER_DIR%" -for /f "delims=" %%i in ('%GIT% rev-parse HEAD') do echo Branch_hash=%%i +for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Branch_hash=%%i cd "%BLENDER_DIR%/release/datafiles/locale" -for /f "delims=" %%i in ('%GIT% rev-parse HEAD') do echo Locale_hash=%%i +for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Locale_hash=%%i cd "%BLENDER_DIR%/release/scripts/addons" -for /f "delims=" %%i in ('%GIT% rev-parse HEAD') do echo Addons_Hash=%%i +for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Addons_Hash=%%i cd "%BLENDER_DIR%" :EOF \ No newline at end of file diff --git a/make.bat b/make.bat index 577f820438b..18e861f8fdb 100644 --- a/make.bat +++ b/make.bat @@ -16,6 +16,11 @@ if errorlevel 1 goto EOF call "%BLENDER_DIR%\build_files\windows\find_dependencies.cmd" if errorlevel 1 goto EOF +if "%BUILD_SHOW_HASHES%" == "1" ( + call "%BLENDER_DIR%\build_files\windows\show_hashes.cmd" + goto EOF +) + if "%SHOW_HELP%" == "1" ( call "%BLENDER_DIR%\build_files\windows\show_help.cmd" goto EOF