From 5e769ceba5b2bd6536cad3ef7156bef965f83821 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Mon, 11 Aug 2014 00:01:03 +0200 Subject: - for ios, droid-arm, droid-x86 rm and init/fetch the touched skin submodule (as jenkins just fails to do it right) --- tools/buildsteps/android/prepare-xbmc | 4 +++- tools/buildsteps/androidx86/prepare-xbmc | 4 +++- tools/buildsteps/ios/prepare-xbmc | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc index 020bc03022..7b40e6fb63 100644 --- a/tools/buildsteps/android/prepare-xbmc +++ b/tools/buildsteps/android/prepare-xbmc @@ -2,4 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -#nothing on android +#fetch submodules +rm -r $WORKSPACE/addons/skin.touched +git submodule update --init $WORKSPACE/addons/skin.touched \ No newline at end of file diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc index 020bc03022..76b6b0f53d 100644 --- a/tools/buildsteps/androidx86/prepare-xbmc +++ b/tools/buildsteps/androidx86/prepare-xbmc @@ -2,4 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -#nothing on android +#fetch submodules +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..6ef04b33ef 100755 --- a/tools/buildsteps/ios/prepare-xbmc +++ b/tools/buildsteps/ios/prepare-xbmc @@ -2,5 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/defaultenv -#nothing on ios - +#fetch submodules +rm -r $WORKSPACE/addons/skin.touched +git submodule update --init $WORKSPACE/addons/skin.touched -- cgit v1.2.3 From 6feddf7034a84dae2e631e9fda1b8b1073f6871c Mon Sep 17 00:00:00 2001 From: Karlson2k Date: Tue, 12 Aug 2014 01:48:33 +0400 Subject: for win32 rm and init/fetch the touched skin submodule (as jenkins just fails to do it right) --- tools/buildsteps/win32/prepare-env.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From 24c7c841ca45baacfd4cb30ecc9128854c641845 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Thu, 14 Aug 2014 23:41:15 +0200 Subject: [jenkins] - change to workspace before trying to checkout the submodule - might fix the latest jenkins issues --- tools/buildsteps/android/prepare-xbmc | 3 ++- tools/buildsteps/androidx86/prepare-xbmc | 1 + tools/buildsteps/ios/prepare-xbmc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc index 7b40e6fb63..e83b22aad4 100644 --- a/tools/buildsteps/android/prepare-xbmc +++ b/tools/buildsteps/android/prepare-xbmc @@ -3,5 +3,6 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv #fetch submodules +cd $WORKSPACE rm -r $WORKSPACE/addons/skin.touched -git submodule update --init $WORKSPACE/addons/skin.touched \ No newline at end of file +git submodule update --init $WORKSPACE/addons/skin.touched diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc index 76b6b0f53d..e83b22aad4 100644 --- a/tools/buildsteps/androidx86/prepare-xbmc +++ b/tools/buildsteps/androidx86/prepare-xbmc @@ -3,5 +3,6 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv #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 6ef04b33ef..2f2503b437 100755 --- a/tools/buildsteps/ios/prepare-xbmc +++ b/tools/buildsteps/ios/prepare-xbmc @@ -3,5 +3,6 @@ XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/defaultenv #fetch submodules +cd $WORKSPACE rm -r $WORKSPACE/addons/skin.touched git submodule update --init $WORKSPACE/addons/skin.touched -- cgit v1.2.3