From 73e152069c1eb8e22948e6b1c751ef2f08f83c95 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 17 Mar 2015 23:27:33 -0400 Subject: [PATCH 1/6] fix building separate fba cores --- libretro-buildbot-recipe.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 688b8d82..e821380f 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -564,6 +564,11 @@ while read line; do BUILD="YES" fi + if [[ "${PREVCORE}" == *"fb"* ]] && [[ "${PREVBUILD}" = "YES" ]] && [[ "${NAME}" == *"fba"* ]]; then + FORCE="YES" + BUILD="YES" + fi + cd .. else echo "cloning repo..." From a00c1f8c8be782b21c0686013d25285768f5ea1d Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 17 Mar 2015 23:39:46 -0400 Subject: [PATCH 2/6] fix --- libretro-buildbot-recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index e821380f..9df2fc89 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -564,7 +564,7 @@ while read line; do BUILD="YES" fi - if [[ "${PREVCORE}" == *"fb"* ]] && [[ "${PREVBUILD}" = "YES" ]] && [[ "${NAME}" == *"fba"* ]]; then + if [[ "${PREVCORE}" =~ *.fb.* ]] && [[ "${PREVBUILD}" = "YES" ]] && [[ "${NAME}" =~ .*fba.* ]]; then FORCE="YES" BUILD="YES" fi From 6e86fd8ea6830b0d44512951194921999b145bd9 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 17 Mar 2015 23:46:52 -0400 Subject: [PATCH 3/6] yet another fix --- libretro-buildbot-recipe.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 9df2fc89..0169c054 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -549,6 +549,9 @@ while read line; do BUILD="YES" fi + OLDFORCE=$FORCE + OLDBUILD=$BUILD + if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then FORCE="YES" BUILD="YES" @@ -564,7 +567,7 @@ while read line; do BUILD="YES" fi - if [[ "${PREVCORE}" =~ *.fb.* ]] && [[ "${PREVBUILD}" = "YES" ]] && [[ "${NAME}" =~ .*fba.* ]]; then + if [[ "${PREVCORE}" == *fb* ]] && [[ "${PREVBUILD}" = "YES" ]] && [[ "${NAME}" == *fb* ]]; then FORCE="YES" BUILD="YES" fi @@ -646,6 +649,10 @@ while read line; do cd "${BASE_DIR}" PREVCORE=$NAME PREVBUILD=$BUILD + + BUILD=$OLDBUILD + FORCE=$OLDFORCE + done < $1 echo "BUILDBOT JOB: $jobid Building Retroarch" From 164cb8e3401a1cfe721b74973ae0243e7b0d5d58 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 17 Mar 2015 16:56:29 -0700 Subject: [PATCH 4/6] Make sure to partial clean between mame/mess/ume --- libretro-build-common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index cb85fcb1..fb81c835 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -463,6 +463,7 @@ build_libretro_mame_prerule() { build_summary_log $ret "$target" else for target in mame mess ume; do + [ "$target" != "mame" ] && echo_cmd "$MAKE -f Makefile.libretro PARTIAL=1 $extra_args platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' echo_cmd "$MAKE -f Makefile.libretro $extra_args \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\" emulator" || die "Failed to build $target" copy_core_to_dist "$target" ret=$? From 66f1fe8cf7ee02e4f99430a4fdbff303af1ca377 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 17 Mar 2015 17:11:40 -0700 Subject: [PATCH 5/6] Disabled mame in libretro-build.sh (should've done this at the start) --- libretro-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libretro-build.sh b/libretro-build.sh index efc0f1a3..46c435f2 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -136,7 +136,8 @@ build_default_cores() { libretro_build_core gw libretro_build_core hatari libretro_build_core lutro - libretro_build_core mame + # Consider current mame to be WIP (temporary) +# libretro_build_core mame libretro_build_core mame078 libretro_build_core mednafen_gba libretro_build_core mednafen_lynx From 92bc8937ae34d56ebc1129d8c96f76a6d41ce82a Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 17 Mar 2015 18:35:15 -0700 Subject: [PATCH 6/6] Support MAME_GIT_TINY=1 ./libretro-build.sh mame to build tiny build-testing mame --- libretro-build-common.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index fb81c835..cc7cdba0 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -445,6 +445,7 @@ build_libretro_mame_prerule() { local extra_args [ "$X86_64" = "true" ] && extra_args="PTR64=1" + [ "$MAME_GIT_TINY" -eq 1 ] && extra_args="$extra_args SUBTARGET=tiny" if [ -z "$NOCLEAN" ]; then echo_cmd "$MAKE -f Makefile.libretro $extra_args platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' @@ -453,16 +454,18 @@ build_libretro_mame_prerule() { if [ -n "$IOS" ]; then # FIXME: iOS doesn't build right now, so let's leave this simple until it does. target=mame - echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" \"NATIVE=1\" buildtools \"-j$JOBS\"" + echo_cmd "$MAKE -f Makefile.libretro $extra_args \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" \"NATIVE=1\" buildtools \"-j$JOBS\"" ret=$? if [ "$ret" = 0 ]; then - echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\"" + echo_cmd "$MAKE -f Makefile.libretro $extra_args \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\"" ret=$? fi [ "$ret" -gt 0 ] && die 'Failed to build MAME' build_summary_log $ret "$target" else - for target in mame mess ume; do + mame_targets="mame mess ume" + [ "$MAME_GIT_TINY" -eq 1 ] && mame_targets="mame mess" + for target in $mame_targets; do [ "$target" != "mame" ] && echo_cmd "$MAKE -f Makefile.libretro PARTIAL=1 $extra_args platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' echo_cmd "$MAKE -f Makefile.libretro $extra_args \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\" emulator" || die "Failed to build $target" copy_core_to_dist "$target"