From 2e39bc826a34b56d9731c69c365da5d8eb6a84a4 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 24 Dec 2017 16:43:21 -0800 Subject: [PATCH 1/4] libretro-buildbot-recipe.sh: Set the log file to $LOGFILE. --- libretro-buildbot-recipe.sh | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index abad38c6..48961fd1 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -325,6 +325,7 @@ build_libretro_generic_makefile() { eval "set -- $CORE" for core do NAME="$core" + LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log" if [ "${COMMAND}" = "BSNES" ]; then CORE_ARGS="profile=${core##*_} ${ARGS}" @@ -334,18 +335,18 @@ build_libretro_generic_makefile() { CORE_ARGS="${ARGS}" fi - echo --------------------------------------------------| tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - cat $TMPDIR/vars | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo --------------------------------------------------| tee "$LOGFILE" + cat $TMPDIR/vars | tee -a "$LOGFILE" - echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo -------------------------------------------------- 2>&1 | tee -a "$LOGFILE" if [ -z "${NOCLEAN}" ] && [ -f "${MAKEFILE}" ] && [ "${COMMAND}" != "CMAKE" ]; then if [ "${COMMAND}" = "HIGAN" ]; then - rm -fv obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - rm -fv out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + rm -fv obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" + rm -fv out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" else eval "set -- ${HELPER} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${CORE_ARGS} clean" - echo "CLEANUP CMD: $@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - "$@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo "CLEANUP CMD: $@" 2>&1 | tee -a "$LOGFILE" + "$@" 2>&1 | tee -a "$LOGFILE" fi if [ $? -eq 0 ]; then @@ -355,45 +356,44 @@ build_libretro_generic_makefile() { fi fi - echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo -------------------------------------------------- 2>&1 | tee -a "$LOGFILE" if [ "${COMMAND}" = "CMAKE" ]; then if [ "${PLATFORM}" = "android" ]; then EXTRAARGS="-DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=${API_LEVEL} -DCMAKE_ANDROID_ARCH_ABI=${ABI_OVERRIDE} -DCMAKE_ANDROID_NDK=${NDK_ROOT}" fi eval "set -- ${EXTRAARGS} ${CORE_ARGS}" - echo "BUILD CMD: ${CMAKE} $@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - echo "$@" .. | xargs ${CMAKE} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo "BUILD CMD: ${CMAKE} $@" 2>&1 | tee -a "$LOGFILE" + echo "$@" .. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE" + echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" 2>&1 | tee -a "$LOGFILE" + ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} 2>&1 | tee -a "$LOGFILE" find . -mindepth 2 -name "${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" -exec cp -f "{}" . \; elif [ "${COMMAND}" = "HIGAN" ]; then platform="" - echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" ${CORE_ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} ${CORE_ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE" + ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE" else eval "set -- ${HELPER} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${CORE_ARGS}" - echo "BUILD CMD: $@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - "$@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo "BUILD CMD: $@" 2>&1 | tee -a "$LOGFILE" + "$@" 2>&1 | tee -a "$LOGFILE" fi if [ "${MAKEPORTABLE}" == "YES" ]; then - echo "BUILD CMD $WORK/retrolink.sh ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - $WORK/retrolink.sh ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo "BUILD CMD $WORK/retrolink.sh ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" + $WORK/retrolink.sh ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" fi if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then ${STRIP:=strip} -s ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} fi - echo "COPY CMD: cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + echo "COPY CMD: cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" + cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} RET=$? - ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$ERROR" + buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$LOGFILE" done if [ "${COMMAND}" = "GENERIC_GL" ]; then @@ -492,13 +492,14 @@ build_libretro_generic_jni() { fi for a in "${ABIS[@]}"; do - echo --------------------------------------------------| tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log - cat $TMPDIR/vars | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log" + echo --------------------------------------------------| tee "$LOGFILE" + cat $TMPDIR/vars | tee -a "$LOGFILE" - echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + echo -------------------------------------------------- 2>&1 | tee -a "$LOGFILE" if [ -z "${NOCLEAN}" ]; then - echo "CLEANUP CMD: ${NDK} -j${JOBS} ${CORE_ARGS} APP_ABI=${a} clean" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log - ${NDK} -j${JOBS} ${CORE_ARGS} APP_ABI=${a} clean 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + echo "CLEANUP CMD: ${NDK} -j${JOBS} ${CORE_ARGS} APP_ABI=${a} clean" 2>&1 | tee -a "$LOGFILE" + ${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! @@ -507,26 +508,25 @@ build_libretro_generic_jni() { fi fi - echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + echo -------------------------------------------------- 2>&1 | tee -a "$LOGFILE" eval "set -- ${NDK} -j${JOBS} APP_ABI=${a} ${CORE_ARGS}" - echo "BUILD CMD: $@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log - "$@" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + echo "BUILD CMD: $@" 2>&1 | tee -a "$LOGFILE" + "$@" 2>&1 | tee -a "$LOGFILE" if [ "${NAME}" == "mupen64plus" ]; then - echo "COPY CMD: cp -v ../libs/${a}/libparallel_retro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/parallel_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log - cp -v ../libs/${a}/libparallel_retro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/parallel_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + echo "COPY CMD: cp -v ../libs/${a}/libparallel_retro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/parallel_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" + cp -v ../libs/${a}/libparallel_retro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/parallel_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" 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 $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log - cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + 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} RET=$? - ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log - buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$ERROR" + buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$LOGFILE" done done From 2b95c15c7c35c1129b933fe0f5180ddf7396d539 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 24 Dec 2017 15:08:01 -0800 Subject: [PATCH 2/4] libretro-buildbot-recipe.sh: Use $NAME instead of the BSNES command. --- libretro-buildbot-recipe.sh | 41 +++++++++---------- recipes/apple/cores-ios-generic | 4 +- recipes/apple/cores-ios9-generic | 4 +- recipes/apple/cores-osx-x64-generic | 4 +- recipes/linux/cores-linux-armhf-generic | 4 +- recipes/linux/cores-linux-x64-generic | 4 +- recipes/linux/cores-linux-x86-generic | 4 +- recipes/windows/cores-windows-x64_seh-generic | 4 +- recipes/windows/cores-windows-x86_dw2-generic | 4 +- 9 files changed, 36 insertions(+), 37 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 48961fd1..bcf6e10c 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -247,7 +247,7 @@ buildbot_log() { buildbot_handle_message() { RET=$1 ENTRY_ID=$2 - NAME=$3 + CORE_NAME=$3 jobid=$4 ERROR=$5 @@ -255,7 +255,7 @@ buildbot_handle_message() { if [ -n "$LOGURL" ]; then curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/ fi - MESSAGE="$NAME: [status: done] [$jobid]" + MESSAGE="$CORE_NAME: [status: done] [$jobid]" else if [ -n "$LOGURL" ]; then HASTE="n/a" @@ -264,10 +264,10 @@ buildbot_handle_message() { gzip -9fk $ERROR HASTE=`curl -X POST http://p.0bl.net/ --data-binary @${ERROR}.gz` fi - MESSAGE="$NAME: [status: fail] [$jobid] LOG: $HASTE" + MESSAGE="$CORE_NAME: [status: fail] [$jobid] LOG: $HASTE" curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="fail" -d log="$HASTE" http://buildbot.fiveforty.net/build_entry/ else - MESSAGE="$NAME: [status: fail] [$jobid]" + MESSAGE="$CORE_NAME: [status: fail] [$jobid]" fi fi @@ -308,13 +308,13 @@ build_libretro_generic_makefile() { export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-opengl" export FORMAT_COMPILER_TARGET_ALT="${FORMAT_COMPILER_TARGET}" fi - elif [ "${COMMAND}" = "HIGAN" ] || [ "${COMMAND}" = "BSNES" ] || [ "${NAME}" = "bsnes_cplusplus98" ]; then + elif [ "${COMMAND}" = "HIGAN" ] || [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ] || [ "${NAME}" = "bsnes_cplusplus98" ]; then OUT="out" fi cd "${SUBDIR}" - if [ "${COMMAND}" = "BSNES" ]; then + if [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ]; then CORE="${CORE:-${NAME}_accuracy ${NAME}_balanced ${NAME}_performance}" elif [ "${NAME}" = "mame2014" ]; then CORE="${CORE:-${NAME} mess2014 ume2014}" @@ -324,12 +324,11 @@ build_libretro_generic_makefile() { eval "set -- $CORE" for core do - NAME="$core" - LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log" + LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${core}_${PLATFORM}.log" - if [ "${COMMAND}" = "BSNES" ]; then + if [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ]; then CORE_ARGS="profile=${core##*_} ${ARGS}" - elif [ "${NAME}" = "mame2014" ] || [ "${NAME}" = "mess2014" ] || [ "${NAME}" = "ume2014" ]; then + elif [ "${NAME}" = "mame2014" ]; then CORE_ARGS="TARGET=${core%%[0-9]*} ${ARGS}" else CORE_ARGS="${ARGS}" @@ -350,9 +349,9 @@ build_libretro_generic_makefile() { fi if [ $? -eq 0 ]; then - echo buildbot job: $jobid ${NAME} cleanup success! + echo buildbot job: $jobid ${core} cleanup success! else - echo buildbot job: $jobid ${NAME} cleanup failed! + echo buildbot job: $jobid ${core} cleanup failed! fi fi @@ -368,7 +367,7 @@ build_libretro_generic_makefile() { echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" 2>&1 | tee -a "$LOGFILE" ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} 2>&1 | tee -a "$LOGFILE" - find . -mindepth 2 -name "${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" -exec cp -f "{}" . \; + find . -mindepth 2 -name "${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" -exec cp -f "{}" . \; elif [ "${COMMAND}" = "HIGAN" ]; then platform="" echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE" @@ -380,20 +379,20 @@ build_libretro_generic_makefile() { fi if [ "${MAKEPORTABLE}" == "YES" ]; then - echo "BUILD CMD $WORK/retrolink.sh ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" - $WORK/retrolink.sh ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" + echo "BUILD CMD $WORK/retrolink.sh ${OUT}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" + $WORK/retrolink.sh ${OUT}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" fi if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then - ${STRIP:=strip} -s ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} + ${STRIP:=strip} -s ${OUT}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} fi - echo "COPY CMD: cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" - cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" - cp -v ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} + echo "COPY CMD: cp -v ${OUT}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a "$LOGFILE" + cp -v ${OUT}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a "$LOGFILE" + cp -v ${OUT}/${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${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 if [ "${COMMAND}" = "GENERIC_GL" ]; then @@ -654,7 +653,7 @@ while read line; do CORES_BUILT=YES echo "buildbot job: building $NAME" case "${COMMAND}" in - BSNES|CMAKE|GENERIC|GENERIC_GL|HIGAN ) + 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}" ;; diff --git a/recipes/apple/cores-ios-generic b/recipes/apple/cores-ios-generic index a23a128b..63f670a5 100644 --- a/recipes/apple/cores-ios-generic +++ b/recipes/apple/cores-ios-generic @@ -2,9 +2,9 @@ 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile . atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic index 8e33c28b..40c8360d 100644 --- a/recipes/apple/cores-ios9-generic +++ b/recipes/apple/cores-ios9-generic @@ -2,9 +2,9 @@ 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile . atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index d1dd9531..c849d2db 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -2,9 +2,9 @@ 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile . atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DCMAKE_BUILD_TYPE="Release" --target citra_libretro craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic index bbf13083..b786bf32 100644 --- a/recipes/linux/cores-linux-armhf-generic +++ b/recipes/linux/cores-linux-armhf-generic @@ -3,9 +3,9 @@ 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile . atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume platform=armv7-neon-hardfloat diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index a5b88659..671c2006 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -5,9 +5,9 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master YES GENERIC Makefile . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DCMAKE_BUILD_TYPE="Release" -DENABLE_WEB_SERVICE=0 -DUSE_SYSTEM_CURL=1 --target citra_libretro diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic index b2aa3c4c..31ba0c1d 100644 --- a/recipes/linux/cores-linux-x86-generic +++ b/recipes/linux/cores-linux-x86-generic @@ -4,9 +4,9 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master YES GENERIC Makefile . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index d968c82a..f191b54f 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -5,9 +5,9 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master YES GENERIC Makefile . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index 600f5315..af536aef 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -5,9 +5,9 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master YES GENERIC Makefile . -bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES BSNES Makefile . +bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile . -bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES BSNES Makefile . +bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . chailove libretro-chailove https://github.com/RobLoach/ChaiLove.git master YES GENERIC Makefile . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . From bcaf9efe1d7d5c2eddb86022d113d05c59370b8d Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 24 Dec 2017 17:33:21 -0800 Subject: [PATCH 3/4] 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 From 7db96992bcefdcbef096f7e858a35d944eccb964 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 24 Dec 2017 17:41:55 -0800 Subject: [PATCH 4/4] libretro-buildbot-recipe.sh: Use $NAME instead of the HIGAN command. --- libretro-buildbot-recipe.sh | 14 ++++++++------ recipes/apple/cores-osx-x64-generic | 4 ++-- recipes/linux/cores-linux-x64-generic | 4 ++-- recipes/windows/cores-windows-x64_seh-generic | 4 ++-- recipes/windows/cores-windows-x86_dw2-generic | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 52fcf446..205709e5 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -287,7 +287,6 @@ build_libretro_generic_makefile() { MAKEFILE=$4 PLATFORM=$5 ARGS=$6 - OUT=. ENTRY_ID="" @@ -308,10 +307,13 @@ build_libretro_generic_makefile() { export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-opengl" export FORMAT_COMPILER_TARGET_ALT="${FORMAT_COMPILER_TARGET}" fi - elif [ "${COMMAND}" = "HIGAN" ] || [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ] || [ "${NAME}" = "bsnes_cplusplus98" ]; then - OUT="out" fi + case "{$NAME}" in + *higan_sfc*|*bsnes* ) OUT="out" ;; + * ) OUT=. ;; + esac + cd "${SUBDIR}" if [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ]; then @@ -339,7 +341,7 @@ build_libretro_generic_makefile() { echo -------------------------------------------------- 2>&1 | tee -a "$LOGFILE" if [ -z "${NOCLEAN}" ] && [ -f "${MAKEFILE}" ] && [ "${COMMAND}" != "CMAKE" ]; then - if [ "${COMMAND}" = "HIGAN" ]; then + if [ "${NAME}" = "higan_sfc" ] || [ "${NAME}" = "higan_sfc_balanced" ]; then rm -fv obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" rm -fv out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" else @@ -368,7 +370,7 @@ build_libretro_generic_makefile() { ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} 2>&1 | tee -a "$LOGFILE" find . -mindepth 2 -name "${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" -exec cp -f "{}" . \; - elif [ "${COMMAND}" = "HIGAN" ]; then + elif [ "${NAME}" = "higan_sfc" ] || [ "${NAME}" = "higan_sfc_balanced" ]; then platform="" echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE" ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE" @@ -651,7 +653,7 @@ while read line; do CORES_BUILT=YES echo "buildbot job: building $NAME" case "${COMMAND}" in - CMAKE|GENERIC|GENERIC_GL|HIGAN ) + CMAKE|GENERIC|GENERIC_GL ) 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}" ;; diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index c849d2db..a59e245b 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -29,8 +29,8 @@ gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=clang++ target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=clang++ target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=clang++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=clang++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index 671c2006..73546ebd 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -35,8 +35,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . PTR64=1 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index f191b54f..b1db3740 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -34,8 +34,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . PTR64=1 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index af536aef..d1eeb228 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -33,8 +33,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . PTR64=0 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .