diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 99f520fb..95a879e9 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -225,7 +225,7 @@ build_libretro_generic_makefile() { if [ "${NAME}" == "mame2010" ]; then - echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools + echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools fi echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" @@ -313,32 +313,32 @@ build_libretro_generic_jni() { for a in "${ABIS[@]}"; do if [ -z "${NOCLEAN}" ]; then - echo "cleaning up..." - echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean" + echo "cleaning up..." + echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean" ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean if [ $? -eq 0 ]; - then - echo BUILDBOT JOB: $jobid $a $1 cleanup success! - else - echo BUILDBOT JOB: $jobid $a $1 cleanup failure! - fi + then + echo BUILDBOT JOB: $jobid $a $1 cleanup success! + else + echo BUILDBOT JOB: $jobid $a $1 cleanup failure! + fi fi echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} else - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " - ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " + ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} fi if [ $? -eq 0 ]; then - MESSAGE="$1-$a build successful ($jobid)" - cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} + MESSAGE="$1-$a build successful ($jobid)" + cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} else - MESSAGE="$1-$a build failure ($jobid)" + MESSAGE="$1-$a build failure ($jobid)" fi done echo BUILDBOT JOB: $MESSAGE @@ -378,18 +378,18 @@ build_libretro_bsnes_jni() { echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} else - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} fi if [ $? -eq 0 ]; then - MESSAGE="$1 build successful ($jobid)" - cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT} + MESSAGE="$1 build successful ($jobid)" + cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT} else - MESSAGE="$1 build failure ($jobid)" + MESSAGE="$1 build failure ($jobid)" fi echo BUILDBOT JOB: $MESSAGE buildbot_log "$MESSAGE" @@ -1267,9 +1267,11 @@ then echo "build command: $MAKE -j${JOBS}" $MAKE -j${JOBS} - if [ $? -eq 0 ]; + if [ $? -eq 0 ]; then MESSAGE="retroarch build successful ($jobid)" + echo $MESSAGE + $buildbot_log $MESSAGE echo "Packaging" echo ============================================ @@ -1325,15 +1327,13 @@ EOF cp -Rfv audio/audio_filters/*.dsp windows/filters/audio cp -Rfv gfx/video_filters/*.dll windows/filters/video cp -Rfv gfx/video_filters/*.filt windows/filters/video - - - - + else MESSAGE="retroarch build failed ($jobid)" + echo $MESSAGE + $buildbot_log $MESSAGE fi - echo $MESSAGE - $buildbot_log $MESSAGE + fi fi