From c60738d61832f86e1ba5d465281300b9af4c855f Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 3 Jul 2015 10:40:27 -0400 Subject: [PATCH 1/4] android updates --- libretro-buildbot-recipe.sh | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index c2deba54..8175d238 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -228,9 +228,9 @@ build_libretro_generic_makefile() { fi cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} &> /tmp/buildbot.log else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` - MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" + MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" @@ -277,7 +277,7 @@ build_libretro_leiradel_makefile() { MESSAGE="$1 build successful [$jobid]" cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${FORMAT}.${FORMAT_EXT} &>> /tmp/buildbot.log else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" @@ -327,7 +327,7 @@ build_libretro_generic_theos() { MESSAGE="$1 build successful [$jobid]" cp -v objs/obj/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -373,7 +373,7 @@ build_libretro_generic_jni() { buildbot_log "$MESSAGE" cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1-$a build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo BUILDBOT JOB: $MESSAGE @@ -420,7 +420,7 @@ build_libretro_bsnes_jni() { MESSAGE="$1 build successful [$jobid]" cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -468,7 +468,7 @@ build_libretro_generic_gl_makefile() { MESSAGE="$1 build successful [$jobid]" cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -529,7 +529,7 @@ build_libretro_bsnes() { cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi @@ -755,7 +755,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then if [ "${ENABLED}" = "YES" ]; then echo "BUILDBOT JOB: $jobid Processing $NAME" - echo + echo echo NAME: $NAME echo DIR: $DIR echo PARENT: $PARENTDIR @@ -861,18 +861,21 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then mkdir -p android/phoenix/assets/info mkdir -p android/phoenix/assets/overlays mkdir -p android/phoenix/assets/shaders_glsl - mkdir -p android/phoenix/assets/libretrodb + mkdir -p android/phoenix/assets/database mkdir -p android/phoenix/assets/autoconfig + mkdir -p android/phoenix/assets/cheats cp -rfv media/assets/* android/phoenix/assets/assets/ cp -rfv media/autoconfig/* android/phoenix/assets/autoconfig/ #cp -rfv media/libretrodb/cht 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/rdb android/phoenix/assets/database/ + cp -rfv media/libretrodb/cursors android/phoenix/assets/database/ cp -rfv media/overlays/* android/phoenix/assets/overlays/ cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders_glsl/ cp -rfv media/shaders_glsl /tmp/ + touch android/phoenix/assets/cheats/cheatshere.txt + cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/ echo "BUILDBOT JOB: $jobid Building" @@ -1239,7 +1242,7 @@ EOF cp -Rfv gfx/video_filters/*.dll windows/filters/video cp -Rfv gfx/video_filters/*.filt windows/filters/video else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1353,7 +1356,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1484,7 +1487,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE @@ -1634,7 +1637,7 @@ then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/buildbot.log | tail -n 500` + ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE From 3b23e1fb172bc08f47231c43fa3b871d66856a5d Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 3 Jul 2015 10:58:12 -0400 Subject: [PATCH 2/4] remove strip for non windows --- libretro-buildbot-recipe.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 1c329d4c..f7c4b997 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -226,7 +226,9 @@ build_libretro_generic_makefile() { echo "$1 running retrolink [$jobid]" $WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi - strip -s ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} + if [ "${PLATFORM}" = "windows" ]; then + strip -s ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} + fi cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} &> /tmp/buildbot.log else ERROR=`cat /tmp/buildbot.log | tail -n 500` From b8cfa5ec1b4e2a8cbddc4a5898f93039afcf5e0d Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 4 Jul 2015 11:56:18 -0400 Subject: [PATCH 3/4] add missing files --- libretro-buildbot-recipe.sh | 7 +++++-- recipes/android/gw | 6 ++++++ recipes/android/gw.conf | 9 +++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 recipes/android/gw create mode 100644 recipes/android/gw.conf diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index fc7c6300..6a0b6c5c 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -278,7 +278,7 @@ 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${FORMAT}.${FORMAT_EXT} &>> /tmp/buildbot.log + cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT} &>> /tmp/buildbot.log else ERROR=`cat /tmp/buildbot.log | tail -n 300` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` @@ -867,6 +867,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then mkdir -p android/phoenix/assets/database mkdir -p android/phoenix/assets/autoconfig mkdir -p android/phoenix/assets/cheats + mkdir -p android/phoenix/assets/playlists + cp -rfv media/assets/* android/phoenix/assets/assets/ @@ -877,7 +879,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then cp -rfv media/overlays/* android/phoenix/assets/overlays/ cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders_glsl/ cp -rfv media/shaders_glsl /tmp/ - touch android/phoenix/assets/cheats/cheatshere.txt + touch android/phoenix/assets/cheats/placeholder + touch android/phoenix/assets/cheats/placeholder cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/ diff --git a/recipes/android/gw b/recipes/android/gw new file mode 100644 index 00000000..6c777a1b --- /dev/null +++ b/recipes/android/gw @@ -0,0 +1,6 @@ +gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build armeabi-v7a +gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build armeabi +gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build x86 +fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build armeabi-v7a +fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build armeabi +fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build x86 diff --git a/recipes/android/gw.conf b/recipes/android/gw.conf new file mode 100644 index 00000000..fbcdb5dd --- /dev/null +++ b/recipes/android/gw.conf @@ -0,0 +1,9 @@ +ANDROID_HOME /opt/android-sdk +NDK_ROOT /opt/android-ndk +NDK_ROOT_DIR /opt/android-ndk +ANDROID_NDK /opt/android-ndk +PATH /opt/android-ndk:/opt/android-sdk/tools +PLATFORM android +platform android +MAKE make +SUFFIX _android From 46f838b9cba246d20cc9b9681047742144675059 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 4 Jul 2015 12:08:50 -0400 Subject: [PATCH 4/4] 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