aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/buildsteps/android/configure-depends2
-rw-r--r--tools/buildsteps/android/make-depends4
-rw-r--r--tools/buildsteps/android/prepare-depends4
-rw-r--r--tools/buildsteps/androidx86/configure-depends2
-rw-r--r--tools/buildsteps/androidx86/make-depends4
-rw-r--r--tools/buildsteps/androidx86/prepare-depends4
-rwxr-xr-xtools/buildsteps/atv2/configure-depends2
-rwxr-xr-xtools/buildsteps/atv2/make-depends4
-rwxr-xr-xtools/buildsteps/atv2/prepare-depends4
-rw-r--r--tools/buildsteps/defaultenv25
-rwxr-xr-xtools/buildsteps/ios/configure-depends2
-rwxr-xr-xtools/buildsteps/ios/make-depends4
-rwxr-xr-xtools/buildsteps/ios/prepare-depends4
-rwxr-xr-xtools/buildsteps/linux32/configure-depends2
-rwxr-xr-xtools/buildsteps/linux32/make-depends4
-rwxr-xr-xtools/buildsteps/linux32/prepare-depends4
-rwxr-xr-xtools/buildsteps/linux64/configure-depends2
-rwxr-xr-xtools/buildsteps/linux64/make-depends4
-rwxr-xr-xtools/buildsteps/linux64/prepare-depends4
-rwxr-xr-xtools/buildsteps/osx32/configure-depends2
-rwxr-xr-xtools/buildsteps/osx32/make-depends4
-rwxr-xr-xtools/buildsteps/osx32/prepare-depends4
-rwxr-xr-xtools/buildsteps/osx64/configure-depends2
-rwxr-xr-xtools/buildsteps/osx64/make-depends4
-rwxr-xr-xtools/buildsteps/osx64/prepare-depends4
-rwxr-xr-xtools/buildsteps/rbpi/configure-depends2
-rwxr-xr-xtools/buildsteps/rbpi/make-depends4
-rwxr-xr-xtools/buildsteps/rbpi/prepare-depends4
28 files changed, 65 insertions, 50 deletions
diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends
index 0847e50389..8d9bcced41 100644
--- a/tools/buildsteps/android/configure-depends
+++ b/tools/buildsteps/android/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=android
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-tarballs=$TARBALLS \
diff --git a/tools/buildsteps/android/make-depends b/tools/buildsteps/android/make-depends
index 2deb44a7cb..2d5509e7ac 100644
--- a/tools/buildsteps/android/make-depends
+++ b/tools/buildsteps/android/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=android
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/android/prepare-depends b/tools/buildsteps/android/prepare-depends
index a923c8dc04..babe7e4d63 100644
--- a/tools/buildsteps/android/prepare-depends
+++ b/tools/buildsteps/android/prepare-depends
@@ -3,9 +3,9 @@ XBMC_PLATFORM_DIR=android
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/androidx86/configure-depends b/tools/buildsteps/androidx86/configure-depends
index 42134550c6..9fc2ad876f 100644
--- a/tools/buildsteps/androidx86/configure-depends
+++ b/tools/buildsteps/androidx86/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=android
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-tarballs=$TARBALLS \
diff --git a/tools/buildsteps/androidx86/make-depends b/tools/buildsteps/androidx86/make-depends
index 2deb44a7cb..2d5509e7ac 100644
--- a/tools/buildsteps/androidx86/make-depends
+++ b/tools/buildsteps/androidx86/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=android
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/androidx86/prepare-depends b/tools/buildsteps/androidx86/prepare-depends
index a923c8dc04..babe7e4d63 100644
--- a/tools/buildsteps/androidx86/prepare-depends
+++ b/tools/buildsteps/androidx86/prepare-depends
@@ -3,9 +3,9 @@ XBMC_PLATFORM_DIR=android
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/atv2/configure-depends b/tools/buildsteps/atv2/configure-depends
index f7b998b397..2c9aa26b4e 100755
--- a/tools/buildsteps/atv2/configure-depends
+++ b/tools/buildsteps/atv2/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=atv2
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-tarballs=/Users/Shared/xbmc-depends/tarballs \
diff --git a/tools/buildsteps/atv2/make-depends b/tools/buildsteps/atv2/make-depends
index a633bb621a..68b5e4de7f 100755
--- a/tools/buildsteps/atv2/make-depends
+++ b/tools/buildsteps/atv2/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=atv2
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/atv2/prepare-depends b/tools/buildsteps/atv2/prepare-depends
index 9dd4f2de1e..3224fcf5ad 100755
--- a/tools/buildsteps/atv2/prepare-depends
+++ b/tools/buildsteps/atv2/prepare-depends
@@ -4,9 +4,9 @@ XBMC_PLATFORM_DIR=atv2
#clean without depends for skipping depends build if possible
#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv
index d709f986a1..76ebb84a52 100644
--- a/tools/buildsteps/defaultenv
+++ b/tools/buildsteps/defaultenv
@@ -100,7 +100,7 @@ function pathChanged ()
checkPath="$1"
if [ -e $checkPath/$PATH_CHANGE_REV_FILENAME ]
then
- if [ "$(cat $checkPath/$PATH_CHANGE_REV_FILENAME)" != "$(getBuildHash $WORKSPACE/tools/depends)" ]
+ if [ "$(cat $checkPath/$PATH_CHANGE_REV_FILENAME)" != "$(getBuildHash $checkPath)" ]
then
ret="1"
fi
@@ -111,11 +111,26 @@ function pathChanged ()
echo $ret
}
-function tagSuccessFulBuild ()
+function rebuildDepends ()
{
- local checkPath
- checkPath="$1"
- echo "$(getBuildHash $checkPath)" > $checkPath/$PATH_CHANGE_REV_FILENAME
+ local ret
+ ret="0"
+ # check if depends need to be rebuilt - this is done by checking last
+ # successfull build revision of depends and cmake dir
+ if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] || [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+ then
+ ret="1"
+ fi
+
+ echo $ret
+}
+
+function tagSuccessFulDependsBuild ()
+{
+ # tag last successful build of depends by marking the revisions of depends and cmake dir
+ # needs to match the checks in function rebuildDepends
+ echo "$(getBuildHash $WORKSPACE/tools/depends)" > $WORKSPACE/tools/depends/$PATH_CHANGE_REV_FILENAME
+ echo "$(getBuildHash $WORKSPACE/project/cmake)" > $WORKSPACE/project/cmake/$PATH_CHANGE_REV_FILENAME
}
function getBranchName ()
diff --git a/tools/buildsteps/ios/configure-depends b/tools/buildsteps/ios/configure-depends
index d09f0cb269..998f80a354 100755
--- a/tools/buildsteps/ios/configure-depends
+++ b/tools/buildsteps/ios/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=ios
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-tarballs=/Users/Shared/xbmc-depends/tarballs \
diff --git a/tools/buildsteps/ios/make-depends b/tools/buildsteps/ios/make-depends
index d1e52dd43f..ce3bdf6bc3 100755
--- a/tools/buildsteps/ios/make-depends
+++ b/tools/buildsteps/ios/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=ios
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/ios/prepare-depends b/tools/buildsteps/ios/prepare-depends
index 12dae4d09d..ff83e1213d 100755
--- a/tools/buildsteps/ios/prepare-depends
+++ b/tools/buildsteps/ios/prepare-depends
@@ -4,9 +4,9 @@ XBMC_PLATFORM_DIR=ios
#clean without depends for skipping depends build if possible
#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/linux32/configure-depends b/tools/buildsteps/linux32/configure-depends
index 4e143d6992..9382b9514e 100755
--- a/tools/buildsteps/linux32/configure-depends
+++ b/tools/buildsteps/linux32/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=linux32
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=i686-linux-gnu --with-tarballs=$TARBALLS
diff --git a/tools/buildsteps/linux32/make-depends b/tools/buildsteps/linux32/make-depends
index 73e21a6ada..b7f1320260 100755
--- a/tools/buildsteps/linux32/make-depends
+++ b/tools/buildsteps/linux32/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=linux32
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/linux32/prepare-depends b/tools/buildsteps/linux32/prepare-depends
index 0678e4c114..13df413142 100755
--- a/tools/buildsteps/linux32/prepare-depends
+++ b/tools/buildsteps/linux32/prepare-depends
@@ -3,9 +3,9 @@ XBMC_PLATFORM_DIR=linux32
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/linux64/configure-depends b/tools/buildsteps/linux64/configure-depends
index 44edac1431..80e990b427 100755
--- a/tools/buildsteps/linux64/configure-depends
+++ b/tools/buildsteps/linux64/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=linux64
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-tarballs=$TARBALLS
diff --git a/tools/buildsteps/linux64/make-depends b/tools/buildsteps/linux64/make-depends
index 1c27c13b29..ef58af723f 100755
--- a/tools/buildsteps/linux64/make-depends
+++ b/tools/buildsteps/linux64/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=linux64
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/linux64/prepare-depends b/tools/buildsteps/linux64/prepare-depends
index bc10fbae25..31fde7a0f5 100755
--- a/tools/buildsteps/linux64/prepare-depends
+++ b/tools/buildsteps/linux64/prepare-depends
@@ -3,9 +3,9 @@ XBMC_PLATFORM_DIR=linux64
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/osx32/configure-depends b/tools/buildsteps/osx32/configure-depends
index 3ccfc3553c..b475a1db8a 100755
--- a/tools/buildsteps/osx32/configure-depends
+++ b/tools/buildsteps/osx32/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=osx32
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-tarballs=/Users/Shared/xbmc-depends/tarballs \
diff --git a/tools/buildsteps/osx32/make-depends b/tools/buildsteps/osx32/make-depends
index e4d4d3030d..ecddc6dcde 100755
--- a/tools/buildsteps/osx32/make-depends
+++ b/tools/buildsteps/osx32/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=osx32
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/osx32/prepare-depends b/tools/buildsteps/osx32/prepare-depends
index d2acf7efda..2e356226f0 100755
--- a/tools/buildsteps/osx32/prepare-depends
+++ b/tools/buildsteps/osx32/prepare-depends
@@ -4,9 +4,9 @@ XBMC_PLATFORM_DIR=osx32
#clean without depends for skipping depends build if possible
#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/osx64/configure-depends b/tools/buildsteps/osx64/configure-depends
index 62f97700b3..840643c33f 100755
--- a/tools/buildsteps/osx64/configure-depends
+++ b/tools/buildsteps/osx64/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=osx64
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-tarballs=/Users/Shared/xbmc-depends/tarballs \
diff --git a/tools/buildsteps/osx64/make-depends b/tools/buildsteps/osx64/make-depends
index 11a62bf470..6749356afc 100755
--- a/tools/buildsteps/osx64/make-depends
+++ b/tools/buildsteps/osx64/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=osx64
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/osx64/prepare-depends b/tools/buildsteps/osx64/prepare-depends
index 87e78fd1f3..03b10ea823 100755
--- a/tools/buildsteps/osx64/prepare-depends
+++ b/tools/buildsteps/osx64/prepare-depends
@@ -4,9 +4,9 @@ XBMC_PLATFORM_DIR=osx64
#clean without depends for skipping depends build if possible
#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" -e "addons/pvr.*" -e "addons/audioencoder.*"
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd
diff --git a/tools/buildsteps/rbpi/configure-depends b/tools/buildsteps/rbpi/configure-depends
index 556469f359..96c75e1f9e 100755
--- a/tools/buildsteps/rbpi/configure-depends
+++ b/tools/buildsteps/rbpi/configure-depends
@@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=rbpi
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
cd $WORKSPACE/tools/depends;
diff --git a/tools/buildsteps/rbpi/make-depends b/tools/buildsteps/rbpi/make-depends
index 07c26dadb7..4eb47575b7 100755
--- a/tools/buildsteps/rbpi/make-depends
+++ b/tools/buildsteps/rbpi/make-depends
@@ -2,8 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=rbpi
. $WORKSPACE/tools/buildsteps/defaultenv
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulDependsBuild
fi
diff --git a/tools/buildsteps/rbpi/prepare-depends b/tools/buildsteps/rbpi/prepare-depends
index 615e3b26e1..c084909dfa 100755
--- a/tools/buildsteps/rbpi/prepare-depends
+++ b/tools/buildsteps/rbpi/prepare-depends
@@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=rbpi
. $WORKSPACE/tools/buildsteps/defaultenv
#clean without depends for skipping depends build if possible
-cd $WORKSPACE;git clean -xfd -e "tools/depends"
+cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends"
if [ -d $JENKINS_RBPI_DEVENV/firmware ]
then
@@ -12,7 +12,7 @@ else
cd $JENKINS_RBPI_DEVENV;git clone git://github.com/raspberrypi/firmware.git --depth=1 -b master
fi
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
+if [ "$(rebuildDepends)" == "1" ]
then
#clean up the rest too
cd $WORKSPACE;git clean -xffd