From ee8a9d8d508b9baf9cde16d2dab9618c7134aefa Mon Sep 17 00:00:00 2001 From: Justin Schuh Date: Tue, 9 Nov 2021 05:44:28 -0800 Subject: [PATCH] build_win.bat: Updates to better handle deps changes (#7268) * build_win.bat: Fix run bug for deps only build * build_win.bat: Purge destir before a clean deps build --- build_win.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build_win.bat b/build_win.bat index c03ebf039..a5af27609 100644 --- a/build_win.bat +++ b/build_win.bat @@ -160,7 +160,10 @@ REM Build deps :BUILD_DEPS SET EXIT_STATUS=3 SET PS_CURRENT_STEP=deps -IF "%PS_STEPS_DIRTY%" EQU "" CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs +IF "%PS_STEPS_DIRTY%" EQU "" ( + CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs + CALL :MAKE_OR_CLEAN_DIRECTORY "%PS_DESTDIR%" +) cd deps\build || GOTO :END cmake.exe .. -DDESTDIR="%PS_DESTDIR%" IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" ( @@ -203,8 +206,8 @@ IF "%PS_CURRENT_STEP%" NEQ "arguments" ( ) SET EXIT_STATUS=5 SET PS_CURRENT_STEP=run -cd src\%PS_CONFIG% || GOTO :END IF "%PS_RUN%" EQU "none" GOTO :PROLOGUE +cd src\%PS_CONFIG% || GOTO :END SET PS_PROJECT_IS_OPEN= FOR /F "tokens=2 delims=," %%I in ( 'tasklist /V /FI "IMAGENAME eq devenv.exe " /NH /FO CSV ^| find "%PS_SOLUTION_NAME%"'