From dbd4b3b45c369ef88cb0ced11b91a85e957aba29 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 11 May 2019 19:41:23 +0200 Subject: [PATCH] libretro-buildbot-recipe.sh - optimizations --- libretro-buildbot-recipe.sh | 262 ++++++++++++++++++------------------ 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index c0c5a6bc..4f9dda68 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -48,7 +48,7 @@ read_link() done PHYS_DIR=$(pwd -P) RESULT="$PHYS_DIR/$TARGET_FILE" - echo $RESULT + echo "$RESULT" } convert_xmb_assets() @@ -121,11 +121,11 @@ if [ "${CORE_JOB}" == "YES" ]; then if [ "${PLATFORM}" = "android" ]; then if [ -n "$ABI_OVERRIDE" ]; then - echo ABIS-pre: $TARGET_ABIS - echo OVERRIDE: ${ABI_OVERRIDE} + echo "ABIS-pre: $TARGET_ABIS" + echo "OVERRIDE: ${ABI_OVERRIDE}" TARGET_ABIS=${ABI_OVERRIDE} export TARGET_ABIS=${ABI_OVERRIDE} - echo ABIS-post: $TARGET_ABIS + echo "ABIS-post: $TARGET_ABIS" fi IFS=' ' read -ra ABIS <<< "$TARGET_ABIS" for a in "${ABIS[@]}"; do @@ -229,7 +229,7 @@ cd "${BASE_DIR}" buildbot_log() { - echo buildbot message: $MESSAGE + echo "buildbot message: $MESSAGE" MESSAGE=`echo -e $1` if [ -n "$LOGURL" ]; then @@ -273,7 +273,7 @@ buildbot_handle_message() { fi fi - echo buildbot job: $MESSAGE + echo "buildbot job: $MESSAGE" buildbot_log "$MESSAGE" # used by Travis-CI to exit immediately if a core build fails, instead of trying to build RA anyways (for static/console builds) @@ -345,14 +345,14 @@ build_libretro_generic_makefile() { OUTPUT="$RARCH_DIST_DIR/${DIST}/${CORENAM}" fi - echo -------------------------------------------------- | tee "$LOGFILE" + echo '--------------------------------------------------' | tee "$LOGFILE" cat $TMPDIR/vars | tee -a "$LOGFILE" - echo -------------------------------------------------- | tee -a "$LOGFILE" + echo '--------------------------------------------------' | tee -a "$LOGFILE" if [ -z "${NOCLEAN}" ] && [ -f "${MAKEFILE}" ] && [ "${COMMAND}" != "CMAKE" ]; then if [ "${NAME}" = "higan_sfc" ] || [ "${NAME}" = "higan_sfc_balanced" ]; then - rm -fv obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" - rm -fv out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" + rm -f obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" + rm -f out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE" elif [ "${COMMAND}" = "LEIRADEL" ]; then eval "set -- ${HELPER} ${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARG1} platform=${PLATFORM}_${CORE_ARGS} -j${JOBS} clean" echo "CLEANUP CMD: $*" 2>&1 | tee -a "$LOGFILE" @@ -364,13 +364,13 @@ build_libretro_generic_makefile() { fi if [ $? -eq 0 ]; then - echo buildbot job: $jobid ${core} cleanup success! + echo "buildbot job: $jobid ${core} cleanup success!" else - echo buildbot job: $jobid ${core} cleanup failed! + echo "buildbot job: $jobid ${core} cleanup failed!" fi fi - echo -------------------------------------------------- | tee -a "$LOGFILE" + echo '--------------------------------------------------' | tee -a "$LOGFILE" if [ "${COMMAND}" = "CMAKE" ]; then if [ "${PLATFORM}" = "android" ]; then EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \ @@ -426,9 +426,9 @@ build_libretro_generic_makefile() { ${NDK_ROOT}/${STRIPPATH} -s ${OUT}/${CORENAM} fi - echo "COPY CMD: cp -v ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE" - cp -v "${OUT}/${ORIGNAM}" "${OUTPUT}" 2>&1 | tee -a "$LOGFILE" - cp -v "${OUT}/${ORIGNAM}" "${OUTPUT}" + echo "COPY CMD: cp ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE" + cp "${OUT}/${ORIGNAM}" "${OUTPUT}" 2>&1 | tee -a "$LOGFILE" + cp "${OUT}/${ORIGNAM}" "${OUTPUT}" RET=$? buildbot_handle_message "$RET" "$ENTRY_ID" "$core" "$jobid" "$LOGFILE" @@ -486,22 +486,22 @@ build_libretro_generic_jni() { fi LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${core}_${PLATFORM}.log" - echo -------------------------------------------------- | tee "$LOGFILE" + echo '--------------------------------------------------' | tee "$LOGFILE" cat $TMPDIR/vars | tee -a "$LOGFILE" - echo -------------------------------------------------- | tee -a "$LOGFILE" + echo '--------------------------------------------------' | tee -a "$LOGFILE" if [ -z "${NOCLEAN}" ]; then echo "CLEANUP CMD: ${NDK} -j${JOBS} ${CORE_ARGS} clean" 2>&1 | tee -a "$LOGFILE" ${NDK} -j${JOBS} ${CORE_ARGS} clean 2>&1 | tee -a "$LOGFILE" if [ $? -eq 0 ]; then - echo buildbot job: $jobid $a ${core} cleanup success! + echo "buildbot job: $jobid $a ${core} cleanup success!" else - echo buildbot job: $jobid $a ${core} cleanup failed! + echo "buildbot job: $jobid $a ${core} cleanup failed!" fi fi - echo -------------------------------------------------- | tee -a "$LOGFILE" + echo '--------------------------------------------------' | tee -a "$LOGFILE" eval "set -- ${NDK} -j${JOBS} ${CORE_ARGS}" echo "BUILD CMD: $*" 2>&1 | tee -a "$LOGFILE" "$@" 2>&1 | tee -a "$LOGFILE" @@ -509,8 +509,8 @@ build_libretro_generic_jni() { RET=0 for a in "${APPABIS[@]}"; do if [ -f ../libs/${a}/$LIBNAM.${FORMAT_EXT} ]; then - echo "COPY CMD: cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM}" 2>&1 | tee -a "$LOGFILE" - cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM} 2>&1 | tee -a "$LOGFILE" + echo "COPY CMD: cp ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM}" 2>&1 | tee -a "$LOGFILE" + cp ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM} 2>&1 | tee -a "$LOGFILE" else echo "$LIBNAM.${FORMAT_EXT} for ${a} not found" 2>&1 | tee -a "$LOGFILE" RET=1 @@ -525,14 +525,14 @@ build_libretro_generic_jni() { # ----- buildbot ----- -echo buildbot starting -echo -------------------------------------------------- -echo Variables: -echo CC $CC -echo CXX $CXX -echo STRIP $STRIP -echo DISTDIR $RARCH_DIST_DIR -echo JOBS $JOBS +echo 'buildbot starting' +echo '--------------------------------------------------' +echo 'Variables:' +echo "CC $CC" +echo "CXX $CXX" +echo "STRIP $STRIP" +echo "DISTDIR $RARCH_DIST_DIR" +echo "JOBS $JOBS" echo echo @@ -582,14 +582,14 @@ while read line; do echo "buildbot job started at: $(date)" echo echo "buildbot job: $jobid processing $NAME" - echo -------------------------------------------------- - echo Variables: - echo URL $URL - echo ENABLED $ENABLED - echo COMMAND $COMMAND - echo MAKEFILE $MAKEFILE - echo DIR $DIR - echo SUBDIR $SUBDIR + echo '--------------------------------------------------' + echo 'Variables:' + echo "URL $URL" + echo "ENABLED $ENABLED" + echo "COMMAND $COMMAND" + echo "MAKEFILE $MAKEFILE" + echo "DIR $DIR" + echo "SUBDIR $SUBDIR" echo echo @@ -598,7 +598,7 @@ while read line; do FORCE_ORIG=$FORCE if [ ! -d "${DIR}/.git" ] || [ "${CLEANUP}" = "YES" ]; then - rm -rfv -- "$DIR" + rm -rf -- "$DIR" echo "cloning repo $URL..." git clone --depth=1 -b "$GIT_BRANCH" "$URL" "$DIR" BUILD="YES" @@ -610,12 +610,12 @@ while read line; do HEAD="$(git --work-tree="$DIR" --git-dir="$DIR/.git" rev-parse HEAD)" || \ { echo "git directory broken, removing $DIR and skipping $NAME."; \ - rm -rfv -- "$DIR" && continue; } + rm -rf -- "$DIR" && continue; } OLDURL="$(git --work-tree="$DIR" --git-dir="$DIR/.git" config --get remote.origin.url)" if [ "$URL" != "$OLDURL" ]; then - rm -rvf -- "$DIR" + rm -rf -- "$DIR" echo "cloning repo $URL..." git clone --depth=1 -b "$GIT_BRANCH" "$URL" "$DIR" BUILD="YES" @@ -717,12 +717,12 @@ buildbot_pull(){ if [ "${ENABLED}" = "YES" ] && [ "${TYPE}" = "PROJECT" ] || [ "${TRAVIS:-0}" = "0" ]; then echo "buildbot job: $jobid Processing $NAME" echo - echo NAME: $NAME - echo DIR: $DIR - echo PARENT: $PARENTDIR - echo URL: $URL - echo REPO TYPE: $TYPE - echo ENABLED: $ENABLED + echo "NAME: $NAME" + echo "DIR: $DIR" + echo "PARENT: $PARENTDIR" + echo "URL: $URL" + echo "REPO TYPE: $TYPE" + echo "ENABLED: $ENABLED" if [ -d "${PARENTDIR}/${DIR}/.git" ]; then cd $PARENTDIR @@ -767,7 +767,7 @@ buildbot_pull(){ cd $WORK fi echo - echo RADIR=$RADIR + echo "RADIR=$RADIR" fi done < $RECIPE.ra @@ -797,23 +797,23 @@ compile_filters() if [ "${RA}" = "YES" ]; then echo "buildbot job: $jobid Building Retroarch-$PLATFORM" - echo -------------------------------------------------- + echo '--------------------------------------------------' echo BUILD="" - echo WORKINGDIR=$PWD - echo RELEASE=$RELEASE - echo FORCE=$FORCE_RETROARCH_BUILD - echo RADIR=$RADIR - echo BRANCH=$BRANCH + echo "WORKINGDIR=$PWD" + echo "RELEASE=$RELEASE" + echo "FORCE=$FORCE_RETROARCH_BUILD" + echo "RADIR=$RADIR" + echo "BRANCH=$BRANCH" buildbot_pull if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ] || [ "${FORCE_RETROARCH_BUILD}" = "YES" ] || [ "${CORES_BUILT}" = "YES" ]; then cd "$RADIR" git clean -xdf - echo WORKINGDIR=$PWD - echo RADIR=$RADIR + echo "WORKINGDIR=$PWD" + echo "RADIR=$RADIR" echo "buildbot job: $jobid Building" echo @@ -859,7 +859,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then cd $WORK/$RADIR - echo "Packaging" + echo 'Packaging' fi fi @@ -880,7 +880,7 @@ if [ "${PLATFORM}" == "ios" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" cd $WORK/$RADIR - echo "Packaging" + echo 'Packaging' fi fi @@ -907,7 +907,7 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" cd $WORK/$RADIR - echo "Packaging" + echo 'Packaging' fi fi @@ -1012,11 +1012,11 @@ EOF android update project --path libs/appcompat --target android-26 | tee -a "$LOGFILE" TARGET_ABIS=${TARGET_ABIS/arm64-v8a /} ant release | tee -a "$LOGFILE" if [ -z "$BRANCH" ]; then - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE" - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk + cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE" + cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk else - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk | tee -a "$LOGFILE" - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk + cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk | tee -a "$LOGFILE" + cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk fi RET=$? @@ -1037,12 +1037,12 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO compile_filters audio ${HELPER} ${MAKE} compile_filters video ${HELPER} ${MAKE} - echo "configuring..." + echo 'configuring...' echo "configure command: $CONFIGURE" ${CONFIGURE} - echo "cleaning up..." + echo 'cleaning up...' echo "CLEANUP CMD: ${HELPER} ${MAKE} ${ARGS} clean" ${HELPER} ${MAKE} ${ARGS} clean @@ -1050,19 +1050,19 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO mkdir -p windows if [ $? -eq 0 ]; then - echo buildbot job: $jobid retroarch cleanup success! + echo "buildbot job: $jobid retroarch cleanup success!" else - echo buildbot job: $jobid retroarch cleanup failed! + echo "buildbot job: $jobid retroarch cleanup failed!" fi if [ $? -eq 0 ]; then - echo buildbot job: $jobid retroarch configure success! + echo "buildbot job: $jobid retroarch configure success!" else - echo buildbot job: $jobid retroarch configure failed! + echo "buildbot job: $jobid retroarch configure failed!" fi - echo "building..." + echo 'building...' echo "BUILD CMD: ${HELPER} ${MAKE} -j${JOBS} ${ARGS}" ${HELPER} ${MAKE} -j${JOBS} ${ARGS} 2>&1 | tee -a "$LOGFILE" @@ -1071,12 +1071,12 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO fi strip -s retroarch.exe - cp -v retroarch.exe.manifest windows/retroarch.exe.manifest 2>/dev/null - cp -v retroarch.exe windows/retroarch.exe | tee -a "$LOGFILE" - cp -v retroarch.exe windows/retroarch.exe + cp retroarch.exe.manifest windows/retroarch.exe.manifest 2>/dev/null + cp retroarch.exe windows/retroarch.exe | tee -a "$LOGFILE" + cp retroarch.exe windows/retroarch.exe status=$? - echo $status + echo "$status" buildbot_handle_message "$status" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE" @@ -1090,24 +1090,24 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch-debug" http://buildbot.fiveforty.net/build_entry/` fi - echo "configuring..." + echo 'configuring...' echo "configure command: $CONFIGURE" ${CONFIGURE} --enable-drmingw ${HELPER} ${MAKE} -j${JOBS} ${ARGS} DEBUG=1 GL_DEBUG=1 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - for i in $(seq 3); do for bin in $(ntldd -R *exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -vu "$bin" . ; done; done + for i in $(seq 3); do for bin in $(ntldd -R *exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -u "$bin" . ; done; done if [ "${CUSTOM_BUILD_DEBUG}" ]; then "${CUSTOM_BUILD_DEBUG}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log fi - cp -v retroarch.exe.manifest windows/retroarch_debug.exe.manifest 2>/dev/null - cp -v retroarch.exe windows/retroarch_debug.exe | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - cp -v *.dll windows/ - cp -v retroarch.exe windows/retroarch_debug.exe + cp retroarch.exe.manifest windows/retroarch_debug.exe.manifest 2>/dev/null + cp retroarch.exe windows/retroarch_debug.exe | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log + cp *.dll windows/ + cp retroarch.exe windows/retroarch_debug.exe (cd windows && windeployqt --release --no-patchqt --no-translations retroarch.exe) - (cd windows && for i in $(seq 3); do for bin in $(ntldd -R imageformats/*dll | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -vu "$bin" . ; done; done) + (cd windows && for i in $(seq 3); do for bin in $(ntldd -R imageformats/*dll | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -u "$bin" . ; done; done) status=$? ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log @@ -1124,7 +1124,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cp retroarch.cfg retroarch.default.cfg mkdir -p windows/filters mkdir -p windows/filters/video @@ -1134,8 +1134,8 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO mkdir -p windows/system mkdir -p windows/screenshots - cp -v retroarch.default.cfg windows/ - cp -v tools/*.exe windows/ + cp retroarch.default.cfg windows/ + cp tools/*.exe windows/ echo -e "[Paths]\nPlugins = ./" > windows/qt.conf cp -rf libretro-common/audio/dsp_filters/*.dll windows/filters/audio cp -rf libretro-common/audio/dsp_filters/*.dsp windows/filters/audio @@ -1155,7 +1155,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh psp1 2>&1 | tee -a "$LOGFILE" @@ -1168,14 +1168,14 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR cp retroarch.cfg retroarch.default.cfg mkdir -p pkg/psp1/ mkdir -p pkg/psp1/info - cp -v $RARCH_DIST_DIR/../info/*.info pkg/psp1/info/ + cp $RARCH_DIST_DIR/../info/*.info pkg/psp1/info/ fi fi @@ -1186,7 +1186,7 @@ if [ "${PLATFORM}" = "ps2" ] && [ "${RA}" = "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh ps2 2>&1 | tee -a "$LOGFILE" @@ -1199,14 +1199,14 @@ if [ "${PLATFORM}" = "ps2" ] && [ "${RA}" = "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR cp retroarch.cfg retroarch.default.cfg mkdir -p pkg/ps2/ mkdir -p pkg/ps2/info - cp -v $RARCH_DIST_DIR/../info/*.info pkg/ps2/info/ + cp $RARCH_DIST_DIR/../info/*.info pkg/ps2/info/ fi fi @@ -1219,7 +1219,7 @@ if [ "${PLATFORM}" == "libnx" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh libnx 2>&1 | tee -a "$LOGFILE" @@ -1228,7 +1228,7 @@ if [ "${PLATFORM}" == "libnx" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR cp retroarch.cfg retroarch.default.cfg @@ -1247,7 +1247,7 @@ if [ "${PLATFORM}" == "libnx" ] && [ "${RA}" == "YES" ]; then cp -rf media/shaders_glsl/* pkg/libnx/retroarch/shaders rm -rf pkg/libnx/retroarch/assets/src pkg/libnx/retroarch/assets/nuklear pkg/libnx/retroarch/assets/branding pkg/libnx/retroarch/assets/wallpapers pkg/libnx/retroarch/assets/zarch - cp -v $RARCH_DIST_DIR/../info/*.info pkg/libnx/retroarch/info + cp $RARCH_DIST_DIR/../info/*.info pkg/libnx/retroarch/info fi fi @@ -1260,7 +1260,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh wii 2>&1 | tee -a "$LOGFILE" @@ -1269,7 +1269,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR cp retroarch.cfg retroarch.default.cfg @@ -1277,7 +1277,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then mkdir -p pkg/wii/cheats mkdir -p pkg/wii/remaps mkdir -p pkg/wii/overlays - cp -v $RARCH_DIST_DIR/../info/*.info pkg/ + cp $RARCH_DIST_DIR/../info/*.info pkg/ cp -rf media/overlays/wii/* pkg/wii/overlays fi fi @@ -1290,9 +1290,9 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . - cp -v $RARCH_DIST_DIR/../info/*.info . - cp -v ../media/assets/pkg/wiiu/*.png . + cp $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/../info/*.info . + cp ../media/assets/pkg/wiiu/*.png . time sh ./wiiu-cores.sh 2>&1 | tee -a "$LOGFILE" @@ -1301,7 +1301,7 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR fi @@ -1315,7 +1315,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh ngc 2>&1 | tee -a "$LOGFILE" @@ -1324,7 +1324,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR cp retroarch.cfg retroarch.default.cfg @@ -1332,7 +1332,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then mkdir -p pkg/ngc/cheats mkdir -p pkg/ngc/remaps mkdir -p pkg/ngc/overlays - cp -v $RARCH_DIST_DIR/../info/*.info pkg/ + cp $RARCH_DIST_DIR/../info/*.info pkg/ cp -rf media/overlays/ngc/* pkg/ngc/overlays fi fi @@ -1345,7 +1345,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh ctr 2>&1 | tee -a "$LOGFILE" @@ -1355,9 +1355,9 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" cd $WORK/$RADIR - echo $PWD + echo "$PWD" - echo "Packaging" + echo 'Packaging' cp retroarch.cfg retroarch.default.cfg @@ -1374,12 +1374,12 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then mkdir -p $WORK/$RADIR/pkg/ctr/build/retroarch/database/cursors mkdir -p $WORK/$RADIR/pkg/ctr/build/retroarch/media - cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/ctr/build/retroarch/filters/video/ - cp -v $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/ctr/build/retroarch/filters/audio/ - cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/ctr/build/retroarch/cores/info/ - cp -v $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/ctr/build/retroarch/database/rdb/ - cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/ctr/build/retroarch/database/cursors/ - cp -rv $WORK/$RADIR/media/assets/rgui $WORK/$RADIR/pkg/ctr/build/retroarch/media/ + cp $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/ctr/build/retroarch/filters/video/ + cp $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/ctr/build/retroarch/filters/audio/ + cp $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/ctr/build/retroarch/cores/info/ + cp $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/ctr/build/retroarch/database/rdb/ + cp $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/ctr/build/retroarch/database/cursors/ + cp -r $WORK/$RADIR/media/assets/rgui $WORK/$RADIR/pkg/ctr/build/retroarch/media/ convert_xmb_assets $WORK/$RADIR/media/assets/xmb $WORK/$RADIR/pkg/ctr/build/retroarch/media/xmb 64x32! 400x240! 90 fi @@ -1393,8 +1393,8 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . - cp -v $RARCH_DIST_DIR/arm/*.a . + cp $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/arm/*.a . time sh ./dist-cores.sh vita 2>&1 | tee -a "$LOGFILE" @@ -1403,7 +1403,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR cp retroarch.cfg retroarch.default.cfg @@ -1421,12 +1421,12 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then mkdir -p $WORK/$RADIR/pkg/vita/retroarch/assets/glui - cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/vita/retroarch/filters/video/ - cp -v $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/vita/retroarch/filters/audio/ - cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/vita/retroarch/info/ - cp -v $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/vita/retroarch/database/rdb/ - cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/ - cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/ + cp $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/vita/retroarch/filters/video/ + cp $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/vita/retroarch/filters/audio/ + cp $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/vita/retroarch/info/ + cp $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/vita/retroarch/database/rdb/ + cp $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/ + cp $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/ cp -r $WORK/$RADIR/media/assets/glui $WORK/$RADIR/pkg/vita/retroarch/assets convert_xmb_assets $WORK/$RADIR/media/assets/xmb $WORK/$RADIR/pkg/vita/retroarch/assets/xmb 64x64! 960x544! 90 @@ -1442,7 +1442,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.a . + cp $RARCH_DIST_DIR/*.a . time sh ./dist-cores.sh dex-ps3 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_dex.log @@ -1482,7 +1482,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then cd dist-scripts rm *.a - cp -v $RARCH_DIST_DIR/*.bc . + cp $RARCH_DIST_DIR/*.bc . echo "BUILD CMD $HELPER ./dist-cores.sh emscripten" &> "$LOGFILE" $HELPER ./dist-cores.sh emscripten 2>&1 | tee -a "$LOGFILE" @@ -1491,7 +1491,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then buildbot_handle_message "$RET" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE" ENTRY_ID="" - echo "Packaging" + echo 'Packaging' cd $WORK/$RADIR fi @@ -1506,26 +1506,26 @@ if [ "${PLATFORM}" = "unix" ] && [ "${RA}" = "YES" ]; then compile_filters audio ${HELPER} ${MAKE} compile_filters video ${HELPER} ${MAKE} - echo "configuring..." + echo 'configuring...' echo "configure command: $CONFIGURE $ARGS" ${CONFIGURE} ${ARGS} - echo "cleaning up..." + echo 'cleaning up...' echo "CLEANUP CMD: ${HELPER} ${MAKE} clean" ${HELPER} ${MAKE} clean if [ $? -eq 0 ]; then - echo buildbot job: $jobid retroarch cleanup success! + echo "buildbot job: $jobid retroarch cleanup success!" else - echo buildbot job: $jobid retroarch cleanup failed! + echo "buildbot job: $jobid retroarch cleanup failed!" fi - echo "building..." + echo 'building...' echo "BUILD CMD: ${HELPER} ${MAKE} -j${JOBS}" ${HELPER} ${MAKE} -j${JOBS} 2>&1 | tee -a "$LOGFILE" status=$? - echo $status + echo "$status" buildbot_handle_message "$status" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE"