From 7c2ffd8d8c8519a66d2f0ffb2bcf9d38d6d1b986 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Thu, 28 Mar 2013 20:15:59 +0100 Subject: [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 --- tools/buildsteps/atv2/prepare-depends | 3 ++- tools/buildsteps/ios/prepare-depends | 3 ++- tools/buildsteps/osx32/prepare-depends | 3 ++- tools/buildsteps/osx64/prepare-depends | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3