revert today's commits

This commit is contained in:
radius 2017-01-12 21:16:08 -05:00
parent 8431078731
commit f74fbdd0ba

View File

@ -1079,6 +1079,8 @@ compile_audio_filters()
else else
echo buildbot job: $jobid audio filter: [status: fail]! echo buildbot job: $jobid audio filter: [status: fail]!
fi fi
cd ..
cd ..
} }
compile_video_filters() compile_video_filters()
@ -1094,6 +1096,8 @@ compile_video_filters()
else else
echo buildbot job: $jobid video filter: [status: fail]! echo buildbot job: $jobid video filter: [status: fail]!
fi fi
cd ..
cd ..
} }
@ -1113,7 +1117,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then
buildbot_pull buildbot_pull
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo WORKINGDIR=$PWD echo WORKINGDIR=$PWD
echo RELEASE=$RELEASE echo RELEASE=$RELEASE
@ -1171,7 +1175,7 @@ if [ "${PLATFORM}" == "ios" ] && [ "${RA}" == "YES" ]; then
buildbot_pull buildbot_pull
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1210,7 +1214,7 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${RA}" == "YES" ]; then
buildbot_pull buildbot_pull
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1256,7 +1260,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then
echo "buildbot job: $jobid compiling shaders" echo "buildbot job: $jobid compiling shaders"
echo echo
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo WORKINGDIR=$PWD echo WORKINGDIR=$PWD
echo RELEASE=$RELEASE echo RELEASE=$RELEASE
@ -1380,16 +1384,13 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
echo echo
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
echo PWD: $PWD | WORKINGDIR: $WORKINGDIR | RADIR: $RADIR
compile_audio_filters ${HELPER} ${MAKE} compile_audio_filters ${HELPER} ${MAKE}
cd $WORKINGDIR/$RADIR
compile_video_filters ${HELPER} ${MAKE} compile_video_filters ${HELPER} ${MAKE}
cd $WORKINGDIR/$RADIR
echo "configuring..." echo "configuring..."
echo "configure command: $CONFIGURE $ARGS" echo "configure command: $CONFIGURE $ARGS"
@ -1502,7 +1503,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1546,7 +1547,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
buildbot_pull buildbot_pull
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1591,7 +1592,7 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then
buildbot_pull buildbot_pull
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1631,7 +1632,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then
buildbot_pull buildbot_pull
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1675,7 +1676,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
echo RADIR=$RADIR echo RADIR=$RADIR
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1737,7 +1738,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1781,7 +1782,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1840,7 +1841,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
@ -1882,15 +1883,13 @@ if [ "${PLATFORM}" = "unix" ]; then
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then
touch $TMPDIR/built-frontend touch $TMPDIR/built-frontend
cd $WORKINGDIR/$RADIR cd $RADIR
git clean -xdf git clean -xdf
echo "buildbot job: $jobid Building" echo "buildbot job: $jobid Building"
echo echo
compile_audio_filters ${HELPER} ${MAKE} compile_audio_filters ${HELPER} ${MAKE}
cd $WORKINGDIR/$RADIR
compile_video_filters ${HELPER} ${MAKE} compile_video_filters ${HELPER} ${MAKE}
cd $WORKINGDIR/$RADIR
echo "configuring..." echo "configuring..."
echo "configure command: $CONFIGURE $ARGS" echo "configure command: $CONFIGURE $ARGS"