indentation fixes

This commit is contained in:
radius 2015-10-18 14:30:45 -05:00
parent ec5abbe000
commit 1645165c98

View file

@ -197,8 +197,8 @@ cd "${BASE_DIR}"
# logs to alcarobot
buildbot_log() {
echo === BUILDBOT MSG: $MESSAGE ===
MESSAGE=`echo -e $1`
echo === BUILDBOT MSG: $MESSAGE ===
MESSAGE=`echo -e $1`
HASH=`echo -n "$MESSAGE" | openssl sha1 -hmac $SIG | cut -f 2 -d " "`
curl --max-time 30 --data "message=$MESSAGE&sign=$HASH" $LOGURL
@ -217,7 +217,7 @@ build_libretro_generic_makefile() {
JOBS=$JOBS
buildbot_log "$1 build starting [$jobid]"
BUILDBOT_DBG1="NAME: $NAME DIR: $DIR SUBDIR: $SUBDIR MAKEFILE: $MAKEFILE PLATFORM: $PLATFORM ARGS: $ARGS CC: $CC CXX: $CXX"
BUILDBOT_DBG1="NAME: $NAME DIR: $DIR SUBDIR: $SUBDIR MAKEFILE: $MAKEFILE PLATFORM: $PLATFORM ARGS: $ARGS CC: $CC CXX: $CXX"
cd $DIR
cd $SUBDIR
@ -245,34 +245,34 @@ build_libretro_generic_makefile() {
echo "compiling..."
if [ "${NAME}" == "mame2010" ]; then
echo "build command: ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS}"
BUILDBOT_DBG3="build command: PLATFORM="" platform="" ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS}"
PLATFORM="" platform="" ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS} | tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
JOBS=$OLDJ
fi
if [ "${NAME}" == "mame2010" ]; then
echo "build command: ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS}"
BUILDBOT_DBG3="build command: PLATFORM="" platform="" ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS}"
PLATFORM="" platform="" ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS} | tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
JOBS=$OLDJ
fi
if [ -z "${ARGS}" ]; then
BUILDBOT_DBG2="build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
BUILDBOT_DBG2="build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
else
BUILDBOT_DBG2="build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}"
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}"
BUILDBOT_DBG2="build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}"
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
fi
if [ "${MAKEPORTABLE}" == "YES" ]; then
echo "$1 running retrolink [$jobid]"
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
echo "$1 running retrolink [$jobid]"
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
echo === BUILDBOT VARS: $BUILDBOT_DBG1 === | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
echo === BUILDBOT VARS: $BUILDBOT_DBG3 === | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
echo === BUILDBOT VARS: $BUILDBOT_DBG2 === | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
echo === BUILDBOT VARS: $BUILDBOT_DBG1 === | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
echo === BUILDBOT VARS: $BUILDBOT_DBG3 === | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
echo === BUILDBOT VARS: $BUILDBOT_DBG2 === | 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}
if [ $? -eq 0 ]; then
cp -v ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
if [ $? -eq 0 ]; then
MESSAGE="$1 build succeeded [$jobid]"
if [ "${PLATFORM}" == "windows" -o "${PLATFORM}" == "unix" ]; then
strip -s ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
@ -280,7 +280,7 @@ build_libretro_generic_makefile() {
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
fi
@ -334,13 +334,13 @@ build_libretro_leiradel_makefile() {
echo "build command: ${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARGS} platform=${PLATFORM}_${ARGS} -j${JOBS}"
${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARGS} platform=${PLATFORM}_${ARGS} -j${JOBS} | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
cp -v ${NAME}_libretro.${PLATFORM}_${ARG1}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARG1}/${NAME}_libretro${LIBSUFFIX}.${FORMAT_EXT}
cp -v ${NAME}_libretro.${PLATFORM}_${ARG1}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARG1}/${NAME}_libretro${LIBSUFFIX}.${FORMAT_EXT}
if [ $? -eq 0 ]; then
MESSAGE="$1 build succeeded [$jobid]"
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
fi
echo BUILDBOT JOB: $MESSAGE
@ -384,7 +384,7 @@ build_libretro_generic_jni() {
${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log
fi
cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
if [ $? -eq 0 ]; then
MESSAGE="$1-$a build succeeded [$jobid]"
echo BUILDBOT JOB: $MESSAGE
@ -392,7 +392,7 @@ build_libretro_generic_jni() {
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1-$a build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo BUILDBOT JOB: $MESSAGE
echo BUILDBOT JOB: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}.log
@ -449,13 +449,13 @@ build_libretro_bsnes_jni() {
${NDK} -j${JOBS} APP_ABI=${a}
fi
cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
if [ $? -eq 0 ]; then
MESSAGE="$1 build succeeded [$jobid]"
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
fi
echo BUILDBOT JOB: $MESSAGE
@ -500,13 +500,13 @@ build_libretro_generic_gl_makefile() {
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
fi
cp -v ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
cp -v ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
if [ $? -eq 0 ]; then
MESSAGE="$1 build succeeded [$jobid]"
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
fi
echo BUILDBOT JOB: $MESSAGE
@ -558,19 +558,19 @@ build_libretro_bsnes() {
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
fi
if [ "${PROFILE}" = "cpp98" ]; then
cp -fv "out/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}"
elif [ "${PROFILE}" = "bnes" ]; then
cp -fv "${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}"
else
cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
if [ "${PROFILE}" = "cpp98" ]; then
cp -fv "out/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}"
elif [ "${PROFILE}" = "bnes" ]; then
cp -fv "${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}"
else
cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
if [ $? -eq 0 ]; then
MESSAGE="$1 build succeeded [$jobid]"
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
fi
echo BUILDBOT JOB: $MESSAGE
@ -719,7 +719,7 @@ while read line; do
echo ARGS: $ARGS
echo
echo
# repo is a regular repository
# repo is a regular repository
if [ "${TYPE}" = "PROJECT" ]; then
if [ -d "${DIR}/.git" ]; then
@ -737,7 +737,7 @@ while read line; do
OLDBUILD=$BUILD
echo $OUT $FORCE $BUILD
# workarounds for a few cores that might be built from the same source tree (it will be already up-to-date so it would be skipped otherwise)
# workarounds for a few cores that might be built from the same source tree (it will be already up-to-date so it would be skipped otherwise)
if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then
FORCE="YES"
BUILD="YES"
@ -823,7 +823,7 @@ while read line; do
BUILD="YES"
fi
# repo is a branch, need to make this more generic, currently only used for psp mednafen_pce
# repo is a branch, need to make this more generic, currently only used for psp mednafen_pce
elif [ "${TYPE}" = "psp_hw_render" ]; then
if [ -d "${DIR}/.git" ]; then
@ -847,7 +847,7 @@ while read line; do
BUILD="YES"
fi
# repo has submodules
# repo has submodules
elif [ "${TYPE}" == "SUBMODULE" ]; then
if [ -d "${DIR}/.git" ]; then
@ -1076,7 +1076,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
fi
@ -1293,7 +1293,7 @@ EOF
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
echo BUILDBOT JOB: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
@ -1409,7 +1409,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
fi
@ -1423,7 +1423,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
mkdir -p pkg/psp1/
mkdir -p pkg/psp1/cheats
cp -p $RARCH_DIST_DIR/../info/*.info pkg/psp1/cores/
cp -p $RARCH_DIST_DIR/../info/*.info pkg/psp1/cores/
fi
fi
@ -1537,7 +1537,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
fi
@ -1680,7 +1680,7 @@ then
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
fi
@ -1810,7 +1810,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
fi
@ -1825,7 +1825,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
mkdir -p pkg/3ds
mkdir -p pkg/3ds/remaps
mkdir -p pkg/3ds/cheats
mkdir -p pkg/3ds/cheats
cp -rf media/overlays/* pkg/3ds/overlays/
fi
fi
@ -1941,7 +1941,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100`
HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"`
HASTE=`echo $HASTE | cut -d"\"" -f4`
HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
echo $MESSAGE
fi
@ -1956,7 +1956,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
mkdir -p pkg/vita
mkdir -p pkg/vita/remaps
mkdir -p pkg/vita/cheats
mkdir -p pkg/vita/cheats
cp -rf media/overlays/* pkg/vita/overlays/
fi
fi