mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2024-12-01 04:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/libretro/libretro-super

Browse Source
This commit is contained in:
Radius 2015-06-16 00:00:13 -05:00
commit bf52ddf67f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/info/fuse_libretro.info vendored
View File

@ -1,6 +1,6 @@
display_name = "ZX Spectrum (Fuse)" display_name = "ZX Spectrum (Fuse)"
authors = "Team Fuse" authors = "Team Fuse"
supported_extensions = "tzx|tap|z80|rzx" supported_extensions = "tzx|tap|z80|rzx|scl|trd"
corename = "Fuse" corename = "Fuse"
manufacturer = "Sinclair|Amstrad" manufacturer = "Sinclair|Amstrad"
categories = "Emulator" categories = "Emulator"

18
libretro-buildbot-recipe.sh
View File

@ -227,9 +227,9 @@ build_libretro_generic_makefile() {
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
fi fi
if [ "${NAME}" = "gw" ]; then if [ "${NAME}" = "gw" ]; then
cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}.${FORMAT_EXT} cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}.${FORMAT_EXT} &> /tmp/buildbot.log
else else
cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} &> /tmp/buildbot.log
fi fi
else else
ERROR=`cat /tmp/buildbot.log | tail -n 5000` ERROR=`cat /tmp/buildbot.log | tail -n 5000`
@ -808,31 +808,31 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
cp -rfv media/assets/* android/phoenix/assets/assets/ cp -rfv media/assets/* android/phoenix/assets/assets/
cp -rfv media/autoconfig/* android/phoenix/assets/autoconfig/ cp -rfv media/autoconfig/* android/phoenix/assets/autoconfig/
cp -rfv media/libretrodb/cht android/phoenix/assets/libretrodb/ #cp -rfv media/libretrodb/cht android/phoenix/assets/libretrodb/
cp -rfv media/libretrodb/rdb android/phoenix/assets/libretrodb/ cp -rfv media/libretrodb/rdb android/phoenix/assets/libretrodb/
cp -rfv media/libretrodb/cursors android/phoenix/assets/libretrodb/ cp -rfv media/libretrodb/cursors android/phoenix/assets/libretrodb/
cp -rfv media/overlays/* android/phoenix/assets/overlays/ cp -rfv media/overlays/* android/phoenix/assets/overlays/
cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders_glsl/ cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders_glsl/
cp -rfv media/shaders_glsl /tmp/
cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/ cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/
echo "BUILDBOT JOB: $jobid Building" echo "BUILDBOT JOB: $jobid Building"
echo echo
cd android/phoenix cd android/phoenix
rm bin/*.apk rm bin/*.apk
$NDK clean &> /tmp/buildbot.log $NDK clean &> /tmp/buildbot.log
$NDK -j${JOBS} &>> /tmp/buildbot.log $NDK -j${JOBS} &>> /tmp/buildbot.log
ant clean &>> /tmp/buildbot.log ant clean &>> /tmp/buildbot.log
android update project --path . --target android-21 android update project --path . --target android-21 &>> /tmp/buildbot.log
android update project --path libs/googleplay --target android-21 android update project --path libs/googleplay --target android-21 &>> /tmp/buildbot.log
android update project --path libs/appcompat --target android-21 android update project --path libs/appcompat --target android-21 &>> /tmp/buildbot.log
ant debug &>> /tmp/buildbot.log ant debug &>> /tmp/buildbot.log
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
MESSAGE="retroarch build successful [$jobid]" MESSAGE="retroarch build successful [$jobid]"
echo $MESSAGE echo $MESSAGE
else else
ERROR=`cat /tmp/buildbot.log | tail -n 5000` ERROR=`cat /tmp/buildbot.log | tail -n 1000`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE echo $MESSAGE