From efc23b7d22109fb966b3657c89c6af9f0867b901 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 15 Oct 2016 14:52:28 -0500 Subject: [PATCH] staging build fix --- libretro-buildbot-recipe.sh | 17 ----------------- recipes/android/retroarch-android-staging.ra | 10 +++++----- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 0130543c..12cb6307 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1306,7 +1306,6 @@ EOF else cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-staging-release.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-staging-release.apk - fi @@ -1323,22 +1322,6 @@ EOF echo buildbot job: $MESSAGE buildbot_log "$MESSAGE" - $NDK clean | tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - $NDK -j${JOBS} DEBUG=1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - python ./version_increment.py - ant clean | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - android update project --path . --target android-22 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - android update project --path libs/googleplay --target android-21 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - android update project --path libs/appcompat --target android-21 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - ant set-debuggable release | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - if [ -z "$BRANCH" ]; then - cp -rv bin/retroarch-debug.apk $RARCH_DIR/retroarch-debug.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - cp -rv bin/retroarch-debug.apk $RARCH_DIR/retroarch-debug.apk - else - cp -rv bin/retroarch-debug.apk $RARCH_DIR/retroarch-staging-debug.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - cp -rv bin/retroarch-debug.apk $RARCH_DIR/retroarch-staging-debug.apk - fi - if [ $? -eq 0 ]; then MESSAGE="retroarch debug: [status: done] [$jobid]" echo $MESSAGE $RARCH_DIR diff --git a/recipes/android/retroarch-android-staging.ra b/recipes/android/retroarch-android-staging.ra index 4a46f483..f1a65d00 100644 --- a/recipes/android/retroarch-android-staging.ra +++ b/recipes/android/retroarch-android-staging.ra @@ -1,7 +1,7 @@ retroarch retroarch-staging https://github.com/libretro/Retroarch.git SUBMODULE YES . -overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch-dev/media -shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch-dev/media -autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch-dev/media -assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch-dev/media -libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch-dev/media +overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch-staging/media +shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch-staging/media +autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch-staging/media +assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch-staging/media +libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch-staging/media