3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build_win.bat: Updates to better handle deps changes (#7268)

Browse Source 
* build_win.bat: Fix run bug for deps only build

* build_win.bat: Purge destir before a clean deps build
This commit is contained in:
Justin Schuh 2021-11-09 05:44:28 -08:00 committed by GitHub
parent 99e9cea9ad
commit ee8a9d8d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_win.bat
View File

@ -160,7 +160,10 @@ REM Build deps
:BUILD_DEPS :BUILD_DEPS
SET EXIT_STATUS=3 SET EXIT_STATUS=3
SET PS_CURRENT_STEP=deps 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 cd deps\build || GOTO :END
cmake.exe .. -DDESTDIR="%PS_DESTDIR%" cmake.exe .. -DDESTDIR="%PS_DESTDIR%"
IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" ( IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" (
@ -203,8 +206,8 @@ IF "%PS_CURRENT_STEP%" NEQ "arguments" (
) )
SET EXIT_STATUS=5 SET EXIT_STATUS=5
SET PS_CURRENT_STEP=run SET PS_CURRENT_STEP=run
cd src\%PS_CONFIG% || GOTO :END
IF "%PS_RUN%" EQU "none" GOTO :PROLOGUE IF "%PS_RUN%" EQU "none" GOTO :PROLOGUE
cd src\%PS_CONFIG% || GOTO :END
SET PS_PROJECT_IS_OPEN= SET PS_PROJECT_IS_OPEN=
FOR /F "tokens=2 delims=," %%I in ( FOR /F "tokens=2 delims=," %%I in (
'tasklist /V /FI "IMAGENAME eq devenv.exe " /NH /FO CSV ^| find "%PS_SOLUTION_NAME%"' 'tasklist /V /FI "IMAGENAME eq devenv.exe " /NH /FO CSV ^| find "%PS_SOLUTION_NAME%"'