From 6e6f2c0b49b69a75e59ffac3581bce4a393c892a Mon Sep 17 00:00:00 2001
From: Memphiz <memphis@machzwo.de>
Date: Wed, 25 Mar 2015 20:45:24 +0100
Subject: [jenkins] - prevent cleanout of native tools when pathChanged returns
 1 in make-native-depends (due to Configuration set to RELEASE)

---
 tools/buildsteps/osx32/make-native-depends | 2 +-
 tools/buildsteps/osx32/prepare-xbmc        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools/buildsteps/osx32')

diff --git a/tools/buildsteps/osx32/make-native-depends b/tools/buildsteps/osx32/make-native-depends
index 6bdbc6665e..7c0a3f4487 100755
--- a/tools/buildsteps/osx32/make-native-depends
+++ b/tools/buildsteps/osx32/make-native-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 [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] && [ "$BINARY_ADDONS_CLEAN_NATIVETOOLS" != "0" ]
 then
   git clean -xffd $WORKSPACE/tools/depends/native
   cd $WORKSPACE/tools/depends/native;make -j $BUILDTHREADS && tagSuccessFulBuild $WORKSPACE/tools/depends
diff --git a/tools/buildsteps/osx32/prepare-xbmc b/tools/buildsteps/osx32/prepare-xbmc
index 59431ddb17..eb1f30bbff 100755
--- a/tools/buildsteps/osx32/prepare-xbmc
+++ b/tools/buildsteps/osx32/prepare-xbmc
@@ -3,4 +3,7 @@ XBMC_PLATFORM_DIR=osx32
 . $WORKSPACE/tools/buildsteps/defaultenv
 
 #build binary addons before building xbmc...
+#make sure that binary_addons don't clean the native tools
+#here (e.x. on release builds where pathChanged always returns 1
+BINARY_ADDONS_CLEAN_NATIVETOOLS="0"
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-binary-addons
-- 
cgit v1.2.3