From 5b9cb80e8f2b004d08747a38978926206b4a48e2 Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 1 Dec 2017 15:51:07 -0800 Subject: [PATCH] libretro-buildbot-recipe.sh: Build higan and nSide in the generic make function. --- libretro-buildbot-recipe.sh | 91 +++++-------------- recipes/apple/cores-osx-x64-generic | 3 +- 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, 33 insertions(+), 73 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index ae26a94a..7069e1d9 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -305,6 +305,7 @@ build_libretro_generic_makefile() { PLATFORM=$5 ARGS=$6 JOBS=$JOBS + OUT=. ENTRY_ID="" @@ -323,6 +324,8 @@ build_libretro_generic_makefile() { if [ "${COMMAND}" = "CMAKE" ] && [ "${SUBDIR}" != . ]; then rm -rf -- "$SUBDIR" mkdir -p -- "$SUBDIR" + elif [ "${COMMAND}" = "HIGAN" ]; then + OUT="out" fi cd "${SUBDIR}" @@ -332,7 +335,10 @@ build_libretro_generic_makefile() { echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log if [ -z "${NOCLEAN}" ] && [ -f "${MAKEFILE}" ] && [ "${COMMAND}" != "CMAKE" ]; then - if [ -z "${ARGS}" ]; 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 + elif [ -z "${ARGS}" ]; then echo "CLEANUP CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log ${HELPER} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log else @@ -371,6 +377,10 @@ build_libretro_generic_makefile() { fi 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}" ${ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} ${ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log elif [ -z "${ARGS}" ]; then echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log ${HELPER} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log @@ -380,17 +390,16 @@ build_libretro_generic_makefile() { fi if [ "${MAKEPORTABLE}" == "YES" ]; then - echo "BUILD CMD $WORK/retrolink.sh ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log - $WORK/retrolink.sh ${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 $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 fi if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then - ${STRIP:=strip} -s ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} + ${STRIP:=strip} -s ${OUT}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} fi - echo "COPY CMD: cp -v ${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 ${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 ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} + 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 RET=$? ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log @@ -681,55 +690,6 @@ build_libretro_bsnes() { ENTRY_ID="" } -build_libretro_higan() { - NAME=$1 - DIR=$2 - SUBDIR=$3 - MAKEFILE=$4 - PLAT=$5 - BSNESCOMPILER=$7 - ARGS=$8 - - ENTRY_ID="" - - if [ -n "$LOGURL" ]; then - 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 - - cd $DIR/$SUBDIR - echo -------------------------------------------------- 2>&1 | tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - if [ -z "${NOCLEAN}" ]; then - - rm -f obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - rm -f out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - - if [ $? -eq 0 ]; then - echo buildbot job: $jobid $1 cleanup success! - else - echo buildbot job: $jobid $1 cleanup failed! - fi - fi - - unset $platform - unset $PLATFORM - platform="" - PLATFORM="" - - echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} compiler=${BSNESCOMPILER} ${ARGS} -j${JOBS}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - ${HELPER} ${MAKE} -f ${MAKEFILE} compiler=${BSNESCOMPILER} ${ARGS} -j${JOBS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - - echo "COPY CMD cp -fv" "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - cp -fv "out/${NAME}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - cp -fv "out/${NAME}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} - - RET=$? - ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLAT}.log - buildbot_handle_message "$RET" "$ENTRY_ID" "${NAME}-${PROFILE}" "$jobid" "$ERROR" - - ENTRY_ID="" -} - # ----- buildbot ----- echo buildbot starting @@ -874,16 +834,15 @@ while read line; do CORES_BUILT=YES echo "buildbot job: building $NAME" case "${COMMAND}" in - GENERIC|CMAKE ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${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}" ;; - GENERIC_GL ) build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;; - GENERIC_JNI ) build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; - BSNES_JNI ) build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; - GENERIC_THEOS ) build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; - BSNES ) build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11} ;; - HIGAN ) build_libretro_higan $NAME $DIR $SUBDIR $MAKEFILE $PLATFORM ${FORMAT_COMPILER_TARGET} ${CXX11} "${ARGS}" ;; - * ) : ;; + GENERIC|CMAKE|HIGAN ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${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}" ;; + GENERIC_GL ) build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;; + GENERIC_JNI ) build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; + BSNES_JNI ) build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; + GENERIC_THEOS ) build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;; + BSNES ) build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11} ;; + * ) : ;; esac echo "Cleaning repo state after build $URL..." git clean -xdf diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index 67707a11..4802321b 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -33,7 +33,8 @@ gme libretro-gme https://github.com/libretro/libretro-gme.git master SUBMODULE Y gpsp libretro-gpsp https://github.com/libretro/gpsp.git master PROJECT YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master PROJECT YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master PROJECT YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan compiler=clang++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide compiler=clang++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master PROJECT YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master PROJECT YES GENERIC Makefile.libretro . mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master PROJECT YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index bd24f9fc..36aac9d5 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -38,8 +38,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master PROJECT YES GENER gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master PROJECT YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master PROJECT YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master PROJECT YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master PROJECT YES GENERIC Makefile.libretro . PTR64=1 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master PROJECT YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index 0594b0aa..379c6f23 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -37,8 +37,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master PROJECT YES GENER gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master PROJECT YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master PROJECT YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master PROJECT YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master PROJECT YES GENERIC Makefile.libretro . PTR64=1 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master PROJECT YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index c4173677..20f3b675 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -36,8 +36,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master PROJECT YES GENER gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master PROJECT YES GENERIC Makefile . hatari libretro-hatari https://github.com/libretro/hatari.git master PROJECT YES GENERIC Makefile.libretro . -higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan target=libretro binary=library -higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide target=libretro binary=library +higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro PROJECT YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library +higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master PROJECT YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library lutro libretro-lutro https://github.com/libretro/libretro-lutro master PROJECT YES GENERIC Makefile . mame libretro-mame https://github.com/libretro/mame.git master PROJECT YES GENERIC Makefile.libretro . PTR64=0 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master PROJECT YES GENERIC Makefile .