From 329bab772a9b4c4eac1d49e891368f70c8af6451 Mon Sep 17 00:00:00 2001 From: Radius Date: Tue, 15 Sep 2015 00:25:58 +0100 Subject: [PATCH] fix vita conf mistake --- libretro-buildbot-recipe.sh | 127 ++++++++++++++++++++++++++++++++++ recipes/playstation/vita | 16 ++--- recipes/playstation/vita.conf | 8 +++ 3 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 recipes/playstation/vita.conf diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 86f12787..4bab67bb 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1922,5 +1922,132 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then fi fi +if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then + while read line; do + NAME=`echo $line | cut -f 1 -d " "` + DIR=`echo $line | cut -f 2 -d " "` + URL=`echo $line | cut -f 3 -d " "` + TYPE=`echo $line | cut -f 4 -d " "` + ENABLED=`echo $line | cut -f 5 -d " "` + PARENTDIR=`echo $line | cut -f 6 -d " "` + + if [ "${ENABLED}" == "YES" ]; 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 + + ARGS="" + + TEMP=`echo $line | cut -f 9 -d " "` + if [ -n ${TEMP} ]; then + ARGS="${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut -f 10 -d " "` + if [ -n ${TEMP} ]; then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut -f 11 -d " "` + if [ -n ${TEMP} ]; then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut -f 12 -d " "` + if [ -n ${TEMP} ]; then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut -f 13 -d " "` + if [ -n ${TEMP} ]; then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut -f 14 -d " "` + if [ -n ${TEMP} ]; then + ARGS="${ARGS} ${TEMP}" + fi + + ARGS="${ARGS%"${ARGS##*[![:space:]]}"}" + + echo ARGS: $ARGS + + if [ -d "${PARENTDIR}/${DIR}/.git" ]; then + cd $PARENTDIR + cd $DIR + echo "pulling from repo... " + OUT=`git pull` + echo $OUT + if [ "${TYPE}" == "PROJECT" ]; then + RADIR=$DIR + if [[ $OUT == *"Already up-to-date"* ]]; then + BUILD="NO" + else + BUILD="YES" + fi + fi + echo $OUT $BUILD $FORCE $FORCE_RETROARCH_BUILD + + cd $WORK + else + echo "cloning repo..." + cd $PARENTDIR + git clone "$URL" "$DIR" --depth=1 + cd $DIR + + if [ "${TYPE}" == "PROJECT" ]; then + BUILD="YES" + RADIR=$DIR + + fi + cd $WORK + fi + fi + + echo + echo + done < $1.ra + + if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then + touch /tmp/built-frontend + cd $RADIR + echo "BUILDBOT JOB: $jobid Building" + echo + + cd dist-scripts + rm *.a + 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 + 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` + 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 + cd $WORK/$RADIR + + + echo "Packaging" + echo ============================================ + cp retroarch.cfg retroarch.default.cfg + + mkdir -p pkg/vita + mkdir -p pkg/vita/remaps + cp -rf media/overlays/* pkg/vita/overlays/ + fi +fi + PATH=$ORIGPATH diff --git a/recipes/playstation/vita b/recipes/playstation/vita index 35e1a18c..c3738e83 100644 --- a/recipes/playstation/vita +++ b/recipes/playstation/vita @@ -1,8 +1,8 @@ -PATH /home/buildbot/tools/devkitpro/devkitARM/bin -platform vita -PLATFORM vita -VITASDK /home/buildbot/tools/devkitpro -RA YES -JOBS 4 - - +2048 libretro-2048 https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC Makefile.libretro . +catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC Makefile . +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . +gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile.libretro libgambatte +genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . +mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . +nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . +snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC Makefile.libretro . diff --git a/recipes/playstation/vita.conf b/recipes/playstation/vita.conf new file mode 100644 index 00000000..310ad823 --- /dev/null +++ b/recipes/playstation/vita.conf @@ -0,0 +1,8 @@ +PATH /home/buildbot/tools/devkitpro/devkitARM/bin +platform vita +PLATFORM vita +VITASDK /home/buildbot/tools/psv/ +RA YES +JOBS 4 + +