From 691584da1bd615ae1626335ea63feb87a5292c20 Mon Sep 17 00:00:00 2001 From: Jesse Yurkovich Date: Tue, 6 Feb 2024 21:12:15 +0100 Subject: [PATCH] Windows: Enhance our debug batch files This makes a change to the debug scripts to make it easier for both users and those tending to the issue tracker by setting Blender's temporary directory location to the debug logs location The is necessary because while the debug output and the system information file go to %temp%\blender\debug_logs, the crash text file does not. We then have to spend additional time asking the user to go fetch it from the other location. Now the crash file ends up in the same place. Pull Request: https://projects.blender.org/blender/blender/pulls/116882 --- release/windows/batch/blender_debug_gpu.cmd | 10 +++++++--- .../batch/blender_debug_gpu_glitchworkaround.cmd | 10 +++++++--- release/windows/batch/blender_debug_log.cmd | 10 +++++++--- release/windows/batch/blender_factory_startup.cmd | 10 +++++++--- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/release/windows/batch/blender_debug_gpu.cmd b/release/windows/batch/blender_debug_gpu.cmd index 9e78af4f578..174d1f6e112 100644 --- a/release/windows/batch/blender_debug_gpu.cmd +++ b/release/windows/batch/blender_debug_gpu.cmd @@ -8,9 +8,13 @@ echo by dragging them into the text area of your bug report, please include both echo blender_debug_output.txt and blender_system_info.txt in your report. echo. pause -mkdir "%temp%\blender\debug_logs" > NUL 2>&1 echo. echo Starting blender and waiting for it to exit.... +setlocal + set PYTHONPATH= -"%~dp0\blender" --debug --debug-gpu --debug-cycles --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 -explorer "%temp%\blender\debug_logs" \ No newline at end of file +set DEBUGLOGS="%temp%\blender\debug_logs" +mkdir "%DEBUGLOGS%" > NUL 2>&1 + +"%~dp0\blender" --debug --debug-gpu --debug-cycles --python-expr "import bpy; bpy.context.preferences.filepaths.temporary_directory=r'%DEBUGLOGS%'; bpy.ops.wm.sysinfo(filepath=r'%DEBUGLOGS%\blender_system_info.txt')" > "%DEBUGLOGS%\blender_debug_output.txt" 2>&1 < %0 +explorer "%DEBUGLOGS%" diff --git a/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd b/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd index 4c4fff465f0..7e69c638279 100644 --- a/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd +++ b/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd @@ -8,9 +8,13 @@ echo by dragging them into the text area of your bug report, please include both echo blender_debug_output.txt and blender_system_info.txt in your report. echo. pause -mkdir "%temp%\blender\debug_logs" > NUL 2>&1 echo. echo Starting blender and waiting for it to exit.... +setlocal + set PYTHONPATH= -"%~dp0\blender" --debug --debug-gpu --debug-gpu-force-workarounds --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 -explorer "%temp%\blender\debug_logs" \ No newline at end of file +set DEBUGLOGS="%temp%\blender\debug_logs" +mkdir "%DEBUGLOGS%" > NUL 2>&1 + +"%~dp0\blender" --debug --debug-gpu --debug-gpu-force-workarounds --python-expr "import bpy; bpy.context.preferences.filepaths.temporary_directory=r'%DEBUGLOGS%'; bpy.ops.wm.sysinfo(filepath=r'%DEBUGLOGS%\blender_system_info.txt')" > "%DEBUGLOGS%\blender_debug_output.txt" 2>&1 < %0 +explorer "%DEBUGLOGS%" diff --git a/release/windows/batch/blender_debug_log.cmd b/release/windows/batch/blender_debug_log.cmd index 84845f43e5d..2676ef7887f 100644 --- a/release/windows/batch/blender_debug_log.cmd +++ b/release/windows/batch/blender_debug_log.cmd @@ -8,9 +8,13 @@ echo by dragging them into the text area of your bug report, please include both echo blender_debug_output.txt and blender_system_info.txt in your report. echo. pause -mkdir "%temp%\blender\debug_logs" > NUL 2>&1 echo. echo Starting blender and waiting for it to exit.... +setlocal + set PYTHONPATH= -"%~dp0\blender" --debug --debug-cycles --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 -explorer "%temp%\blender\debug_logs" +set DEBUGLOGS="%temp%\blender\debug_logs" +mkdir "%DEBUGLOGS%" > NUL 2>&1 + +"%~dp0\blender" --debug --debug-cycles --python-expr "import bpy; bpy.context.preferences.filepaths.temporary_directory=r'%DEBUGLOGS%'; bpy.ops.wm.sysinfo(filepath=r'%DEBUGLOGS%\blender_system_info.txt')" > "%DEBUGLOGS%\blender_debug_output.txt" 2>&1 < %0 +explorer "%DEBUGLOGS%" diff --git a/release/windows/batch/blender_factory_startup.cmd b/release/windows/batch/blender_factory_startup.cmd index 68646ab5806..32821717064 100644 --- a/release/windows/batch/blender_factory_startup.cmd +++ b/release/windows/batch/blender_factory_startup.cmd @@ -8,9 +8,13 @@ echo by dragging them into the text area of your bug report, please include both echo blender_debug_output.txt and blender_system_info.txt in your report. echo. pause -mkdir "%temp%\blender\debug_logs" > NUL 2>&1 echo. echo Starting blender and waiting for it to exit.... +setlocal + set PYTHONPATH= -"%~dp0\blender" --factory-startup --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 -explorer "%temp%\blender\debug_logs" +set DEBUGLOGS="%temp%\blender\debug_logs" +mkdir "%DEBUGLOGS%" > NUL 2>&1 + +"%~dp0\blender" --factory-startup --python-expr "import bpy; bpy.context.preferences.filepaths.temporary_directory=r'%DEBUGLOGS%'; bpy.ops.wm.sysinfo(filepath=r'%DEBUGLOGS%\blender_system_info.txt')" > "%DEBUGLOGS%\blender_debug_output.txt" 2>&1 < %0 +explorer "%DEBUGLOGS%"