diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-08-17 15:18:47 +0200 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-08-17 15:18:47 +0200 |
| commit | 9edc975926e075801e511b1f24124fe23b05ee55 (patch) | |
| tree | 1b405e1562ed03624c0a301cf0f29f5a2ed33c67 | |
| parent | f2ddaae00a4fca0b71452cb9123890dc24126311 (diff) | |
| parent | 24c7c841ca45baacfd4cb30ecc9128854c641845 (diff) | |
Merge pull request #5232 from MartijnKaijser/gotham_submodulefix
Gotham submodulefix
| -rw-r--r-- | tools/buildsteps/android/prepare-xbmc | 5 | ||||
| -rw-r--r-- | tools/buildsteps/androidx86/prepare-xbmc | 5 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/prepare-xbmc | 6 | ||||
| -rw-r--r-- | tools/buildsteps/win32/prepare-env.bat | 6 |
4 files changed, 17 insertions, 5 deletions
diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc index 020bc03022..e83b22aad4 100644 --- a/tools/buildsteps/android/prepare-xbmc +++ b/tools/buildsteps/android/prepare-xbmc @@ -2,4 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -#nothing on android +#fetch submodules +cd $WORKSPACE +rm -r $WORKSPACE/addons/skin.touched +git submodule update --init $WORKSPACE/addons/skin.touched diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc index 020bc03022..e83b22aad4 100644 --- a/tools/buildsteps/androidx86/prepare-xbmc +++ b/tools/buildsteps/androidx86/prepare-xbmc @@ -2,4 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -#nothing on android +#fetch submodules +cd $WORKSPACE +rm -r $WORKSPACE/addons/skin.touched +git submodule update --init $WORKSPACE/addons/skin.touched diff --git a/tools/buildsteps/ios/prepare-xbmc b/tools/buildsteps/ios/prepare-xbmc index 4b75e9158a..2f2503b437 100755 --- a/tools/buildsteps/ios/prepare-xbmc +++ b/tools/buildsteps/ios/prepare-xbmc @@ -2,5 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/defaultenv -#nothing on ios - +#fetch submodules +cd $WORKSPACE +rm -r $WORKSPACE/addons/skin.touched +git submodule update --init $WORKSPACE/addons/skin.touched diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat index 0e3b5ff0ba..d95fda56d7 100644 --- a/tools/buildsteps/win32/prepare-env.bat +++ b/tools/buildsteps/win32/prepare-env.bat @@ -22,4 +22,8 @@ IF EXIST %WORKSPACE%\project\BuildDependencies\msys rmdir %WORKSPACE%\project\Bu IF EXIST %WORKSPACE%\project\VS2010Express\XBMC rmdir %WORKSPACE%\project\VS2010Express\XBMC /S /Q IF EXIST %WORKSPACE%\project\VS2010Express\objs rmdir %WORKSPACE%\project\VS2010Express\objs /S /Q -IF EXIST %WORKSPACE%\project\VS2010Express\libs rmdir %WORKSPACE%\project\VS2010Express\libs /S /Q
\ No newline at end of file +IF EXIST %WORKSPACE%\project\VS2010Express\libs rmdir %WORKSPACE%\project\VS2010Express\libs /S /Q + +rem fetch submodules +IF EXIST "%WORKSPACE%\addons\skin.touched" rmdir "%WORKSPACE%\addons\skin.touched" /S /Q || exit /b 10 +git submodule update --init "%WORKSPACE%\addons\skin.touched" || exit /b 30 |