diff --git a/fetch-deps.bat b/fetch-deps.bat index 63737914137d367327c948a0bc4e3d120f1ddaa9..7a23abbadfc5c60a24773e85f5e86d9d82fed18d 100644 --- a/fetch-deps.bat +++ b/fetch-deps.bat @@ -6,25 +6,35 @@ if "%1" == "/c" ( set cloneSubmodules=Y ) +set WGET_CMD=wget --no-check-certificate --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=4 set APPLY_CMD=git apply --reject --ignore-whitespace --whitespace=fix -if exist "winsparkle" ( +if exist winsparkle ( rmdir winsparkle /s /q ) -git clone --depth=1 https://github.com/vslavik/winsparkle.git +git clone https://github.com/vslavik/winsparkle.git cd winsparkle git checkout 6e7bb8554852d7f964fd176c440dd29cc772f2dc %APPLY_CMD% ..\winsparkle.patch if "%cloneSubmodules%" neq "N" ( - git submodule init - git submodule update --depth=1 + cd 3rdparty + + call :getTarballDepToFolder https://github.com/libexpat/libexpat 97c6bd01990090d4015364ae37dd141f3c39a30f expat + call :getTarballDepToFolder https://github.com/openssl/openssl e5bba24cd8bb3e5127a578b85c6edf013a38ea6d openssl + call :getTarballDepToFolder https://github.com/wxWidgets/wxWidgets 08ea09c7fee69984c75e51ea8ee90ef075f06e90 wxWidgets + + cd wxWidgets\3rdparty + call :getTarballDepToFolder https://github.com/wxWidgets/Catch 011f6e6458d888246f94643e293f002073cff489 catch + cd ..\.. + + cd .. ) cd .. -if exist "qrencode-win32" ( +if exist qrencode-win32 ( rmdir qrencode-win32 /s /q ) -git clone --depth=1 https://github.com/BlueDragon747/qrencode-win32.git +git clone https://github.com/BlueDragon747/qrencode-win32.git cd qrencode-win32 git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce %APPLY_CMD% ..\qrencode-win32.patch @@ -32,4 +42,17 @@ git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce :cleanup endlocal @endlocal -exit /B %ERRORLEVEL% \ No newline at end of file +exit /B %ERRORLEVEL% + +:getTarballDepToFolder +%WGET_CMD% %1/archive/%2.tar.gz +7z -y x %2.tar.gz && 7z -y x %2.tar +del %2.tar && del %2.tar.gz && del pax_global_header +if exist %3 ( + rmdir %3 /s /q +) +if exist %3-%2 ( + rename %3-%2 %3 +) else ( + rename lib%3-%2 %3 +) \ No newline at end of file