[jenkins] ac3e91a89a63bcd5c1b892cdec7931a8067f0c68 for other platforms

8 files changed, 40 insertions, 16 deletions

diff --git a/tools/buildsteps/android/make-binary-addons b/tools/buildsteps/android/make-binary-addons
index 71adeb9690..6e46dcc1fe 100644
--- a/tools/buildsteps/android/make-binary-addons
+++ b/tools/buildsteps/android/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=android
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends 
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/androidx86/make-binary-addons b/tools/buildsteps/androidx86/make-binary-addons
index 60a288979f..fa1f446bdb 100644
--- a/tools/buildsteps/androidx86/make-binary-addons
+++ b/tools/buildsteps/androidx86/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=android
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/atv2/make-binary-addons b/tools/buildsteps/atv2/make-binary-addons
index 639c4a2ff2..62c4b8bf99 100755
--- a/tools/buildsteps/atv2/make-binary-addons
+++ b/tools/buildsteps/atv2/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=atv2
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/linux32/make-binary-addons b/tools/buildsteps/linux32/make-binary-addons
index 413fff1c81..baa520dc33 100755
--- a/tools/buildsteps/linux32/make-binary-addons
+++ b/tools/buildsteps/linux32/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=linux32
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/linux64/make-binary-addons b/tools/buildsteps/linux64/make-binary-addons
index c57ee7c19b..0f57b9ad15 100755
--- a/tools/buildsteps/linux64/make-binary-addons
+++ b/tools/buildsteps/linux64/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=linux64
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/osx32/make-binary-addons b/tools/buildsteps/osx32/make-binary-addons
index 8c2d6a54c5..c677cefb93 100755
--- a/tools/buildsteps/osx32/make-binary-addons
+++ b/tools/buildsteps/osx32/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=osx32
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/osx64/make-binary-addons b/tools/buildsteps/osx64/make-binary-addons
index 95a667a7e3..2e0724df6e 100755
--- a/tools/buildsteps/osx64/make-binary-addons
+++ b/tools/buildsteps/osx64/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=osx64
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi
diff --git a/tools/buildsteps/rbpi/make-binary-addons b/tools/buildsteps/rbpi/make-binary-addons
index c7cf4c0e45..604a276652 100755
--- a/tools/buildsteps/rbpi/make-binary-addons
+++ b/tools/buildsteps/rbpi/make-binary-addons
@@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=rbpi
 
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
+#clear the build failed file
+rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons if something in the addons metadata changed
 if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ]
@@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
   tagSuccessFulBuild $WORKSPACE/project/cmake
 else
-  #make jenkins fail
-  exit 1
+  #mark the build failure in the filesystem but leave jenkins running
+  tagFailedBuild $WORKSPACE/project/cmake
 fi