From 46f838b9cba246d20cc9b9681047742144675059 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 4 Jul 2015 12:08:50 -0400 Subject: [PATCH] gw buildbot fixes --- libretro-buildbot-recipe.sh | 7 ++++++- recipes/linux-portable/portable | 1 + recipes/linux-portable/portable-gw | 3 ++- recipes/linux-portable/portable-gw.conf | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 6a0b6c5c..715fbcee 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -278,7 +278,12 @@ build_libretro_leiradel_makefile() { if [ $? -eq 0 ]; then MESSAGE="$1 build successful [$jobid]" - cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT} &>> /tmp/buildbot.log + if [ "${PLATFORM}" = "android" ]; then + cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT} &>> /tmp/buildbot.log + else + cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT} &>> /tmp/buildbot.log + + fi else ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` diff --git a/recipes/linux-portable/portable b/recipes/linux-portable/portable index 57406b39..54155e36 100644 --- a/recipes/linux-portable/portable +++ b/recipes/linux-portable/portable @@ -2,6 +2,7 @@ 4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT YES GENERIC Makefile . beetle_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT NO GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT YES GENERIC Makefile.libretro . +bnes libretro-bnes https://github.com/libretro/bnes-libretro.git PROJECT YES BSNES Makefile . bnes bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . accuracy bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . balanced bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . performance diff --git a/recipes/linux-portable/portable-gw b/recipes/linux-portable/portable-gw index 5ffdb29f..275fbd91 100644 --- a/recipes/linux-portable/portable-gw +++ b/recipes/linux-portable/portable-gw @@ -1,2 +1,3 @@ -gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES GENERIC Makefile.linux_x86_64 build +gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build linux_x86_64 + diff --git a/recipes/linux-portable/portable-gw.conf b/recipes/linux-portable/portable-gw.conf index 4c166532..ca41d7d9 100644 --- a/recipes/linux-portable/portable-gw.conf +++ b/recipes/linux-portable/portable-gw.conf @@ -1,3 +1,2 @@ platform unix MAKEPORTABLE YES -SUFFIX .linux_x86_64