aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2014-09-13 20:13:07 +0200
committerMemphiz <memphis@machzwo.de>2014-09-13 20:13:07 +0200
commitb30433dbe099678c6ccce311c7f7382ee373b920 (patch)
tree0968eb4e2a2098b36f76edba5e09bf1f66b85148 /tools
parent6173cab54b2ec9f87a8e6d6a7221383049d9df8e (diff)
[jenkins] - check if skin.touched exists before trying to remove it - fixes build when depends have changed (and removed the dir during git clean phase)
Diffstat (limited to 'tools')
-rw-r--r--tools/buildsteps/android/prepare-xbmc3
-rw-r--r--tools/buildsteps/androidx86/prepare-xbmc3
-rwxr-xr-xtools/buildsteps/ios/prepare-xbmc3
3 files changed, 9 insertions, 0 deletions
diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc
index ef58229fe9..3a82e5c600 100644
--- a/tools/buildsteps/android/prepare-xbmc
+++ b/tools/buildsteps/android/prepare-xbmc
@@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=android
#fetch submodules
cd $WORKSPACE
+if test -d $WORKSPACE/addons/skin.re-touched
+then
rm -r $WORKSPACE/addons/skin.re-touched
+fi
git submodule update --init $WORKSPACE/addons/skin.re-touched
diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc
index ef58229fe9..3a82e5c600 100644
--- a/tools/buildsteps/androidx86/prepare-xbmc
+++ b/tools/buildsteps/androidx86/prepare-xbmc
@@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=android
#fetch submodules
cd $WORKSPACE
+if test -d $WORKSPACE/addons/skin.re-touched
+then
rm -r $WORKSPACE/addons/skin.re-touched
+fi
git submodule update --init $WORKSPACE/addons/skin.re-touched
diff --git a/tools/buildsteps/ios/prepare-xbmc b/tools/buildsteps/ios/prepare-xbmc
index 7e359aaea2..1b93c2bdb7 100755
--- a/tools/buildsteps/ios/prepare-xbmc
+++ b/tools/buildsteps/ios/prepare-xbmc
@@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=ios
#fetch submodules
cd $WORKSPACE
+if test -d $WORKSPACE/addons/skin.re-touched
+then
rm -r $WORKSPACE/addons/skin.re-touched
+fi
git submodule update --init $WORKSPACE/addons/skin.re-touched