diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 3fac9f9f..81e213b3 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -19,6 +19,7 @@ echo $LOGDATE BOT: $BOT FORCE: $FORCE JOBS: $JOBS ORIGPATH=$PATH WORK=$PWD + echo Original PATH: $PATH while read line; do @@ -236,7 +237,7 @@ build_libretro_generic_makefile() { echo "compiling..." if [ -z "${ARGS}" ]; then echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log else if [ "${NAME}" = "mame2010" ]; then @@ -244,7 +245,7 @@ build_libretro_generic_makefile() { ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools fi echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log fi if [ $? -eq 0 ]; then @@ -259,12 +260,12 @@ build_libretro_generic_makefile() { cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" JOBS=$OLDJ } @@ -299,18 +300,18 @@ build_libretro_leiradel_makefile() { echo "compiling..." echo "build command: ${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARGS} platform=${PLATFORM}_${ARGS} -j${JOBS}" - ${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARGS} platform=${PLATFORM}_${ARGS} -j${JOBS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARGS} platform=${PLATFORM}_${ARGS} -j${JOBS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="$1 build successful [$jobid]" cp -v ${NAME}_libretro.${PLATFORM}_${ARG1}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARG1}/${NAME}_libretro${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" JOBS=$OLDJ } @@ -353,12 +354,12 @@ build_libretro_generic_theos() { MESSAGE="$1 build successful [$jobid]" cp -v objs/obj/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" } @@ -389,10 +390,10 @@ build_libretro_generic_jni() { echo "compiling for ${a}..." if [ -z "${ARGS}" ]; then echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" - ${NDK} -j${JOBS} APP_ABI=${a} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + ${NDK} -j${JOBS} APP_ABI=${a} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log else echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " - ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log + ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log fi if [ $? -eq 0 ]; then MESSAGE="$1-$a build successful [$jobid]" @@ -400,11 +401,11 @@ build_libretro_generic_jni() { buildbot_log "$MESSAGE" cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1-$a build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" fi done @@ -448,12 +449,12 @@ build_libretro_bsnes_jni() { MESSAGE="$1 build successful [$jobid]" cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" done } @@ -487,22 +488,22 @@ build_libretro_generic_gl_makefile() { echo "compiling..." if [ -z "${ARGS}" ]; then echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log else echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log fi if [ $? -eq 0 ]; then MESSAGE="$1 build successful [$jobid]" cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" reset_compiler_targets @@ -540,13 +541,13 @@ build_libretro_bsnes() { echo "compiling..." if [ "${PROFILE}" = "cpp98" ]; then - ${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}" &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}" &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log elif [ "${PROFILE}" = "bnes" ]; then echo "build command: ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET} - ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET} &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET} &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log else echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS} &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS} &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log fi if [ $? -eq 0 ]; then @@ -559,12 +560,12 @@ build_libretro_bsnes() { cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE" fi echo BUILDBOT JOB: $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" } @@ -720,10 +721,10 @@ while read line; do BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi OLDFORCE=$FORCE @@ -821,10 +822,10 @@ while read line; do BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi cd $WORK @@ -849,10 +850,10 @@ while read line; do BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi OUT=`git submodule foreach git pull origin master` cd $WORK @@ -867,7 +868,7 @@ while read line; do fi if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then - touch /tmp/built-cores + touch $TMPDIR/built-cores CORES_BUILT=YES echo building core... if [ "${COMMAND}" = "GENERIC" ]; then @@ -976,10 +977,10 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi cd $WORK @@ -1002,7 +1003,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then done < $1.ra if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend echo "BUILDBOT JOB: $jobid Compiling Shaders" echo @@ -1051,7 +1052,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then cp -rf media/libretrodb/cursors android/phoenix/assets/database/ cp -rf media/overlays/* android/phoenix/assets/overlays/ cp -rf media/shaders_glsl/* android/phoenix/assets/shaders/shaders_glsl/ - cp -rf media/shaders_glsl /tmp/ + cp -rf media/shaders_glsl $TMPDIR/ touch android/phoenix/assets/cheats/.empty-folder touch android/phoenix/assets/saves/.empty-folder touch android/phoenix/assets/states/.empty-folder @@ -1064,23 +1065,23 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then cd android/phoenix rm bin/*.apk - $NDK clean &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - $NDK -j${JOBS} &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - ant clean &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - android update project --path . --target android-22 &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - android update project --path libs/googleplay --target android-21 &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - android update project --path libs/appcompat --target android-21 &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - ant debug &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + $NDK clean &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + $NDK -j${JOBS} &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + ant clean &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + android update project --path . --target android-22 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + android update project --path libs/googleplay --target android-21 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + android update project --path libs/appcompat --target android-21 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + ant debug &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE fi - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log buildbot_log "$MESSAGE" fi fi @@ -1154,10 +1155,10 @@ if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi cd $WORK @@ -1181,7 +1182,7 @@ if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then done < $1.ra if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend echo "BUILDBOT JOB: $jobid Compiling Shaders" echo @@ -1268,10 +1269,10 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi cd $WORK @@ -1293,7 +1294,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = echo done < $1.ra if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo @@ -1349,13 +1350,13 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = echo "building..." echo "build command: $MAKE -j${JOBS}" - $MAKE -j${JOBS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + $MAKE -j${JOBS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log strip -s retroarch.exe if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log buildbot_log "$MESSAGE" echo "Packaging" @@ -1430,11 +1431,11 @@ EOF cp -rf gfx/video_filters/*.dll windows/filters/video cp -rf gfx/video_filters/*.filt windows/filters/video else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log buildbot_log "$MESSAGE" fi fi @@ -1509,10 +1510,10 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi cd $WORK @@ -1535,7 +1536,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then done < $1.ra if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo @@ -1545,18 +1546,18 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then cp -v $RARCH_DIST_DIR/*.a . #ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_psp1." $2 }' |sh - ./dist-cores.sh psp &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + ./dist-cores.sh psp &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE fi buildbot_log "$MESSAGE" - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log echo "Packaging" echo ============================================ @@ -1638,10 +1639,10 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi cd $WORK @@ -1665,7 +1666,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then done < $1.ra if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo @@ -1676,18 +1677,18 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then cp -v $RARCH_DIST_DIR/*.a . #ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_wii." $2 }' |sh - sh ./dist-cores.sh wii &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + sh ./dist-cores.sh wii &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE fi buildbot_log "$MESSAGE" - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log cd $WORK/$RADIR fi @@ -1785,10 +1786,10 @@ then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi cd $WORK @@ -1812,7 +1813,7 @@ then echo done < $1.ra if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo @@ -1822,19 +1823,19 @@ then cp -v $RARCH_DIST_DIR/*.a . #ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_ngc." $2 }' |sh - sh ./dist-cores.sh ngc &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + sh ./dist-cores.sh ngc &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE fi buildbot_log "$MESSAGE" - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log cd .. echo "Packaging" @@ -1918,10 +1919,10 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi echo $OUT $BUILD $FORCE $FORCE_RETROARCH_BUILD @@ -1947,7 +1948,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then done < $1.ra if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo @@ -1957,18 +1958,18 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then cp -v $RARCH_DIST_DIR/*.a . #ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_ctr." $2 }' |sh - JOBS=1 sh ./dist-cores.sh ctr &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + JOBS=1 sh ./dist-cores.sh ctr &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE fi buildbot_log "$MESSAGE" - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log cd $WORK/$RADIR @@ -2052,10 +2053,10 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then BUILD="NO" else BUILD="YES" - echo >> /home/buildbot/changelog - echo $NAME $LOGDATE >> /home/buildbot/changelog - echo --------------------------------------- >> /home/buildbot/changelog - echo $CLOG >> /home/buildbot/changelog + echo >> $CLOGFILE + echo $NAME $LOGDATE >> $CLOGFILE + echo --------------------------------------- >> $CLOGFILE + echo "$CLOG" >> $CLOGFILE fi fi echo $OUT $BUILD $FORCE $FORCE_RETROARCH_BUILD @@ -2081,7 +2082,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then done < $1.ra if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - touch /tmp/built-frontend + touch $TMPDIR/built-frontend cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo @@ -2091,18 +2092,18 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then cp -v $RARCH_DIST_DIR/*.a . #ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_vita." $2 }' |sh - JOBS=1 sh ./dist-cores.sh vita &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + JOBS=1 sh ./dist-cores.sh vita &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log if [ $? -eq 0 ]; then MESSAGE="retroarch build successful [$jobid]" echo $MESSAGE else - ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` + ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log | tail -n 100` HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE" echo $MESSAGE fi buildbot_log "$MESSAGE" - echo BUILDBOT JOB: $MESSAGE >> /tmp/log/${BOT}/${LOGDATE}.log + echo BUILDBOT JOB: $MESSAGE >> $TMPDIR/log/${BOT}/${LOGDATE}.log cd $WORK/$RADIR