aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2013-03-28 20:15:59 +0100
committerMemphiz <memphis@machzwo.de>2013-03-28 20:15:59 +0100
commit7c2ffd8d8c8519a66d2f0ffb2bcf9d38d6d1b986 (patch)
tree5c5f6f003ef8e84ea5ca1eda0a36d12c400024bd /tools
parent465dd9369868980fae409db1c35a5ff4c4c03c8e (diff)
[jenkins] - don't clean the pvr addons in first place - when skipping depends build they wouldn't get reinstalled and we would ship without them
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildsteps/atv2/prepare-depends3
-rwxr-xr-xtools/buildsteps/ios/prepare-depends3
-rwxr-xr-xtools/buildsteps/osx32/prepare-depends3
-rwxr-xr-xtools/buildsteps/osx64/prepare-depends3
4 files changed, 8 insertions, 4 deletions
diff --git a/tools/buildsteps/atv2/prepare-depends b/tools/buildsteps/atv2/prepare-depends
index dad9176ea2..133dee826d 100755
--- a/tools/buildsteps/atv2/prepare-depends
+++ b/tools/buildsteps/atv2/prepare-depends
@@ -3,7 +3,8 @@ XBMC_PLATFORM_DIR=atv2
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+#also skip pvraddons as long as they are deployed in tree
+cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*"
if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
then
diff --git a/tools/buildsteps/ios/prepare-depends b/tools/buildsteps/ios/prepare-depends
index 04c1cb1119..3d2eef33af 100755
--- a/tools/buildsteps/ios/prepare-depends
+++ b/tools/buildsteps/ios/prepare-depends
@@ -3,7 +3,8 @@ XBMC_PLATFORM_DIR=ios
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+#also skip pvraddons as long as they are deployed in tree
+cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*"
if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
then
diff --git a/tools/buildsteps/osx32/prepare-depends b/tools/buildsteps/osx32/prepare-depends
index 94afa213bd..e3661ccde1 100755
--- a/tools/buildsteps/osx32/prepare-depends
+++ b/tools/buildsteps/osx32/prepare-depends
@@ -3,7 +3,8 @@ XBMC_PLATFORM_DIR=osx32
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+#also skip pvraddons as long as they are deployed in tree
+cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*"
if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
then
diff --git a/tools/buildsteps/osx64/prepare-depends b/tools/buildsteps/osx64/prepare-depends
index 8fed8fd084..81403fadda 100755
--- a/tools/buildsteps/osx64/prepare-depends
+++ b/tools/buildsteps/osx64/prepare-depends
@@ -3,7 +3,8 @@ XBMC_PLATFORM_DIR=osx64
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+#also skip pvraddons as long as they are deployed in tree
+cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*"
if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
then