Add logging

This commit is contained in:
twinaphex 2015-01-30 11:38:10 +01:00
parent 89ec65d9b7
commit 50806e43a3
3 changed files with 139 additions and 4 deletions

View File

@ -59,6 +59,15 @@ build_libretro_pcsx_rearmed_interpreter() {
fi
"${MAKE}" -f Makefile.libretro USE_DYNAREC=0 platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build PCSX ReARMed'
cp "pcsx_rearmed_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/pcsx_rearmed_interpreter${FORMAT}.${FORMAT_EXT}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "pcsx_rearmed_interpreter" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "pcsx_rearmed_interpreter" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'PCSX ReARMed not fetched, skipping ...'
fi
@ -81,6 +90,15 @@ build_libretro_generic_makefile_subcore() {
fi
make -f ${4} platform=${5} -j$JOBS || die "Failed to build ${2}"
cp ${2}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${2}_libretro$FORMAT.${FORMAT_EXT}
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "${2}" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "${2}" >> $CORE_BUILD_FAIL_LOG
fi
fi
fi
}
@ -100,8 +118,26 @@ build_libretro_fba_cps1() {
copy_core_to_dist() {
if [ "$FORMAT_COMPILER_TARGET" = "theos_ios" ]; then
cp "objs/obj/${1}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "${1}" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "${1}" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
cp "${1}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "${1}" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "${1}" >> $CORE_BUILD_FAIL_LOG
fi
fi
fi
}
@ -403,6 +439,15 @@ build_libretro_mess() {
"${MAKE}" -f Makefile.libretro "TARGET=mess" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME'
fi
cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "mess" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "mess" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'MAME not fetched, skipping ...'
fi
@ -429,6 +474,15 @@ rebuild_libretro_mess() {
"${MAKE}" -f Makefile.libretro "TARGET=mess" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME'
fi
cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "mess" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "mess" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'MAME not fetched, skipping ...'
fi
@ -455,6 +509,15 @@ build_libretro_ume() {
"${MAKE}" -f Makefile.libretro "TARGET=ume" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME'
fi
cp "ume_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "ume" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "ume" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'MAME not fetched, skipping ...'
fi
@ -481,6 +544,15 @@ rebuild_libretro_ume() {
"${MAKE}" -f Makefile.libretro "TARGET=ume" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME'
fi
cp "ume_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "ume" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "ume" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'MAME not fetched, skipping ...'
fi
@ -502,6 +574,15 @@ build_libretro_bsnes_modern() {
fi
"${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" compiler="${4}" ui='target-libretro' profile="${3}" "-j${JOBS}" || die "Failed to build ${1} ${3} core"
cp -f "out/${1}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${1}_${3}_libretro${FORMAT}.${FORMAT_EXT}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "${1}_${3}" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "${1}_${3}" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo "${1} ${3} not fetched, skipping ..."
fi
@ -531,6 +612,15 @@ build_libretro_bsnes_cplusplus98() {
fi
"${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}"
cp "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${CORENAME}_libretro${FORMAT}.${FORMAT_EXT}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "${CORENAME}" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "${CORENAME}" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo "${CORENAME} not fetched, skipping ..."
fi
@ -548,6 +638,15 @@ build_libretro_bnes() {
fi
"${MAKE}" -f Makefile ${COMPILER} "-j${JOBS}" compiler="${CXX11}" || die 'Failed to build bNES'
cp "libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/bnes_libretro${FORMAT}.${FORMAT_EXT}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "bnes" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "bnes" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'bNES not fetched, skipping ...'
fi
@ -586,6 +685,15 @@ build_libretro_mupen64() {
"${MAKE}" platform="${FORMAT_COMPILER_TARGET_ALT}" ${COMPILER} "-j${JOBS}" || die 'Failed to build Mupen 64'
fi
cp "mupen64plus_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
if [ "$?" -eq "0" ]; then
if [ -n $CORE_BUILD_SUCCESS_LOG ]; then
echo "mupen64plus" >> $CORE_BUILD_SUCCESS_LOG
fi
else
if [ -n $CORE_BUILD_FAIL_LOG ]; then
echo "mupen64plus" >> $CORE_BUILD_FAIL_LOG
fi
fi
else
echo 'Mupen64 Plus not fetched, skipping ...'
fi

View File

@ -91,6 +91,13 @@ echo "STRIP = $STRIP"
mkdir -p "$RARCH_DIST_DIR"
if [ -n "$CORE_BUILD_SUCCESS_LOG" ]; then
rm -f $CORE_BUILD_SUCCESS_LOG
fi
if [ -n "$CORE_BUILD_FAIL_LOG" ]; then
rm -f $CORE_BUILD_FAIL_LOG
fi
if [ $1 ]; then
$1
else
@ -153,3 +160,12 @@ else
build_libretro_gpsp
build_libretro_emux
fi
if [[ -n "$CORE_BUILD_SUCCESS_LOG" && -r "$CORE_BUILD_SUCCESS_LOG" ]]; then
echo "$(wc -l < $CORE_BUILD_SUCCESS_LOG) core(s) successfully built:"
$CORE_BUILD_SHOW_CMD $CORE_BUILD_SUCCESS_LOG
fi
if [[ -n "$CORE_BUILD_FAIL_LOG" && -r "$CORE_BUILD_FAIL_LOG" ]]; then
echo "$(wc -l < $CORE_BUILD_FAIL_LOG) core(s) failed to build:"
$CORE_BUILD_SHOW_CMD $CORE_BUILD_FAIL_LOG
fi

View File

@ -22,10 +22,12 @@ if [[ -n "$PROCESSOR_ARCHITEW6432" && $PROCESSOR_ARCHITEW6432 -eq "AMD64" ]]; th
X86=true && X86_64=true
fi
if command -v nproc >/dev/null; then
JOBS=$(nproc)
else
JOBS=1
if [ -z "$JOBS" ]; then
if command -v nproc >/dev/null; then
JOBS=$(nproc)
else
JOBS=1
fi
fi
# Platform Assignment
@ -137,6 +139,15 @@ export RA_ANDROID_API=android-18
# Retroarch minimum API level (defines low end android version compatability)
export RA_ANDROID_MIN_API=android-9
# Core build files
export CORE_BUILD_SUCCESS_LOG=$(pwd)/build-success.log
export CORE_BUILD_FAIL_LOG=$(pwd)/build-fail.log
if command -v column >/dev/null; then
CORE_BUILD_SHOW_CMD=column
else
CORE_BUILD_SHOW_CMD=cat
fi
#USER DEFINES
#------------
#These options should be defined inside your own