From c13807a7291d159a224a04664078bc8f855da42d Mon Sep 17 00:00:00 2001
From: Memphiz <memphis@machzwo.de>
Date: Thu, 19 Feb 2015 14:36:15 +0100
Subject: [PATCH] [jenkins/addons] - fix error detection during addons build

---
 tools/buildsteps/android/make-binary-addons    | 17 +++++++++--------
 tools/buildsteps/androidx86/make-binary-addons | 17 +++++++++--------
 tools/buildsteps/atv2/make-binary-addons       | 17 +++++++++--------
 tools/buildsteps/ios/make-binary-addons        | 17 +++++++++--------
 tools/buildsteps/linux32/make-binary-addons    | 17 +++++++++--------
 tools/buildsteps/linux64/make-binary-addons    | 17 +++++++++--------
 tools/buildsteps/osx32/make-binary-addons      | 17 +++++++++--------
 tools/buildsteps/osx64/make-binary-addons      | 17 +++++++++--------
 tools/buildsteps/rbpi/make-binary-addons       | 17 +++++++++--------
 9 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/tools/buildsteps/android/make-binary-addons b/tools/buildsteps/android/make-binary-addons
index 0ded6d3273797..71adeb969073b 100644
--- a/tools/buildsteps/android/make-binary-addons
+++ b/tools/buildsteps/android/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=android
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends 
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/androidx86/make-binary-addons b/tools/buildsteps/androidx86/make-binary-addons
index f14a84062d019..60a288979fefc 100644
--- a/tools/buildsteps/androidx86/make-binary-addons
+++ b/tools/buildsteps/androidx86/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=android
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/atv2/make-binary-addons b/tools/buildsteps/atv2/make-binary-addons
index fd95a8729c626..639c4a2ff204a 100755
--- a/tools/buildsteps/atv2/make-binary-addons
+++ b/tools/buildsteps/atv2/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=atv2
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/ios/make-binary-addons b/tools/buildsteps/ios/make-binary-addons
index b811b6d3110b4..f9f84b5873c93 100755
--- a/tools/buildsteps/ios/make-binary-addons
+++ b/tools/buildsteps/ios/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=ios
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/linux32/make-binary-addons b/tools/buildsteps/linux32/make-binary-addons
index f45ca3f9d3df4..413fff1c81f37 100755
--- a/tools/buildsteps/linux32/make-binary-addons
+++ b/tools/buildsteps/linux32/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=linux32
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/linux64/make-binary-addons b/tools/buildsteps/linux64/make-binary-addons
index 7f1cc6d14edd3..c57ee7c19bdeb 100755
--- a/tools/buildsteps/linux64/make-binary-addons
+++ b/tools/buildsteps/linux64/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=linux64
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/osx32/make-binary-addons b/tools/buildsteps/osx32/make-binary-addons
index 2db0850b570d3..8c2d6a54c5de7 100755
--- a/tools/buildsteps/osx32/make-binary-addons
+++ b/tools/buildsteps/osx32/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=osx32
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/osx64/make-binary-addons b/tools/buildsteps/osx64/make-binary-addons
index c7fd4b7cf4246..95a667a7e360d 100755
--- a/tools/buildsteps/osx64/make-binary-addons
+++ b/tools/buildsteps/osx64/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=osx64
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
diff --git a/tools/buildsteps/rbpi/make-binary-addons b/tools/buildsteps/rbpi/make-binary-addons
index 0e42bda5e4e33..c7cf4c0e453c5 100755
--- a/tools/buildsteps/rbpi/make-binary-addons
+++ b/tools/buildsteps/rbpi/make-binary-addons
@@ -4,17 +4,18 @@ XBMC_PLATFORM_DIR=rbpi
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
-for addon in $BINARY_ADDONS
-do
-  ALL_BINARY_ADDONS_BUILT="1"
-  #only build binary addons if something in the addons metadata changed
-  if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
-  then
+ALL_BINARY_ADDONS_BUILT="1"
+#only build binary addons if something in the addons metadata changed
+if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
+then
+  for addon in $BINARY_ADDONS
+  do
     echo "building $addon"
     git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
     cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS || ALL_BINARY_ADDONS_BUILT="0"
-  fi
-done
+  done
+fi
+
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake