mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-04-18 02:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from iKarith/master

Browse Source 
Whitespace and == with sh test. Also an old bsnes rule that didn't get updated
This commit is contained in:
Twinaphex 2015-03-09 13:44:29 +01:00
commit 4cceccff43
3 changed files with 388 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

570
libretro-buildbot-recipe.sh
View File

File diff suppressed because it is too large Load Diff

329
libretro-buildbot-task.sh
View File

@ -25,8 +25,7 @@ while read line; do
KEY=`echo $line | cut --fields=1 --delimiter=" "` KEY=`echo $line | cut --fields=1 --delimiter=" "`
VALUE=`echo $line | cut --fields=2 --delimiter=" "` VALUE=`echo $line | cut --fields=2 --delimiter=" "`
if [ "${KEY}" == "PATH" ]; if [ "${KEY}" = "PATH" ]; then
then
export PATH=${VALUE}:${ORIGPATH} export PATH=${VALUE}:${ORIGPATH}
echo New PATH: $PATH echo New PATH: $PATH
@ -34,7 +33,7 @@ while read line; do
export ${KEY}=${VALUE} export ${KEY}=${VALUE}
echo $KEY: $VALUE echo $KEY: $VALUE
fi fi
done < $1.conf done < $1.conf
echo echo
echo echo
@ -54,8 +53,7 @@ read_link()
TARGET_FILE="$1" TARGET_FILE="$1"
cd $(dirname "$TARGET_FILE") cd $(dirname "$TARGET_FILE")
TARGET_FILE=$(basename "$TARGET_FILE") TARGET_FILE=$(basename "$TARGET_FILE")
while [ -L "$TARGET_FILE" ] while [ -L "$TARGET_FILE" ]; do
do
TARGET_FILE=$(readlink "$TARGET_FILE") TARGET_FILE=$(readlink "$TARGET_FILE")
cd $(dirname "$TARGET_FILE") cd $(dirname "$TARGET_FILE")
TARGET_FILE=$(basename "$TARGET_FILE") TARGET_FILE=$(basename "$TARGET_FILE")
@ -75,18 +73,17 @@ fi
mkdir -v -p "$RARCH_DIST_DIR" mkdir -v -p "$RARCH_DIST_DIR"
if [ "${PLATFORM}" == "android" ]; if [ "${PLATFORM}" = "android" ]; then
then
IFS=' ' read -ra ABIS <<< "$TARGET_ABIS" IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
for a in "${ABIS[@]}"; do for a in "${ABIS[@]}"; do
echo $a echo $a
if [ -d $RARCH_DIST_DIR/${a} ]; then if [ -d $RARCH_DIST_DIR/${a} ]; then
echo "Directory $RARCH_DIST_DIR/${a} already exists, skipping creation..." echo "Directory $RARCH_DIST_DIR/${a} already exists, skipping creation..."
else else
mkdir $RARCH_DIST_DIR/${a} mkdir $RARCH_DIST_DIR/${a}
fi fi
done done
fi fi
if [ "$HOST_CC" ]; then if [ "$HOST_CC" ]; then
@ -111,32 +108,32 @@ fi
if [ -z "$CC" ]; then if [ -z "$CC" ]; then
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
CC=cc CC=cc
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
CC=mingw32-gcc CC=mingw32-gcc
else else
CC=gcc CC=gcc
fi fi
fi fi
if [ -z "$CXX" ]; then if [ -z "$CXX" ]; then
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
CXX=c++ CXX=c++
CXX11="clang++ -std=c++11 -stdlib=libc++" CXX11="clang++ -std=c++11 -stdlib=libc++"
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
CXX=mingw32-g++ CXX=mingw32-g++
CXX11=mingw32-g++ CXX11=mingw32-g++
else else
CXX=g++ CXX=g++
CXX11=g++ CXX11=g++
fi fi
fi fi
if [ "${CC}" ] && [ "${CXX}" ]; then if [ "${CC}" ] && [ "${CXX}" ]; then
COMPILER="CC=${CC} CXX=${CXX}" COMPILER="CC=${CC} CXX=${CXX}"
else else
COMPILER="" COMPILER=""
fi fi
echo echo
@ -153,7 +150,7 @@ RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT
check_opengl() { check_opengl() {
if [ "${BUILD_LIBRETRO_GL}" ]; then if [ "${BUILD_LIBRETRO_GL}" ]; then
if [ "${ENABLE_GLES}" ]; then if [ "${ENABLE_GLES}" ]; then
echo '=== OpenGL ES enabled ===' echo '=== OpenGL ES enabled ==='
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-gles" export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-gles"
@ -165,12 +162,12 @@ check_opengl() {
fi fi
else else
echo '=== OpenGL disabled in build ===' echo '=== OpenGL disabled in build ==='
fi fi
} }
reset_compiler_targets() { reset_compiler_targets() {
export FORMAT_COMPILER_TARGET=$RESET_FORMAT_COMPILER_TARGET export FORMAT_COMPILER_TARGET=$RESET_FORMAT_COMPILER_TARGET
export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT
} }
@ -199,21 +196,18 @@ build_libretro_generic_makefile() {
cd $DIR cd $DIR
cd $SUBDIR cd $SUBDIR
if [ "${NAME}" == "mame078" ]; if [ "${NAME}" = "mame078" ]; then
then OLDJ=$JOBS
OLDJ=$JOBS
JOBS=1 JOBS=1
fi fi
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ]; then
then echo "cleaning up..."
echo "cleaning up..."
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean" echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid $1 cleanup success! echo BUILDBOT JOB: $jobid $1 cleanup success!
else else
echo BUILDBOT JOB: $jobid $1 cleanup failure! echo BUILDBOT JOB: $jobid $1 cleanup failure!
@ -221,23 +215,20 @@ build_libretro_generic_makefile() {
fi fi
echo "compiling..." echo "compiling..."
if [ -z "${ARGS}" ] if [ -z "${ARGS}" ]; then
then
echo "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} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
else else
if [ "${NAME}" == "mame2010" ]; if [ "${NAME}" = "mame2010" ]; then
then
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools
fi fi
echo "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} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
fi fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="$1 build successful ($jobid)" MESSAGE="$1 build successful ($jobid)"
cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT} cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT}
else else
@ -266,13 +257,11 @@ build_libretro_generic_theos() {
ln -s $THEOS theos ln -s $THEOS theos
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ]; then
then echo "cleaning up..."
echo "cleaning up..."
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean" echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid $1 cleanup success! echo BUILDBOT JOB: $jobid $1 cleanup success!
else else
echo BUILDBOT JOB: $jobid $1 cleanup failure! echo BUILDBOT JOB: $jobid $1 cleanup failure!
@ -280,8 +269,7 @@ build_libretro_generic_theos() {
fi fi
echo "compiling..." echo "compiling..."
if [ -z "${ARGS}" ] if [ -z "${ARGS}" ]; then
then
echo "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} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
else else
@ -289,8 +277,7 @@ build_libretro_generic_theos() {
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
fi fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="$1 build successful ($jobid)" 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}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
else else
@ -315,13 +302,11 @@ build_libretro_generic_jni() {
cd ${DIR}/${SUBDIR} cd ${DIR}/${SUBDIR}
for a in "${ABIS[@]}"; do for a in "${ABIS[@]}"; do
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ]; then
then
echo "cleaning up..." echo "cleaning up..."
echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean" echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean"
${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid $a $1 cleanup success! echo BUILDBOT JOB: $jobid $a $1 cleanup success!
else else
echo BUILDBOT JOB: $jobid $a $1 cleanup failure! echo BUILDBOT JOB: $jobid $a $1 cleanup failure!
@ -329,16 +314,14 @@ build_libretro_generic_jni() {
fi fi
echo "compiling for ${a}..." echo "compiling for ${a}..."
if [ -z "${ARGS}" ] if [ -z "${ARGS}" ]; then
then
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
${NDK} -j${JOBS} APP_ABI=${a} ${NDK} -j${JOBS} APP_ABI=${a}
else else
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} " echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} "
${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS}
fi fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="$1-$a build successful ($jobid)" MESSAGE="$1-$a build successful ($jobid)"
echo BUILDBOT JOB: $MESSAGE echo BUILDBOT JOB: $MESSAGE
buildbot_log "$MESSAGE" buildbot_log "$MESSAGE"
@ -349,8 +332,8 @@ build_libretro_generic_jni() {
buildbot_log "$MESSAGE" buildbot_log "$MESSAGE"
fi fi
done done
} }
@ -370,30 +353,26 @@ build_libretro_bsnes_jni() {
cd ${DIR}/${SUBDIR} cd ${DIR}/${SUBDIR}
for a in "${ABIS[@]}"; do for a in "${ABIS[@]}"; do
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ]; then
then echo "cleaning up..."
echo "cleaning up..." echo "cleanup command: ${NDK} -j${JOBS} APP_ABI=${a} clean"
echo "cleanup command: ${NDK} -j${JOBS} APP_ABI=${a} clean"
${NDK} -j${JOBS} APP_ABI=${a} clean ${NDK} -j${JOBS} APP_ABI=${a} clean
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then echo BUILDBOT JOB: $jobid $1 cleanup success!
echo BUILDBOT JOB: $jobid $1 cleanup success! else
else echo BUILDBOT JOB: $jobid $1 cleanup failure!
echo BUILDBOT JOB: $jobid $1 cleanup failure! fi
fi
fi fi
echo "compiling for ${a}..." echo "compiling for ${a}..."
if [ -z "${ARGS}" ] if [ -z "${ARGS}" ]; then
then
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
${NDK} -j${JOBS} APP_ABI=${a} ${NDK} -j${JOBS} APP_ABI=${a}
else else
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
${NDK} -j${JOBS} APP_ABI=${a} ${NDK} -j${JOBS} APP_ABI=${a}
fi fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="$1 build successful ($jobid)" MESSAGE="$1 build successful ($jobid)"
cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT} cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}
else else
@ -422,13 +401,11 @@ build_libretro_generic_gl_makefile() {
cd $DIR cd $DIR
cd $SUBDIR cd $SUBDIR
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ]; then
then echo "cleaning up..."
echo "cleaning up..."
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean" echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid $1 cleanup success! echo BUILDBOT JOB: $jobid $1 cleanup success!
else else
echo BUILDBOT JOB: $jobid $1 cleanup failure! echo BUILDBOT JOB: $jobid $1 cleanup failure!
@ -436,8 +413,7 @@ build_libretro_generic_gl_makefile() {
fi fi
echo "compiling..." echo "compiling..."
if [ -z "${ARGS}" ]; if [ -z "${ARGS}" ]; then
then
echo "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} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
else else
@ -445,8 +421,7 @@ build_libretro_generic_gl_makefile() {
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
fi fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="$1 build successful ($jobid)" 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}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
else else
@ -475,22 +450,19 @@ build_libretro_bsnes() {
cd $DIR cd $DIR
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ]; then
then echo "cleaning up..."
echo "cleaning up..."
rm -f obj/*.{o,"${FORMAT_EXT}"} rm -f obj/*.{o,"${FORMAT_EXT}"}
rm -f out/*.{o,"${FORMAT_EXT}"} rm -f out/*.{o,"${FORMAT_EXT}"}
if [ "${PROFILE}" == "cpp98" -o "${PROFILE}" == "bnes" ]; if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
then ${MAKE} clean
${MAKE} clean fi
fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid $1 cleanup success! echo BUILDBOT JOB: $jobid $1 cleanup success!
else else
echo BUILDBOT JOB: $jobid $1 cleanup failure! echo BUILDBOT JOB: $jobid $1 cleanup failure!
@ -500,11 +472,9 @@ build_libretro_bsnes() {
echo "compiling..." echo "compiling..."
if [ "${PROFILE}" == "cpp98" ]; if [ "${PROFILE}" = "cpp98" ]; then
then
${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}" ${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
elif [ "${PROFILE}" == "bnes" ]; elif [ "${PROFILE}" = "bnes" ]; then
then
echo "build command: ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET} 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} ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
else else
@ -512,14 +482,11 @@ build_libretro_bsnes() {
${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}
fi fi
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="$1 build successful ($jobid)" MESSAGE="$1 build successful ($jobid)"
if [ "${PROFILE}" == "cpp98" ]; if [ "${PROFILE}" = "cpp98" ]; then
then
cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}" cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
elif [ "${PROFILE}" == "bnes" ]; elif [ "${PROFILE}" = "bnes" ]; then
then
cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}" cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
else else
cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
@ -537,8 +504,7 @@ build_libretro_bsnes() {
#sleep 10 #sleep 10
export jobid=$1 export jobid=$1
if [ -z "$2" ] if [ -z "$2" ]; then
then
echo no argument supplied echo no argument supplied
else else
echo processing $2 only echo processing $2 only
@ -560,19 +526,16 @@ while read line; do
SUBDIR=`echo $line | cut --fields=8 --delimiter=" "` SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
if [ ! -z "$TASK" ] if [ ! -z "$TASK" ]; then
then if [ "${TASK}" != "${NAME}" ]; then
if [ "${TASK}" != "${NAME}" ]
then
continue continue
fi fi
fi fi
if [ "${ENABLED}" == "YES" ]; if [ "${ENABLED}" = "YES" ]; then
then
echo "BUILDBOT JOB: $jobid Processing $NAME" echo "BUILDBOT JOB: $jobid Processing $NAME"
echo echo
echo URL: $URL echo URL: $URL
echo REPO TYPE: $TYPE echo REPO TYPE: $TYPE
echo ENABLED: $ENABLED echo ENABLED: $ENABLED
@ -586,69 +549,61 @@ while read line; do
ARGS="" ARGS=""
TEMP=`echo $line | cut --fields=9 --delimiter=" "` TEMP=`echo $line | cut --fields=9 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${TEMP}" ARGS="${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=10 --delimiter=" "` TEMP=`echo $line | cut --fields=10 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=11 --delimiter=" "` TEMP=`echo $line | cut --fields=11 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=12 --delimiter=" "` TEMP=`echo $line | cut --fields=12 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=13 --delimiter=" "` TEMP=`echo $line | cut --fields=13 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=14 --delimiter=" "` TEMP=`echo $line | cut --fields=14 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}" ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
echo ARGS: $ARGS echo ARGS: $ARGS
echo echo
echo echo
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
then
echo building core...
if [ "${COMMAND}" == "GENERIC" ]; then
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
elif [ "${COMMAND}" == "GENERIC_GL" ]; then
build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
elif [ "${COMMAND}" == "GENERIC_ALT" ]; then
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" == "GENERIC_JNI" ]; then
build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" == "BSNES_JNI" ]; then
build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" == "GENERIC_THEOS" ]; then
build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" == "BSNES" ]; then
build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
echo building core...
if [ "${COMMAND}" = "GENERIC" ]; then
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
elif [ "${COMMAND}" = "GENERIC_GL" ]; then
build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
elif [ "${COMMAND}" = "GENERIC_ALT" ]; then
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" = "GENERIC_JNI" ]; then
build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" = "BSNES_JNI" ]; then
build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" = "GENERIC_THEOS" ]; then
build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" = "BSNES" ]; then
build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
fi
else
echo BUILDBOT JOB: $jobid $NAME already up-to-date...
fi fi
else
echo BUILDBOT JOB: $jobid $NAME already up-to-date...
fi
echo echo
fi fi
@ -657,23 +612,20 @@ while read line; do
PREVCORE=$NAME PREVCORE=$NAME
PREVBUILD=$BUILD PREVBUILD=$BUILD
done < $1 done < $1
echo echo
cd $WORK cd $WORK
BUILD="" BUILD=""
if [ ! -z "$TASK" ] if [ ! -z "$TASK" ]; then
then if [ "${TASK}" != "retroarch" ]; then
if [ "${TASK}" != "retroarch" ] exit
then
exit
fi fi
fi fi
if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}" == "YES" ]; if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
then
while read line; do while read line; do
@ -684,15 +636,12 @@ then
ENABLED=`echo $line | cut --fields=5 --delimiter=" "` ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "` PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
if [ ! -z "$TASK" ] if [ ! -z "$TASK" ]; then
then if [ "${TASK}" != "${NAME}" ]; then
if [ "${TASK}" != "${NAME}" ]
then
continue continue
fi fi
fi fi
if [ "${ENABLED}" == "YES" ]; if [ "${ENABLED}" = "YES" ]; then
then
echo "BUILDBOT JOB: $jobid Processing $NAME" echo "BUILDBOT JOB: $jobid Processing $NAME"
echo echo
echo NAME: $NAME echo NAME: $NAME
@ -705,38 +654,32 @@ then
ARGS="" ARGS=""
TEMP=`echo $line | cut --fields=9 --delimiter=" "` TEMP=`echo $line | cut --fields=9 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${TEMP}" ARGS="${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=10 --delimiter=" "` TEMP=`echo $line | cut --fields=10 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=11 --delimiter=" "` TEMP=`echo $line | cut --fields=11 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=12 --delimiter=" "` TEMP=`echo $line | cut --fields=12 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=13 --delimiter=" "` TEMP=`echo $line | cut --fields=13 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
TEMP="" TEMP=""
TEMP=`echo $line | cut --fields=14 --delimiter=" "` TEMP=`echo $line | cut --fields=14 --delimiter=" "`
if [ -n ${TEMP} ]; if [ -n ${TEMP} ]; then
then
ARGS="${ARGS} ${TEMP}" ARGS="${ARGS} ${TEMP}"
fi fi
@ -748,9 +691,8 @@ then
echo echo
echo echo
done < $1.ra done < $1.ra
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
then
cd $3 cd $3
echo "BUILDBOT JOB: $jobid Building" echo "BUILDBOT JOB: $jobid Building"
@ -760,8 +702,7 @@ then
cd audio/audio_filters cd audio/audio_filters
echo "audio filter build command: ${MAKE}" echo "audio filter build command: ${MAKE}"
$MAKE $MAKE
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid audio filter build success! echo BUILDBOT JOB: $jobid audio filter build success!
else else
echo BUILDBOT JOB: $jobid audio filter build failure! echo BUILDBOT JOB: $jobid audio filter build failure!
@ -774,8 +715,7 @@ then
cd gfx/video_filters cd gfx/video_filters
echo "audio filter build command: ${MAKE}" echo "audio filter build command: ${MAKE}"
$MAKE $MAKE
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid video filter build success! echo BUILDBOT JOB: $jobid video filter build success!
else else
echo BUILDBOT JOB: $jobid video filter build failure! echo BUILDBOT JOB: $jobid video filter build failure!
@ -788,8 +728,7 @@ then
echo "cleanup command: $MAKE clean" echo "cleanup command: $MAKE clean"
$MAKE clean $MAKE clean
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid retroarch cleanup success! echo BUILDBOT JOB: $jobid retroarch cleanup success!
else else
echo BUILDBOT JOB: $jobid retroarch cleanup failure! echo BUILDBOT JOB: $jobid retroarch cleanup failure!
@ -799,8 +738,7 @@ then
echo "configure command: $CONFIGURE" echo "configure command: $CONFIGURE"
${CONFIGURE} ${CONFIGURE}
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
echo BUILDBOT JOB: $jobid retroarch configure success! echo BUILDBOT JOB: $jobid retroarch configure success!
else else
echo BUILDBOT JOB: $jobid retroarch configure failure! echo BUILDBOT JOB: $jobid retroarch configure failure!
@ -810,8 +748,7 @@ then
echo "build command: $MAKE -j${JOBS}" echo "build command: $MAKE -j${JOBS}"
$MAKE -j${JOBS} $MAKE -j${JOBS}
if [ $? -eq 0 ]; if [ $? -eq 0 ]; then
then
MESSAGE="retroarch build successful ($jobid)" MESSAGE="retroarch build successful ($jobid)"
echo $MESSAGE echo $MESSAGE
buildbot_log "$MESSAGE" buildbot_log "$MESSAGE"

42
libretro-config.sh
View File

@ -13,13 +13,10 @@ case "$platform" in
## ##
ios) ios)
# NOTE: This config requires a Mac with an Xcode version new enough for # NOTE: This config requires a Mac with an Xcode installation. These
# its xcrun program to support -show-sdk-path. That pretty much # scripts will work at least as far as 10.5 that we're sure of, but
# limits us to Xcode 5 and above unless someone wants to implement # we build with clang targeting iOS >= 5. We'll accept patches for
# older Xcode version support using an alternate method. Any such # older versions of iOS.
# support could only be for jailbreakers as any libretro core that
# could ever be added to the App Store would require a recent SDK
# and Xcode version to build.
DIST_DIR="ios" DIST_DIR="ios"
FORMAT_EXT=dylib FORMAT_EXT=dylib
@ -34,13 +31,28 @@ case "$platform" in
IOSVER_MINOR=${iosver#*.} IOSVER_MINOR=${iosver#*.}
IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR} IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR}
# Apple requires this stuff # Tell system clang to build for iOS
CC="clang -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK" CC="clang -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
CXX="clang++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK" CXX="clang++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK" CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
;; ;;
theos_ios)
DIST_DIR="theos_ios"
BUILD_PRODUCT_PREFIX="objs/obj"
FORMAT_EXT=dylib
IOS=1
ARCH=armv7
FORMAT=_ios
FORMAT_COMPILER_TARGET=theos_ios
FORMAT_COMPILER_TARGET_ALT=theos_ios
# Make sure that the cross bins you need are first in your path
CXX11="clang++ -std=c++11 -stdlib=libc++ -miphoneos-version-min=5.0"
;;
## ##
## Original libretro-config path ## Original libretro-config path
## ##
@ -105,15 +117,15 @@ B ARM=true
FORMAT_COMPILER_TARGET="psp1" FORMAT_COMPILER_TARGET="psp1"
DIST_DIR="psp1" DIST_DIR="psp1"
;; ;;
*wii*) *wii*)
FORMAT_EXT="a" FORMAT_EXT="a"
FORMAT_COMPILER_TARGET="wii" FORMAT_COMPILER_TARGET="wii"
DIST_DIR="wii" DIST_DIR="wii"
;; ;;
*ios|theos_ios*) theos_ios*)
FORMAT_EXT="dylib" FORMAT_EXT="dylib"
FORMAT_COMPILER_TARGET="theos_ios" FORMAT_COMPILER_TARGET="theos_ios"
DIST_DIR="theos" DIST_DIR="theos_ios"
;; ;;
android) android)
FORMAT_EXT="so" FORMAT_EXT="so"