diff options
| author | Memphiz <memphis@machzwo.de> | 2014-11-20 14:09:44 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-11-20 15:15:08 +0100 |
| commit | f6d7b1d51e3959b7f9d5003b5f24902120e6d7df (patch) | |
| tree | c2a2f733322306988d0cfda82a0a9050ee5fa589 /tools/buildsteps/osx64 | |
| parent | 327f4a3f9e66992f8d5d1300ed68d1021da2057e (diff) | |
[jenkins] - refactor jenkins scripts to centralise the decision for
rebuilding depends - add project/cmake dir as criterion
Diffstat (limited to 'tools/buildsteps/osx64')
| -rwxr-xr-x | tools/buildsteps/osx64/configure-depends | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/osx64/make-depends | 4 | ||||
| -rwxr-xr-x | tools/buildsteps/osx64/prepare-depends | 4 |
3 files changed, 5 insertions, 5 deletions
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 |