Merge pull request #579 from orbea/cleanup

libretro-buildbot-recipe.sh: Clean up some redundant code.
This commit is contained in:
Twinaphex 2017-11-07 01:17:50 +01:00 committed by GitHub
commit 32763dad5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -789,111 +789,14 @@ while read line; do
ARGS="" ARGS=""
TEMP=`echo $line | cut -f 10 -d " "` for number in {10...30}; do
if [ -n ${TEMP} ]; then TEMP="$(echo "$line" | cut -f "$number" -d " ")"
ARGS="${TEMP}" if [ -n "${TEMP}" ]; then
fi
TEMP=""
TEMP=`echo $line | cut -f 11 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 12 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 13 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 14 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 15 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 16 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 17 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 18 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 19 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 20 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 21 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 22 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 23 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 24 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 25 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 26 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 27 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 28 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 29 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut -f 30 -d " "`
if [ -n ${TEMP} ]; then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
done
ARGS="${ARGS# }"
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}" ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
BUILD="NO" BUILD="NO"
@ -930,82 +833,12 @@ while read line; do
FORCE_ORIG=$FORCE FORCE_ORIG=$FORCE
OLDBUILD=$BUILD OLDBUILD=$BUILD
if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then if [ "${PREVCORE}" = "mame2014" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "mess2014" ]; then
FORCE="YES" FORCE="YES"
BUILD="YES" BUILD="YES"
fi fi
if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES_JNI" ]; then if [ "${PREVCORE}" = "mess2014" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "ume2014" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "bsnes_mercury" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "bsnes_mercury" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES_JNI" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "gw" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "gw" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "fuse" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "fuse" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "81" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "81" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "snes9x-next" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "snes9x-next" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "vba_next" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "vba_next" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "emux_nes" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "emux_nes" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "emux_sms" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "emux_sms" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "mgba" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "mgba" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "snes9x_next" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "snes9x_next" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "bsnes_mercury" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "mame2014" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "mess2014" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "mess2014" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "ume2014" ]; then
FORCE="YES" FORCE="YES"
BUILD="YES" BUILD="YES"
fi fi
@ -1015,10 +848,22 @@ while read line; do
BUILD="YES" BUILD="YES"
fi fi
if [ "${PREVCORE}" = "mame2010" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "mame2010" ]; then for core in bsnes bsnes_mercury; do
if [ "${PREVCORE}" = "$core" ] && [ "${PREVBUILD}" = "YES" ]; then
if [ "${COMMAND}" = "BSNES" ] || [ "${COMMAND}" = "BSNES_JNI" ]; then
FORCE="YES" FORCE="YES"
BUILD="YES" BUILD="YES"
fi fi
fi
done
for core in 81 emux_nes emux_sms fuse gw mame2010 mgba snes9x_next snes9x-next vba_next; do
if [ "${PREVCORE}" = "$core" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "$core" ]; then
FORCE="YES"
BUILD="YES"
fi
done
cd $WORK cd $WORK
else else
echo "cloning repo $URL..." echo "cloning repo $URL..."
@ -1089,31 +934,22 @@ while read line; do
cd $WORK cd $WORK
fi fi
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ]; then
touch $TMPDIR/built-cores touch $TMPDIR/built-cores
CORES_BUILT=YES CORES_BUILT=YES
echo "buildbot job: building $NAME" echo "buildbot job: building $NAME"
if [ "${COMMAND}" = "GENERIC" ]; then case "${COMMAND}" in
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" GENERIC|CMAKE ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;;
elif [ "${COMMAND}" = "CMAKE" ]; then GENERIC_ALT ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;;
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" LEIRADEL ) build_libretro_leiradel_makefile $NAME $DIR $SUBDIR $MAKEFILE ${PLATFORM} "${ARGS}" ;;
elif [ "${COMMAND}" = "LEIRADEL" ]; then GENERIC_GL ) build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;;
build_libretro_leiradel_makefile $NAME $DIR $SUBDIR $MAKEFILE ${PLATFORM} "${ARGS}" GENERIC_JNI ) build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;;
elif [ "${COMMAND}" = "GENERIC_GL" ]; then BSNES_JNI ) build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;;
build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" GENERIC_THEOS ) build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;;
elif [ "${COMMAND}" = "GENERIC_ALT" ]; then BSNES ) build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11} ;;
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" HIGAN ) build_libretro_higan $NAME $DIR $SUBDIR $MAKEFILE $PLATFORM ${FORMAT_COMPILER_TARGET} ${CXX11} "${ARGS}" ;;
elif [ "${COMMAND}" = "GENERIC_JNI" ]; then * ) : ;;
build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" esac
elif [ "${COMMAND}" = "BSNES_JNI" ]; then
build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" = "GENERIC_THEOS" ]; then
build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" = "BSNES" ]; then
build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
elif [ "${COMMAND}" = "HIGAN" ]; then
build_libretro_higan $NAME $DIR $SUBDIR $MAKEFILE $PLATFORM ${FORMAT_COMPILER_TARGET} ${CXX11} "${ARGS}"
fi
else else
echo "buildbot job: building $NAME up-to-date" echo "buildbot job: building $NAME up-to-date"
fi fi