rename SUFFIX variable

This commit is contained in:
radius 2015-10-06 00:32:57 -05:00
parent ff05db6560
commit 250801ab30
7 changed files with 24 additions and 24 deletions

View File

@ -257,12 +257,12 @@ build_libretro_generic_makefile() {
MESSAGE="$1 build successful [$jobid]"
if [ "${MAKEPORTABLE}" == "YES" ]; then
echo "$1 running retrolink [$jobid]"
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
if [ "${PLATFORM}" == "windows" -o "${PLATFORM}" == "unix" ]; then
strip -s ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
strip -s ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
cp -v ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
@ -309,7 +309,7 @@ build_libretro_leiradel_makefile() {
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}
cp -v ${NAME}_libretro.${PLATFORM}_${ARG1}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARG1}/${NAME}_libretro${LIBSUFFIX}.${FORMAT_EXT}
else
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='"'`
@ -357,7 +357,7 @@ build_libretro_generic_theos() {
if [ $? -eq 0 ]; then
MESSAGE="$1 build successful [$jobid]"
cp -v objs/obj/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
cp -v objs/obj/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
else
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='"'`
@ -385,7 +385,7 @@ build_libretro_generic_jni() {
echo "cleaning up..."
echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean"
${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean
if [ $? -eq 0 ]; then
if [ $? -eq 0 ]; then
echo BUILDBOT JOB: $jobid $a $1 cleanup success!
else
echo BUILDBOT JOB: $jobid $a $1 cleanup failure!
@ -404,7 +404,7 @@ build_libretro_generic_jni() {
MESSAGE="$1-$a build successful [$jobid]"
echo BUILDBOT JOB: $MESSAGE
buildbot_log "$MESSAGE"
cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
else
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='"'`
@ -452,7 +452,7 @@ build_libretro_bsnes_jni() {
fi
if [ $? -eq 0 ]; then
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}
cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
else
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='"'`
@ -483,7 +483,7 @@ build_libretro_generic_gl_makefile() {
echo "cleaning up..."
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean
if [ $? -eq 0 ]; then
if [ $? -eq 0 ]; then
echo BUILDBOT JOB: $jobid $1 cleanup success!
else
echo BUILDBOT JOB: $jobid $1 cleanup failure!
@ -499,9 +499,9 @@ build_libretro_generic_gl_makefile() {
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
fi
if [ $? -eq 0 ]; then
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}
cp -v ${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
else
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='"'`
@ -530,7 +530,7 @@ build_libretro_bsnes() {
echo "cleaning up..."
rm -f obj/*.{o,"${FORMAT_EXT}"}
rm -f out/*.{o,"${FORMAT_EXT}"}
rm -f out/*.{o,"${FORMAT_EXT}"}
if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
${MAKE} clean
@ -558,11 +558,11 @@ build_libretro_bsnes() {
if [ $? -eq 0 ]; then
MESSAGE="$1 build successful [$jobid]"
if [ "${PROFILE}" = "cpp98" ]; then
cp -fv "out/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
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}${SUFFIX}.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
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}${SUFFIX}.${FORMAT_EXT}
cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
fi
else
ERROR=`cat $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
@ -1108,7 +1108,7 @@ if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
if [ "${ENABLED}" = "YES" ]; then
echo "BUILDBOT JOB: $jobid Processing $NAME"
echo
echo
echo NAME: $NAME
echo DIR: $DIR
echo PARENT: $PARENTDIR
@ -1649,7 +1649,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
RADIR=$DIR
if [[ $OUT == *"Already up-to-date"* ]]; then
BUILD="NO"
else
else
BUILD="YES"
echo >> $CLOGFILE
echo $NAME $LOGDATE >> $CLOGFILE
@ -1731,7 +1731,7 @@ then
if [ "${ENABLED}" == "YES" ];
then
echo "BUILDBOT JOB: $jobid Processing $NAME"
echo
echo
echo NAME: $NAME
echo DIR: $DIR
echo PARENT: $PARENTDIR

View File

@ -6,5 +6,5 @@ PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/
PLATFORM android
platform android
MAKE make
SUFFIX _android
LIBSUFFIX _android

View File

@ -6,4 +6,4 @@ PLATFORM android
platform android
NDK ndk-build
RA NO
SUFFIX _android
LIBSUFFIX _android

View File

@ -1,5 +1,5 @@
PATH /home/buildbot/tools/android/android-ndk-standalone-arm/bin
PLATFORM android-armv7
platform android-armv7
SUFFIX _android
LIBSUFFIX _android
MAKE make

View File

@ -3,6 +3,6 @@ ANDROID_NDK_ARM /home/buildbot/tools/android/android-ndk-r10e/toolchains/arm-lin
ANDROID_NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e/
PLATFORM android
platform android
SUFFIX _android
LIBSUFFIX _android
MAKE make
DIST armeabi-v7a

View File

@ -7,4 +7,4 @@ platform android
MAKE make
NDK ndk-build
RA YES
SUFFIX _android
LIBSUFFIX _android

View File

@ -7,6 +7,6 @@ platform android
MAKE make
NDK ndk-build
RA YES
SUFFIX _android
LIBSUFFIX _android
JAVA_HOME /usr/lib/jvm/oracle_jdk7