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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.bat | 12 | ||||
| -rw-r--r-- | tools/depends/Makefile.include.in | 5 | ||||
| -rwxr-xr-x | tools/rbp/setup-sdk.sh | 7 |
3 files changed, 20 insertions, 4 deletions
diff --git a/tools/buildsteps/win32/make-mingwlibs.bat b/tools/buildsteps/win32/make-mingwlibs.bat index 98930e05ef..cdb63b4c6a 100644 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ b/tools/buildsteps/win32/make-mingwlibs.bat @@ -1,4 +1,6 @@ @ECHO OFF +SETLOCAL + rem batch file to compile mingw libs via BuildSetup SET WORKDIR=%WORKSPACE% rem set M$ env @@ -15,9 +17,13 @@ FOR %%b in (%1, %2, %3) DO ( ) IF "%WORKDIR%"=="" ( - SET WORKDIR=%CD%\..\..\.. + SET WORKDIR=%~dp0\..\..\.. ) +REM Prepend the msys and mingw paths onto %PATH% +SET MSYS_INSTALL_PATH=%WORKDIR%\project\BuildDependencies\msys +SET PATH=%MSYS_INSTALL_PATH%\mingw\bin;%MSYS_INSTALL_PATH%\bin;%PATH% + SET ERRORFILE=%WORKDIR%\project\Win32BuildSetup\errormingw SET BS_DIR=%WORKDIR%\project\Win32BuildSetup @@ -53,4 +59,6 @@ GOTO ENDWITHERROR ECHO failed to build mingw libs EXIT /B 1 ) - EXIT /B 0
\ No newline at end of file + EXIT /B 0 + +ENDLOCAL diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index e1ac05c9af..6e37022544 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -32,7 +32,10 @@ LINK_ICONV=@link_iconv@ ENABLE_GPLV3=@use_gplv3@ HAS_LIBCRYSTAX=@has_libcrystax@ -BASE_URL=http://mirrors.xbmc.org/build-deps/sources +BASE_URL=http://mirrors.kodi.tv/build-deps/sources +ifneq ($(KODI_MIRROR),) +BASE_URL=$(KODI_MIRROR)/build-deps/sources +endif RETRIEVE_TOOL_FLAGS=-Ls --create-dirs -f -O ARCHIVE_TOOL_FLAGS=--strip-components=1 -xf CONFIG_SUB=@prefix@/@tool_dir@/share/automake-1.11/config.sub diff --git a/tools/rbp/setup-sdk.sh b/tools/rbp/setup-sdk.sh index 70f2a36e00..0452e4fe91 100755 --- a/tools/rbp/setup-sdk.sh +++ b/tools/rbp/setup-sdk.sh @@ -28,6 +28,11 @@ else [ -w $(dirname $XBMCPREFIX) ] || SUDO="sudo" fi +if [ -z "$KODI_MIRROR" ] +then + KODI_MIRROR="http://mirrors.kodi.tv" +fi + $SUDO mkdir -p $XBMCPREFIX $SUDO chmod 777 $XBMCPREFIX mkdir -p $XBMCPREFIX/lib @@ -39,7 +44,7 @@ echo "TARGETFS=$TARGETFS" >> $SCRIP echo "TOOLCHAIN=$TOOLCHAIN" >> $SCRIPT_PATH/Makefile.include echo "BUILDROOT=$BUILDROOT" >> $SCRIPT_PATH/Makefile.include echo "USE_BUILDROOT=$USE_BUILDROOT" >> $SCRIPT_PATH/Makefile.include -echo "BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs" >> $SCRIPT_PATH/Makefile.include +echo "BASE_URL=${KODI_MIRROR}/build-deps/darwin-libs" >> $SCRIPT_PATH/Makefile.include echo "TARBALLS_LOCATION=$TARBALLS" >> $SCRIPT_PATH/Makefile.include echo "RETRIEVE_TOOL=/usr/bin/curl" >> $SCRIPT_PATH/Makefile.include echo "RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output \$(TARBALLS_LOCATION)/\$(ARCHIVE)" >> $SCRIPT_PATH/Makefile.include |