diff options
| author | Ryan Saunders <saunders@aggienetwork.com> | 2015-03-28 21:32:36 -0700 |
|---|---|---|
| committer | Ryan Saunders <saunders@aggienetwork.com> | 2015-06-08 17:07:11 -0700 |
| commit | c1778dd65690c24eab2cc4d6b661ce77723fae12 (patch) | |
| tree | 1949c41c6336b066af2130679e5db776b0db85ce /project/Win32BuildSetup | |
| parent | cdd0feeda8898730ce1ebc78420b2583daf5f6b6 (diff) | |
Improve Win32 build/download scripts. This change adds support for
a KODI_MIRROR environment variable which, if set, overrides the
default mirror URL of http://mirrors.kodi.tv. In the event that a
package download fails, DownloadBuildDeps.bat will now suggest that
the user manually choose an alternate mirror and re-run.
Also, this change improves the download scripts in several ways.
get_formed.cmd now reports failed package downloads at the end,
and DownloadBuildDeps.bat, DownloadMingwBuildEnv.bat and
make-mingwlibs.bat all support being run from an arbitrary directory
(e.g., c:\kodi> project\BuildDependencies\DownloadBuildDeps.bat).
Diffstat (limited to 'project/Win32BuildSetup')
| -rw-r--r-- | project/Win32BuildSetup/getdeploydependencies.bat | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat index 5a0e4a6f39..7828d3ef00 100644 --- a/project/Win32BuildSetup/getdeploydependencies.bat +++ b/project/Win32BuildSetup/getdeploydependencies.bat @@ -1,24 +1,35 @@ @echo off +REM If KODI_MIRROR is not set externally to this script, set it to the default mirror URL +IF "%KODI_MIRROR%" == "" SET KODI_MIRROR=http://mirrors.kodi.tv +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\2008 mkdir dependencies\vcredist\2008 if not exist dependencies\vcredist\2010 mkdir dependencies\vcredist\2010 if not exist dependencies\vcredist\2013 mkdir dependencies\vcredist\2013 if not exist dependencies\vcredist\2008\vcredist_x86.exe ( echo Downloading vc90 redist... - ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2008\vcredist_x86.exe http://mirrors.xbmc.org/build-deps/win32/vcredist/2008/vcredist_x86.exe + ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2008\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2008/vcredist_x86.exe ) if not exist dependencies\vcredist\2010\vcredist_x86.exe ( echo Downloading vc100 redist... - ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2010\vcredist_x86.exe http://mirrors.xbmc.org/build-deps/win32/vcredist/2010/vcredist_x86.exe + ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2010\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2010/vcredist_x86.exe ) if not exist dependencies\vcredist\2013\vcredist_x86.exe ( echo Downloading vc120 redist... - ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2013\vcredist_x86.exe http://mirrors.xbmc.org/build-deps/win32/vcredist/2013/vcredist_x86.exe + ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2013\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2013/vcredist_x86.exe ) if not exist dependencies\dxsetup mkdir dependencies\dxsetup for %%f in (DSETUP.dll dsetup32.dll dxdllreg_x86.cab DXSETUP.exe dxupdate.cab Jun2010_D3DCompiler_43_x86.cab Jun2010_d3dx9_43_x86.cab) do ( if not exist dependencies\dxsetup\%%f ( - ..\BuildDependencies\bin\wget -nv -O dependencies\dxsetup\%%f http://mirrors.xbmc.org/build-deps/win32/dxsetup/%%f + ..\BuildDependencies\bin\wget -nv -O dependencies\dxsetup\%%f %KODI_MIRROR%/build-deps/win32/dxsetup/%%f ) ) + +:: Restore the previous current directory +POPD |