From bf9b6990890c1128b9de89981686d3064acd8b56 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Sat, 16 Sep 2023 10:32:30 -0600 Subject: [PATCH] Fix: make.bat showhash This broke when we moved the submodules around and no one ever noticed This will now list: -The current branch -The current branch hash -Addons branch -Addons branch hash -Libs url -Libs revision -Libs last-changed-date So it'll be a little easier to diagnose what exactly the state of things are when someone asks for help building. --- build_files/windows/show_hashes.cmd | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build_files/windows/show_hashes.cmd b/build_files/windows/show_hashes.cmd index 366864db797..fc702dd39cf 100644 --- a/build_files/windows/show_hashes.cmd +++ b/build_files/windows/show_hashes.cmd @@ -3,10 +3,18 @@ if "%GIT%" == "" ( goto EOF ) cd "%BLENDER_DIR%" +for /f "delims=" %%i in ('"%GIT%" rev-parse --abbrev-ref HEAD') do echo Branch_name=%%i for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Branch_hash=%%i -cd "%BLENDER_DIR%/locale" -for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Locale_hash=%%i cd "%BLENDER_DIR%/scripts/addons" -for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Addons_Hash=%%i +for /f "delims=" %%i in ('"%GIT%" rev-parse --abbrev-ref HEAD') do echo Addons_Branch_name=%%i +for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Addons_Branch_hash=%%i +if "%SVN%" == "" ( + echo SVN not found, cannot library information. + goto EOF +) +set BUILD_VS_LIBDIR=%BLENDER_DIR%..\lib\win64_vc15 +for /f "delims=" %%i in ('"%SVN%" info --show-item=url --no-newline %BUILD_VS_LIBDIR% ') do echo Libs_URL=%%i +for /f "delims=" %%i in ('"%SVN%" info --show-item=revision --no-newline %BUILD_VS_LIBDIR% ') do echo Libs_Revision=%%i +for /f "delims=" %%i in ('"%SVN%" info --show-item=last-changed-date --no-newline %BUILD_VS_LIBDIR% ') do echo Libs_LastChange=%%i cd "%BLENDER_DIR%" :EOF \ No newline at end of file