aboutsummaryrefslogtreecommitdiff
path: root/tools/buildsteps/atv2
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2014-11-20 14:09:44 +0100
committerMemphiz <memphis@machzwo.de>2014-11-20 15:15:08 +0100
commitf6d7b1d51e3959b7f9d5003b5f24902120e6d7df (patch)
treec2a2f733322306988d0cfda82a0a9050ee5fa589 /tools/buildsteps/atv2
parent327f4a3f9e66992f8d5d1300ed68d1021da2057e (diff)
[jenkins] - refactor jenkins scripts to centralise the decision for
rebuilding depends - add project/cmake dir as criterion
Diffstat (limited to 'tools/buildsteps/atv2')
-rwxr-xr-xtools/buildsteps/atv2/configure-depends2
-rwxr-xr-xtools/buildsteps/atv2/make-depends4
-rwxr-xr-xtools/buildsteps/atv2/prepare-depends4
3 files changed, 5 insertions, 5 deletions
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