From c04f462b0e5bc957858416882fcb2761ffed06da Mon Sep 17 00:00:00 2001 From: Radius Date: Thu, 18 Dec 2014 17:19:36 -0500 Subject: [PATCH 1/2] add a few more cores to the android bot --- libretro-buildbot-recipe.sh | 46 +++++++++++++++++-------------------- recipes/recipes-android | 33 ++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 recipes/recipes-android diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index f69fea18..75b54929 100644 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -230,22 +230,22 @@ build_libretro_generic_jni() { cd $DIR cd $SUBDIR - - if [ -z "${NOCLEAN}" ]; - then - echo "cleaning up..." - echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} clean" - ${NDK} -j${JOBS} ${ARGS} clean - if [ $? -eq 0 ]; - then - echo success! - else - echo error while cleaning up + for a in "${ABIS[@]}"; do + if [ -z "${NOCLEAN}" ]; + then + 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 success! + else + echo error while cleaning up + fi fi - fi - for a in "${ABIS[@]}"; do + echo "compiling for ${a}..." if [ -z "${ARGS}" ] then @@ -255,19 +255,15 @@ build_libretro_generic_jni() { echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} fi + if [ $? -eq 0 ]; + then + echo success! + cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} + else + echo error while compiling $1 + fi done - if [ $? -eq 0 ]; - then - echo success! - for a in "${ABIS[@]}"; do - cp -v ../obj/local/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} - done - else - echo error while compiling $1 - fi - - } @@ -536,7 +532,7 @@ while read line; do cd $DIR echo "pulling from repo... " OUT=`git pull` - OUT=`git submodule foreach git pull origin master` + OUT=`git submodule --depth=1 foreach git pull origin master` if [[ $OUT == *"Already up-to-date"* ]] then BUILD="NO" diff --git a/recipes/recipes-android b/recipes/recipes-android new file mode 100644 index 00000000..75c71d43 --- /dev/null +++ b/recipes/recipes-android @@ -0,0 +1,33 @@ +2048 libretro-2048 https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC_JNI Makefile jni +3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git PROJECT YES GENERIC_JNI Makefile jni +4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT YES GENERIC_JNI Makefile jni +catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC_JNI Makefile jni +desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni +dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile android/eclipse/jni +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC_JNI Makefile.libretro src/drivers/libretro/jni +fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC_JNI Makefile jni +gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro libgambatte/libretro/jni +genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni +gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC_JNI Makefile jni +handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC_JNI Makefile libretro/jni +mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC_JNI Makefile jni +mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC_JNI Makefile jni +meteor libretro-meteor https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni +mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni +nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC_JNI Makefile libretro/jni +nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC_JNI Makefile jni +o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC_JNI Makefile jni +pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC_JNI Makefile.libretro jni +picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC_JNI Makefile.libretro jni +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git SUBMODULE YES GENERIC_JNI Makefile.libretro libretro/jni +prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC_JNI Makefile jni +snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC_JNI Makefile libretro/jni +snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni From 1cde5a73e2c8943120107ff0dc9adf184147ac54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Thu, 18 Dec 2014 17:22:51 -0500 Subject: [PATCH 2/2] Fix indentation --- libretro-buildbot-recipe.sh | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 75b54929..d03f3727 100644 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -230,40 +230,37 @@ build_libretro_generic_jni() { cd $DIR cd $SUBDIR - for a in "${ABIS[@]}"; do + 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 success! - else - echo error while cleaning up - fi + then + echo success! + else + echo error while cleaning up + fi fi - - - echo "compiling for ${a}..." + echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} else - echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " - ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} + echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " + ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} fi if [ $? -eq 0 ]; then - echo success! - cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} + echo success! + cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} else - echo error while compiling $1 + echo error while compiling $1 fi - done - + done }