From 3c9de2f086bc07d80da6de38960045ef222bc570 Mon Sep 17 00:00:00 2001 From: barbudreadmon Date: Sun, 1 Feb 2015 09:41:50 +0100 Subject: [PATCH 01/10] Update genesis_plus_gx_libretro.info Add a suggested md5sum for a working sk.bin rom --- dist/info/genesis_plus_gx_libretro.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/info/genesis_plus_gx_libretro.info b/dist/info/genesis_plus_gx_libretro.info index 4212a66a..92be3353 100644 --- a/dist/info/genesis_plus_gx_libretro.info +++ b/dist/info/genesis_plus_gx_libretro.info @@ -44,4 +44,4 @@ firmware9_opt = "true" firmware10_desc = "ggenie.bin (Game Genie ROM)" firmware10_path = "ggenie.bin" firmware10_opt = "true" -notes = "Suggested md5sums:|b4e76e416b887f4e7413ba76fa735f16 = sk2chip.bin" +notes = "Suggested md5sums:|b4e76e416b887f4e7413ba76fa735f16 = sk2chip.bin|4ea493ea4e9f6c9ebfccbdb15110367e = sk.bin" From 5e5ea90a15a5fe3821c30543755fb7e2f4758976 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Feb 2015 14:37:14 +0100 Subject: [PATCH 02/10] Add MAME to libretro-build-database.sh --- libretro-build-database.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/libretro-build-database.sh b/libretro-build-database.sh index b5a37d42..86663b7e 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -230,6 +230,7 @@ build_libretro_databases() { build_libretro_database "VTech - CreatiVision" "rom.crc" build_libretro_database "VTech - V.Smile" "rom.crc" build_libretro_database "Watara - Supervision" "rom.crc" + build_libretro_database "MAME" "rom.name" } build_libretrodb From 5219c8ecbb35970dc5decdd3099d46db29a077e7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Feb 2015 14:38:35 +0100 Subject: [PATCH 03/10] Update MAME core info file - add database name --- dist/info/mame_libretro.info | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/info/mame_libretro.info b/dist/info/mame_libretro.info index 7f4cf06c..8b1b6e28 100644 --- a/dist/info/mame_libretro.info +++ b/dist/info/mame_libretro.info @@ -5,6 +5,7 @@ corename = "MAME 2015 (Git)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" +database = "MAME" license = "MAME" permissions = "" display_version = "Git" From b35d3d237903e77aa34714abc71b4f4d706d572b Mon Sep 17 00:00:00 2001 From: Radius Date: Sun, 1 Feb 2015 14:48:09 -0500 Subject: [PATCH 04/10] add logging via alcarobot --- libretro-buildbot-recipe.sh | 47 ++++++++++++++++++++-------- recipes/win_x64/cores-mingw-w64-sjlj | 4 +-- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 022a5c42..1cad10cc 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -174,6 +174,14 @@ reset_compiler_targets() { cd "${BASE_DIR}" ####build commands +buildbot_log() { + + HASH=`echo -n "$1" | openssl sha1 -hmac $SIG | cut --fields=2 --delimiter=" "` + curl --data "message=$1&sign=$HASH" $LOGURL + + +} + build_libretro_generic_makefile() { @@ -226,12 +234,13 @@ build_libretro_generic_makefile() { if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid $1 build success! + MESSAGE="$1 build successful ($jobid)" cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT} else - echo BUILDBOT JOB: $jobid $1 build failure! + MESSAGE="$1 build failed ($jobid)" fi - + echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" JOBS=$OLDJ } @@ -278,11 +287,13 @@ build_libretro_generic_theos() { if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid $1 build success! + 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 - echo BUILDBOT JOB: $jobid $1 build failure! + MESSAGE="$1 build failure ($jobid)" fi + echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" } @@ -324,12 +335,15 @@ build_libretro_generic_jni() { fi if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid $a $1 build success! + MESSAGE="$1-$a build successful ($jobid)" cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} else - echo BUILDBOT JOB: $jobid $a $1 build failure! + MESSAGE="$1-$a build failure ($jobid)" fi done + echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" + } build_libretro_bsnes_jni() { @@ -372,11 +386,14 @@ build_libretro_bsnes_jni() { fi if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid $1 build success! + MESSAGE="$1 build successful ($jobid)" cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT} else - echo BUILDBOT JOB: $jobid $1 build failure! + MESSAGE="$1 build failure ($jobid)" fi + echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" + done } @@ -422,11 +439,13 @@ build_libretro_generic_gl_makefile() { if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid $1 build success! + MESSAGE="$1 build successful ($jobid)" cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - echo BUILDBOT JOB: $jobid $1 build failure! + MESSAGE="$1 build failure ($jobid)" fi + echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" reset_compiler_targets @@ -487,7 +506,7 @@ build_libretro_bsnes() { if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid $1 build success! + MESSAGE="$1 build successful ($jobid)" if [ "${PROFILE}" == "cpp98" ]; then cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}" @@ -498,8 +517,10 @@ build_libretro_bsnes() { cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi else - echo BUILDBOT JOB: $jobid $1 build failure! + MESSAGE="$1 build failure ($jobid)" fi + echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" } diff --git a/recipes/win_x64/cores-mingw-w64-sjlj b/recipes/win_x64/cores-mingw-w64-sjlj index 44630a8f..d3bb4455 100644 --- a/recipes/win_x64/cores-mingw-w64-sjlj +++ b/recipes/win_x64/cores-mingw-w64-sjlj @@ -1,7 +1,7 @@ -mame078 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile . PTR64=1 ARCH= -mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile.libretro . VRENDER=soft PTR64=1 mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=1 PARTIAL=0 mess libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PTR64=1 PARTIAL=1 ume libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=1 PARTIAL=1 +mame078 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile . PTR64=1 ARCH= +mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile.libretro . VRENDER=soft PTR64=1 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_ALT Makefile . From 76a24b713194257a1027c6b6e6346b600b6c1dd1 Mon Sep 17 00:00:00 2001 From: Radius Date: Sun, 1 Feb 2015 14:56:45 -0500 Subject: [PATCH 05/10] add logging for RA --- libretro-buildbot-recipe.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 1cad10cc..99f520fb 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1269,7 +1269,7 @@ then if [ $? -eq 0 ]; then - echo BUILDBOT JOB: $jobid retroarch build success! + MESSAGE="retroarch build successful ($jobid)" echo "Packaging" echo ============================================ @@ -1330,8 +1330,10 @@ EOF else - echo BUILDBOT JOB: $jobid retroarch build failure! + MESSAGE="retroarch build failed ($jobid)" fi + echo $MESSAGE + $buildbot_log $MESSAGE fi fi From e02b38b60f7e5fb66aae19f3bc7b0f94638d376c Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 1 Feb 2015 15:06:45 -0500 Subject: [PATCH 06/10] indentation fixes --- libretro-buildbot-recipe.sh | 58 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 99f520fb..95a879e9 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -225,7 +225,7 @@ build_libretro_generic_makefile() { if [ "${NAME}" == "mame2010" ]; then - echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools + echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools fi echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" @@ -313,32 +313,32 @@ build_libretro_generic_jni() { 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 BUILDBOT JOB: $jobid $a $1 cleanup success! - else - echo BUILDBOT JOB: $jobid $a $1 cleanup failure! - fi + then + echo BUILDBOT JOB: $jobid $a $1 cleanup success! + else + echo BUILDBOT JOB: $jobid $a $1 cleanup failure! + fi fi echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} else - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " - ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " + ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} fi if [ $? -eq 0 ]; then - MESSAGE="$1-$a build successful ($jobid)" - cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} + MESSAGE="$1-$a build successful ($jobid)" + cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} else - MESSAGE="$1-$a build failure ($jobid)" + MESSAGE="$1-$a build failure ($jobid)" fi done echo BUILDBOT JOB: $MESSAGE @@ -378,18 +378,18 @@ build_libretro_bsnes_jni() { echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} else - echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" + ${NDK} -j${JOBS} APP_ABI=${a} fi if [ $? -eq 0 ]; then - MESSAGE="$1 build successful ($jobid)" - cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT} + MESSAGE="$1 build successful ($jobid)" + cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT} else - MESSAGE="$1 build failure ($jobid)" + MESSAGE="$1 build failure ($jobid)" fi echo BUILDBOT JOB: $MESSAGE buildbot_log "$MESSAGE" @@ -1267,9 +1267,11 @@ then echo "build command: $MAKE -j${JOBS}" $MAKE -j${JOBS} - if [ $? -eq 0 ]; + if [ $? -eq 0 ]; then MESSAGE="retroarch build successful ($jobid)" + echo $MESSAGE + $buildbot_log $MESSAGE echo "Packaging" echo ============================================ @@ -1325,15 +1327,13 @@ EOF cp -Rfv audio/audio_filters/*.dsp windows/filters/audio cp -Rfv gfx/video_filters/*.dll windows/filters/video cp -Rfv gfx/video_filters/*.filt windows/filters/video - - - - + else MESSAGE="retroarch build failed ($jobid)" + echo $MESSAGE + $buildbot_log $MESSAGE fi - echo $MESSAGE - $buildbot_log $MESSAGE + fi fi From 13f9ce1b785a6eecc70d5e29a2115b07b0b1e1f3 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 1 Feb 2015 15:11:38 -0500 Subject: [PATCH 07/10] fix RA logging --- libretro-buildbot-recipe.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 95a879e9..ca69d01e 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1271,7 +1271,7 @@ then then MESSAGE="retroarch build successful ($jobid)" echo $MESSAGE - $buildbot_log $MESSAGE + buildbot_log $MESSAGE echo "Packaging" echo ============================================ @@ -1331,7 +1331,7 @@ EOF else MESSAGE="retroarch build failed ($jobid)" echo $MESSAGE - $buildbot_log $MESSAGE + buildbot_log $MESSAGE fi fi From d34eac08e980a32c8fac79688905080b6d3c753d Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 1 Feb 2015 15:14:49 -0500 Subject: [PATCH 08/10] fix RA logging again... --- libretro-buildbot-recipe.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index ca69d01e..0ad2c2ed 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1271,7 +1271,7 @@ then then MESSAGE="retroarch build successful ($jobid)" echo $MESSAGE - buildbot_log $MESSAGE + buildbot_log "$MESSAGE" echo "Packaging" echo ============================================ @@ -1331,7 +1331,7 @@ EOF else MESSAGE="retroarch build failed ($jobid)" echo $MESSAGE - buildbot_log $MESSAGE + buildbot_log "$MESSAGE" fi fi From a3bf2a58645b7a4d7e5aec466bead94b690d9f93 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 1 Feb 2015 15:31:00 -0500 Subject: [PATCH 09/10] fix android logging per ABI --- 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 0ad2c2ed..5b63bb5a 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -336,12 +336,14 @@ build_libretro_generic_jni() { if [ $? -eq 0 ]; then MESSAGE="$1-$a build successful ($jobid)" + echo BUILDBOT JOB: $MESSAGE cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} else MESSAGE="$1-$a build failure ($jobid)" + echo BUILDBOT JOB: $MESSAGE fi done - echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" } From 94c1c5251b496324cf682f20f28a7547807fc884 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 1 Feb 2015 15:32:49 -0500 Subject: [PATCH 10/10] fix logging per ABI.. --- 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 5b63bb5a..689bc53a 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -337,14 +337,16 @@ build_libretro_generic_jni() { then MESSAGE="$1-$a build successful ($jobid)" echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT} else MESSAGE="$1-$a build failure ($jobid)" echo BUILDBOT JOB: $MESSAGE + buildbot_log "$MESSAGE" fi done - buildbot_log "$MESSAGE" + }