[Bf-blender-cvs] [36e82b77593] master: make.bat: Fix `make showhashes` not working.

Ray Molenkamp noreply at git.blender.org
Sat Jun 16 20:29:59 CEST 2018


Commit: 36e82b775933c511bb3f4dac9f3d572bf6fe0672
Author: Ray Molenkamp
Date:   Sat Jun 16 12:29:38 2018 -0600
Branches: master
https://developer.blender.org/rB36e82b775933c511bb3f4dac9f3d572bf6fe0672

make.bat: Fix `make showhashes` not working.

broke in recent refactor.

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

M	build_files/windows/show_hashes.cmd
M	make.bat

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

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



More information about the Bf-blender-cvs mailing list