From 49f58930494f25991a3e8bbd8a1edd5bfef38998 Mon Sep 17 00:00:00 2001 From: orbea Date: Tue, 14 Nov 2017 09:24:17 -0800 Subject: [PATCH 1/2] libretro-buildbot-recipe.sh: Combine the compile_audio_filters and compile_video_filters functions. --- libretro-buildbot-recipe.sh | 47 +++++++++++++++---------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 0f04a34e..b037f441 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1019,36 +1019,27 @@ buildbot_pull(){ cd $WORK } -compile_audio_filters() +compile_filters() { - HELPER=$1 - MAKE=$2 - echo "compiling audio filters" - echo "audio filter BUILD CMD: ${HELPER} ${MAKE}" - ${HELPER} ${MAKE} -C libretro-common/audio/dsp_filters + FILTER="$1" + HELPER="$2" + MAKE="$3" + + case "$FILTER" in + audio ) FILTERDIR='libretro-common/audio/dsp_filters' ;; + video ) FILTERDIR='gfx/video_filters' ;; + esac + + echo "compile $FILTER filters" + echo "$FILTER filter BUILD CMD: ${HELPER} ${MAKE} -C $FILTERDIR" + ${HELPER} ${MAKE} -C "$FILTERDIR" if [ $? -eq 0 ]; then - echo buildbot job: $jobid audio filter build success! + echo "buildbot job: $jobid $FILTER filter build success!" else - echo buildbot job: $jobid audio filter: [status: fail]! + echo "buildbot job: $jobid $FILTER filter: [status: fail]!" fi } -compile_video_filters() -{ - HELPER=$1 - MAKE=$2 - echo "compiling video filters" - echo "$PWD" - echo "video filter BUILD CMD: ${HELPER} ${MAKE}" - ${HELPER} ${MAKE} -C gfx/video_filters - if [ $? -eq 0 ]; then - echo buildbot job: $jobid video filter build success! - else - echo buildbot job: $jobid video filter: [status: fail]! - fi -} - - echo "buildbot job: $jobid Building Retroarch-$PLATFORM" echo -------------------------------------------------- echo @@ -1265,8 +1256,8 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - compile_audio_filters ${HELPER} ${MAKE} - compile_video_filters ${HELPER} ${MAKE} + compile_filters audio ${HELPER} ${MAKE} + compile_filters video ${HELPER} ${MAKE} echo "configuring..." echo "configure command: $CONFIGURE $ARGS" @@ -1662,8 +1653,8 @@ if [ "${PLATFORM}" = "unix" ]; then touch $TMPDIR/built-frontend - compile_audio_filters ${HELPER} ${MAKE} - compile_video_filters ${HELPER} ${MAKE} + compile_filters audio ${HELPER} ${MAKE} + compile_filters video ${HELPER} ${MAKE} echo "configuring..." echo "configure command: $CONFIGURE $ARGS" From 24d221bc776c848d8848223c280524ec115d7959 Mon Sep 17 00:00:00 2001 From: orbea Date: Tue, 14 Nov 2017 11:16:59 -0800 Subject: [PATCH 2/2] libretro-buildbot-recipe.sh: Remove the possibly non-portable use of 'make -C' --- libretro-buildbot-recipe.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index b037f441..219c24ce 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1031,8 +1031,8 @@ compile_filters() esac echo "compile $FILTER filters" - echo "$FILTER filter BUILD CMD: ${HELPER} ${MAKE} -C $FILTERDIR" - ${HELPER} ${MAKE} -C "$FILTERDIR" + echo "$FILTER filter BUILD CMD: ${HELPER} ${MAKE}" + ( cd "$FILTERDIR"; ${HELPER} ${MAKE} ) if [ $? -eq 0 ]; then echo "buildbot job: $jobid $FILTER filter build success!" else