From b3a63555d7a0df49c516d609efc82a3c9783a042 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 7 Mar 2015 15:03:49 -0500 Subject: [PATCH] various buildbot fixes --- libretro-buildbot-recipe.sh | 10 ++++-- recipes/linux-portable/portable | 51 ++++++++++++++++++++++++++++- recipes/recipes-android | 2 +- recipes/win_x64/cores-mingw-w64-seh | 2 +- recipes/win_x86/cores-mingw-w32-dw2 | 2 +- retrolink.sh | 0 6 files changed, 60 insertions(+), 7 deletions(-) mode change 100644 => 100755 retrolink.sh diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 0dcc48c6..13b85c8c 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -195,11 +195,11 @@ build_libretro_generic_makefile() { cd $DIR cd $SUBDIR + OLDJ=$JOBS if [ "${NAME}" == "mame078" ]; then - OLDJ=$JOBS - JOBS=1 + JOBS=1 fi @@ -236,7 +236,11 @@ build_libretro_generic_makefile() { if [ $? -eq 0 ]; then MESSAGE="$1 build successful ($jobid)" - $PWD/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} + if [ "${MAKEPORTABLE}" == "YES" ]; + then + echo "$1 running retrolink ($jobid)" + $WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} + fi cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT} else MESSAGE="$1 build failed ($jobid)" diff --git a/recipes/linux-portable/portable b/recipes/linux-portable/portable index 2231dacc..27c3cbc3 100644 --- a/recipes/linux-portable/portable +++ b/recipes/linux-portable/portable @@ -1,2 +1,51 @@ -prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC Makefile . +2048 libretro-2048 https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC Makefile.libretro . +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 . +bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git PROJECT YES BSNES Makefile . cpp98 +catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC Makefile . +desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume +dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . +fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk +fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 +fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 +fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . +fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . +gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile.libretro libgambatte +genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . +gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . +handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile . +hatari libretro-hatari https://github.com/libretro/libretro-hatari.git PROJECT YES GENERIC Makefile.libretro . +mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile . +mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile . +mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . +mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . +mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . +mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC Makefile . +mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile . +mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . +mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . +mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC Makefile . +meteor libretro-meteor https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC Makefile libretro +nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC Makefile libretro +nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . +o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC Makefile . +pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC Makefile.libretro . USE_DYNAREC=0 +picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC Makefile.libretro . +prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC Makefile . +puae libretro-uae https://github.com/libretro/libretro-uae.git PROJECT YES GENERIC Makefile build +quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile libretro +remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git PROJECT YES GENERIC Makefile . +scummvm libretro-scummvm https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC Makefile libretro +snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro . +stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile . +tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile . +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . +vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC Makefile.libretro . +vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro +vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . +virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . +yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro + diff --git a/recipes/recipes-android b/recipes/recipes-android index 8b1b3618..3f2bf543 100644 --- a/recipes/recipes-android +++ b/recipes/recipes-android @@ -35,7 +35,7 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC_JNI Makefile jni tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni -tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC_JNI Makefile libretro/jni vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_JNI Makefile src/libretro/jni vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni diff --git a/recipes/win_x64/cores-mingw-w64-seh b/recipes/win_x64/cores-mingw-w64-seh index 1a5e7fd7..3ca4655e 100644 --- a/recipes/win_x64/cores-mingw-w64-seh +++ b/recipes/win_x64/cores-mingw-w64-seh @@ -52,7 +52,7 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro . stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile . tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile . -tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile.libretro . +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_ALT Makefile.libretro . vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . diff --git a/recipes/win_x86/cores-mingw-w32-dw2 b/recipes/win_x86/cores-mingw-w32-dw2 index 62203f99..54665576 100644 --- a/recipes/win_x86/cores-mingw-w32-dw2 +++ b/recipes/win_x86/cores-mingw-w32-dw2 @@ -41,7 +41,7 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro . stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile . tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile . -tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile.libretro . +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_ALT Makefile.libretro . vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . diff --git a/retrolink.sh b/retrolink.sh old mode 100644 new mode 100755