diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-11-18 22:10:42 +0100 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-11-18 22:10:42 +0100 |
| commit | 72038394525efa4413b61c31809e772d2c98dbb9 (patch) | |
| tree | f4d7e38efb236c0ba1cd5584d534b4e06abb934e /project/Win32BuildSetup | |
| parent | bd9cd9a00b4b399ecba72d3184759493c9cae76f (diff) | |
[buildsteps][windows] keep downloaded vcredist
Diffstat (limited to 'project/Win32BuildSetup')
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 2 | ||||
| -rw-r--r-- | project/Win32BuildSetup/getdeploydependencies.bat | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index bd7112865e..6e00f3b542 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -330,7 +330,7 @@ Section "VS2015 C++ re-distributable Package (${TARGET_ARCHITECTURE})" SEC_VCRED DetailPrint "Running VS2015 re-distributable setup..." SectionIn 1 2 #section is in install type Full SetOutPath "$TEMP\vc2015" - File "${app_root}\..\dependencies\vcredist\2015\vcredist_${TARGET_ARCHITECTURE}.exe" + File "${app_root}\..\..\BuildDependencies\downloads\vcredist\2015\vcredist_${TARGET_ARCHITECTURE}.exe" ExecWait '"$TEMP\vc2015\vcredist_${TARGET_ARCHITECTURE}.exe" /install /quiet /norestart' $VSRedistSetupError RMDir /r "$TEMP\vc2015" DetailPrint "Finished VS2015 re-distributable setup" diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat index 728ec8c3db..d4a69de341 100644 --- a/project/Win32BuildSetup/getdeploydependencies.bat +++ b/project/Win32BuildSetup/getdeploydependencies.bat @@ -8,11 +8,11 @@ echo Downloading from mirror %KODI_MIRROR% :: Following commands expect this script's parent directory to be the current directory, so make sure that's so PUSHD %~dp0 -if not exist dependencies\vcredist\2015 mkdir dependencies\vcredist\2015 +if not exist ..\BuildDependencies\downloads\vcredist\2015 mkdir ..\BuildDependencies\downloads\vcredist\2015 -if not exist dependencies\vcredist\2015\vcredist_%TARGET_ARCHITECTURE%.exe ( +if not exist ..\BuildDependencies\downloads\vcredist\2015\vcredist_%TARGET_ARCHITECTURE%.exe ( echo Downloading vc140 redist... - ..\BuildDependencies\bin\wget --tries=5 --retry-connrefused --waitretry=2 -nv -O dependencies\vcredist\2015\vcredist_%TARGET_ARCHITECTURE%.exe %KODI_MIRROR%/build-deps/win32/vcredist/2015/vcredist_%TARGET_ARCHITECTURE%.exe + ..\BuildDependencies\bin\wget --tries=5 --retry-connrefused --waitretry=2 -nv -O ..\BuildDependencies\downloads\vcredist\2015\vcredist_%TARGET_ARCHITECTURE%.exe %KODI_MIRROR%/build-deps/win32/vcredist/2015/vcredist_%TARGET_ARCHITECTURE%.exe ) :: Restore the previous current directory POPD |