From bcaf9efe1d7d5c2eddb86022d113d05c59370b8d Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 24 Dec 2017 17:33:21 -0800 Subject: [PATCH] libretro-buildbot-recipe.sh: Use $NAME instead of the BSNES_JNI command. --- libretro-buildbot-recipe.sh | 31 ++++++++++------------- recipes/android/cores-android-jni | 4 +-- recipes/android/cores-android-jni-aarch64 | 4 +-- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index bcf6e10c..52fcf446 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -470,7 +470,7 @@ build_libretro_generic_jni() { ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="$NAME" http://buildbot.fiveforty.net/build_entry/` fi - if [ "${COMMAND}" = "BSNES_JNI" ]; then + if [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ]; then CORE="${CORE:-${NAME}_accuracy ${NAME}_balanced ${NAME}_performance}" else CORE="${NAME}" @@ -481,9 +481,7 @@ build_libretro_generic_jni() { eval "set -- $CORE" for core do - NAME="${core}" - - if [ "${COMMAND}" = "BSNES_JNI" ]; then + if [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ]; then CORE_ARGS="profile=${core##*_} ${ARGS}" LIBNAM="libretro_${NAME}" else @@ -491,7 +489,7 @@ build_libretro_generic_jni() { fi for a in "${ABIS[@]}"; do - LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log" + LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${core}_${PLATFORM}_${a}.log" echo --------------------------------------------------| tee "$LOGFILE" cat $TMPDIR/vars | tee -a "$LOGFILE" @@ -501,9 +499,9 @@ build_libretro_generic_jni() { ${NDK} -j${JOBS} ${CORE_ARGS} APP_ABI=${a} clean 2>&1 | tee -a "$LOGFILE" if [ $? -eq 0 ]; then - echo buildbot job: $jobid $a ${NAME} cleanup success! + echo buildbot job: $jobid $a ${core} cleanup success! else - echo buildbot job: $jobid $a ${NAME} cleanup failed! + echo buildbot job: $jobid $a ${core} cleanup failed! fi fi @@ -519,13 +517,13 @@ build_libretro_generic_jni() { cp -v ../libs/${a}/libparallel_retro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/parallel_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} fi - echo "COPY CMD: cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" - cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" - cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} + echo "COPY CMD: cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" + cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" + cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} RET=$? - buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$LOGFILE" + buildbot_handle_message "$RET" "$ENTRY_ID" "$core" "$jobid" "$LOGFILE" done done @@ -654,12 +652,11 @@ while read line; do echo "buildbot job: building $NAME" case "${COMMAND}" in CMAKE|GENERIC|GENERIC_GL|HIGAN ) - build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;; - BSNES_JNI|GENERIC_JNI ) - build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; - GENERIC_ALT ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; - LEIRADEL ) build_libretro_leiradel_makefile $NAME $DIR $SUBDIR $MAKEFILE ${PLATFORM} "${ARGS}" ;; - * ) : ;; + build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;; + GENERIC_JNI ) build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; + GENERIC_ALT ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; + LEIRADEL ) build_libretro_leiradel_makefile $NAME $DIR $SUBDIR $MAKEFILE ${PLATFORM} "${ARGS}" ;; + * ) : ;; esac echo "Cleaning repo state after build $URL..." git --work-tree="${BASE_DIR}/${DIR}" --git-dir="${BASE_DIR}/${DIR}/.git" clean -xdf diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni index 69f2b416..c2313698 100644 --- a/recipes/android/cores-android-jni +++ b/recipes/android/cores-android-jni @@ -2,8 +2,8 @@ 3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC_JNI Makefile jni 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC_JNI Makefile jni atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC_JNI Makefile jni -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES_JNI Makefile target-libretro/jni -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES_JNI Makefile target-libretro/jni +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC_JNI Makefile target-libretro/jni +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC_JNI Makefile target-libretro/jni craft libretro-craft https://github.com/libretro/Craft.git master YES GENERIC_JNI Makefile.libretro jni crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC_JNI Makefile jni desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni diff --git a/recipes/android/cores-android-jni-aarch64 b/recipes/android/cores-android-jni-aarch64 index 8e2c6b15..9e787ede 100644 --- a/recipes/android/cores-android-jni-aarch64 +++ b/recipes/android/cores-android-jni-aarch64 @@ -2,8 +2,8 @@ 3dengine libretro64-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC_JNI Makefile jni 4do libretro64-4do https://github.com/libretro/4do-libretro.git master YES GENERIC_JNI Makefile jni bluemsx libretro64-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC_JNI Makefile jni -bsnes libretro64-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES_JNI Makefile target-libretro/jni -bsnes_mercury libretro64-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES_JNI Makefile target-libretro/jni +bsnes libretro64-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC_JNI Makefile target-libretro/jni +bsnes_mercury libretro64-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC_JNI Makefile target-libretro/jni snes9x2002 libretro64-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC_JNI Makefile jni snes9x2005 libretro64-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni snes9x2010 libretro64-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_JNI Makefile jni