From 51056adee8df6aae09912b9da42126c437cff3b1 Mon Sep 17 00:00:00 2001 From: Justin Schuh Date: Fri, 13 Aug 2021 11:04:02 -0700 Subject: [PATCH] build_win: Don't delete preferences on clean build --- build_win.bat | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build_win.bat b/build_win.bat index 600d6d6e6..e00f8dbd4 100644 --- a/build_win.bat +++ b/build_win.bat @@ -159,7 +159,7 @@ 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%" +IF "%PS_STEPS_DIRTY%" EQU "" CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs cd deps\build || GOTO :END cmake.exe .. -DDESTDIR="%PS_DESTDIR%" || GOTO :END (echo %PS_DESTDIR%)> "%PS_DEPS_PATH_FILE%" @@ -171,7 +171,7 @@ REM Build app :BUILD_APP SET EXIT_STATUS=4 SET PS_CURRENT_STEP=app -IF "%PS_STEPS_DIRTY%" EQU "" CALL :MAKE_OR_CLEAN_DIRECTORY build "%PS_CUSTOM_RUN_FILE%" +IF "%PS_STEPS_DIRTY%" EQU "" CALL :MAKE_OR_CLEAN_DIRECTORY build "%PS_CUSTOM_RUN_FILE%" .vs cd build || GOTO :END REM Make sure we have a custom batch file skeleton for the run stage set PS_CUSTOM_BAT=%PS_CUSTOM_RUN_FILE% @@ -262,8 +262,11 @@ REM Functions and stubs start here. :RESOLVE_DESTDIR_CACHE @REM Resolves all DESTDIR cache values and sets PS_STEPS_DEFAULT -@REM Note: This just sets global variableq, so it doesn't use setlocal. -SET PS_DEPS_PATH_FILE_FOR_CONFIG=%~dp0build\%PS_ARCH%\%PS_CONFIG%\%PS_DEPS_PATH_FILE_NAME% +@REM Note: This just sets global variables, so it doesn't use setlocal. +SET PS_DEPS_PATH_FILE_FOR_CONFIG=%~dp0build\.vs\%PS_ARCH%\%PS_CONFIG%\%PS_DEPS_PATH_FILE_NAME% +mkdir "%~dp0build\.vs\%PS_ARCH%\%PS_CONFIG%" > nul 2> nul +REM Copy a legacy file if we don't have one in the proper location. +echo f|xcopy /D "%~dp0build\%PS_ARCH%\%PS_CONFIG%\%PS_DEPS_PATH_FILE_NAME%" "%PS_DEPS_PATH_FILE_FOR_CONFIG%" CALL :CANONICALIZE_PATH PS_DEPS_PATH_FILE_FOR_CONFIG IF EXIST "%PS_DEPS_PATH_FILE_FOR_CONFIG%" ( FOR /F "tokens=* USEBACKQ" %%I IN ("%PS_DEPS_PATH_FILE_FOR_CONFIG%") DO (