aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2015-11-07 23:04:22 +0100
committerMemphiz <memphis@machzwo.de>2015-11-07 23:04:22 +0100
commit1aefb6f88beea9a500f8c0c615be8982a39c44c9 (patch)
tree0f4539dbc2303dd7a4a921e3915c2879b88b70a5
parente6396dad036c36693e5999bee4042305fc61b850 (diff)
[jenkins] - evaluate new env var "BUILD_BINARY_ADDONS"
-rw-r--r--tools/buildsteps/android/make-binary-addons4
-rw-r--r--tools/buildsteps/androidx86/make-binary-addons4
-rwxr-xr-xtools/buildsteps/ios/make-binary-addons4
-rwxr-xr-xtools/buildsteps/linux64/make-binary-addons4
-rwxr-xr-xtools/buildsteps/osx64/make-binary-addons4
-rwxr-xr-xtools/buildsteps/rbpi/make-binary-addons4
6 files changed, 12 insertions, 12 deletions
diff --git a/tools/buildsteps/android/make-binary-addons b/tools/buildsteps/android/make-binary-addons
index f6bb1e4c9e..a82e0210cd 100644
--- a/tools/buildsteps/android/make-binary-addons
+++ b/tools/buildsteps/android/make-binary-addons
@@ -8,8 +8,8 @@ XBMC_PLATFORM_DIR=android
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" ]
+#only build binary addons when requested by env/jenkins
+if [ "$BUILD_BINARY_ADDONS" == "true" ]
then
for addon in $BINARY_ADDONS
do
diff --git a/tools/buildsteps/androidx86/make-binary-addons b/tools/buildsteps/androidx86/make-binary-addons
index 084c372227..e3e189932a 100644
--- a/tools/buildsteps/androidx86/make-binary-addons
+++ b/tools/buildsteps/androidx86/make-binary-addons
@@ -8,8 +8,8 @@ XBMC_PLATFORM_DIR=android
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" ]
+#only build binary addons when requested by env/jenkins
+if [ "$BUILD_BINARY_ADDONS" == "true" ]
then
for addon in $BINARY_ADDONS
do
diff --git a/tools/buildsteps/ios/make-binary-addons b/tools/buildsteps/ios/make-binary-addons
index ae5cf7a8c8..baf9172cf4 100755
--- a/tools/buildsteps/ios/make-binary-addons
+++ b/tools/buildsteps/ios/make-binary-addons
@@ -8,8 +8,8 @@ XBMC_PLATFORM_DIR=ios
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" ]
+#only build binary addons when requested by env/jenkins
+if [ "$BUILD_BINARY_ADDONS" == "true" ]
then
for addon in $BINARY_ADDONS
do
diff --git a/tools/buildsteps/linux64/make-binary-addons b/tools/buildsteps/linux64/make-binary-addons
index 72cf5db6e8..beda7297f0 100755
--- a/tools/buildsteps/linux64/make-binary-addons
+++ b/tools/buildsteps/linux64/make-binary-addons
@@ -8,8 +8,8 @@ XBMC_PLATFORM_DIR=linux64
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" ]
+#only build binary addons when requested by env/jenkins
+if [ "$BUILD_BINARY_ADDONS" == "true" ]
then
for addon in $BINARY_ADDONS
do
diff --git a/tools/buildsteps/osx64/make-binary-addons b/tools/buildsteps/osx64/make-binary-addons
index fe29e78eb0..b27b07ddf6 100755
--- a/tools/buildsteps/osx64/make-binary-addons
+++ b/tools/buildsteps/osx64/make-binary-addons
@@ -8,8 +8,8 @@ XBMC_PLATFORM_DIR=osx64
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" ]
+#only build binary addons when requested by env/jenkins
+if [ "$BUILD_BINARY_ADDONS" == "true" ]
then
for addon in $BINARY_ADDONS
do
diff --git a/tools/buildsteps/rbpi/make-binary-addons b/tools/buildsteps/rbpi/make-binary-addons
index 2317b5581a..d55f79aba1 100755
--- a/tools/buildsteps/rbpi/make-binary-addons
+++ b/tools/buildsteps/rbpi/make-binary-addons
@@ -8,8 +8,8 @@ XBMC_PLATFORM_DIR=rbpi
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" ]
+#only build binary addons when requested by env/jenkins
+if [ "$BUILD_BINARY_ADDONS" == "true" ]
then
for addon in $BINARY_ADDONS
do