From 80c204e421be9e6e53797ffe96230d2747f59a4a Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Mon, 22 Jan 2024 18:44:03 -0800 Subject: Add another msys2 binary to fix game add-on build failures Error was: running git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/BuildDependencies/msys64" -e "project/BuildDependencies/tools" -e "cmake/addons/build/download/msys2-base-*.tar.xz" warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/dirmngr.exe: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-2.0.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-assuan-0.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-ffi-8.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-gcc_s-seh-1.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-gcrypt-20.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-gmp-10.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-gnutls-30.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-gpg-error-0.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-hogweed-6.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-iconv-2.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-idn2-0.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-intl-8.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-ksba-8.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-nettle-8.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-npth-0.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-p11-kit-0.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-tasn1-6.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-unistring-5.dll: Invalid argument warning: failed to remove cmake/addons/build/mingw/src/mingw/usr/bin/msys-z.dll: Invalid argument --- tools/buildsteps/windows/prepare-env.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/buildsteps/windows/prepare-env.bat b/tools/buildsteps/windows/prepare-env.bat index 36625beb99..bcbaded7f9 100644 --- a/tools/buildsteps/windows/prepare-env.bat +++ b/tools/buildsteps/windows/prepare-env.bat @@ -13,7 +13,8 @@ IF EXIST %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 rmdir %WORKSPACE%\proje rem also clean 'build' dir used to build ffmpeg as git clean has trouble to remove some times IF EXIST %WORKSPACE%\project\BuildDependencies\build rmdir %WORKSPACE%\project\BuildDependencies\build /S /Q -rem daemonized gpg-agent blocks mingw from being cleaned with git +rem daemonized executables block mingw from being cleaned with git +TASKKILL /IM "dirmngr.exe" /F >nul 2>&1 TASKKILL /IM "gpg-agent.exe" /F >nul 2>&1 rem we assume git in path as this is a requirement -- cgit v1.2.3