From 68ce57061dfb4e9e6d3ed5a04b02eda2bc1100ea Mon Sep 17 00:00:00 2001 From: Radius Date: Fri, 11 Sep 2015 00:14:34 +0100 Subject: [PATCH] 3ds changes and cleanps --- libretro-buildbot-recipe.sh | 14 +++++-- radius-buildbot | 78 ------------------------------------- recipes/nintendo/3ds | 10 ++--- scripto | 40 ------------------- 4 files changed, 15 insertions(+), 127 deletions(-) delete mode 100644 radius-buildbot delete mode 100644 scripto diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 4b8834c2..d1416b6d 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -41,9 +41,15 @@ echo if [ -z "$JOBS" ]; then JOBS=4 fi + if [ -z "$FORCE" ]; then FORCE=NO fi + +if [ -z "$FORCERA" ]; then + FORCERA=NO +fi + OLDFORCE=$FORCE @@ -1871,11 +1877,11 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then RADIR=$DIR if [[ $OUT == *"Already up-to-date"* ]]; then BUILD="NO" - else + else BUILD="YES" fi fi - echo $OUT $BUILD $FORCE + echo $OUT $BUILD $FORCE $FORCERA cd $WORK else @@ -1897,12 +1903,12 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then echo done < $1.ra - if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then + if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCERA}" == "YES" ]; then cd $RADIR echo "BUILDBOT JOB: $jobid Building" echo - if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then + if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCERA}" == "YES" ]; then cd dist-scripts rm *.a cp -v $RARCH_DIST_DIR/*.a . diff --git a/radius-buildbot b/radius-buildbot deleted file mode 100644 index 6aa24ec1..00000000 --- a/radius-buildbot +++ /dev/null @@ -1,78 +0,0 @@ - -#!/bin/bash - -cd buildbot -WORKDIR=$PWD - -#### ASSET SECTION #### - -#### END ASSET SECTION #### - - -#### WINX64 BUILDBOT SECTION #### - -echo STARTING WIN_X64 BUILDBOT -echo ========================================================================================= - -# prepare build environment -BOT=$PWD/buildbot_x64 -cd $BOT -git pull - -# build cores -echo BUILDBOT TASK: building retroarch-mingw-w64-seh -./libretro-buildbot-recipe.sh recipes/win_x64/retroarch-mingw-w64-seh -echo BUILDBOT TASK: building cores-mingw-w64-seh -./libretro-buildbot-recipe.sh recipes/win_x64/cores-mingw-w64-seh -echo BUILDBOT TASK: building cores-mingw-w64-sjlj -./libretro-buildbot-recipe.sh recipes/win_x64/cores-mingw-w64-sjlj - -# create packages and cleanup -echo BUILDBOT TASK: packaging cores -CORE_DIR=$PWD/packages/$(date +%F)_cores -RA_DIR=$PWD/packages/$(date +%F)_RetroArch -mkdir $CORE_DIR -p -mkdir $RA_DIR -p - -cp -rf retroarch/windows/* $RA_DIR - -cd $CORE_DIR -mkdir ../latest - -find ../../dist/win_x64 -name '*.dll' -mmin -1000 -exec cp '{}' . \; -cp ../../dist/info/*.info . - -7z a -mx9 "${CORE_DIR}.7z" *.dll *.info - -find . -type f -name '*.dll' -exec zip -j '{}'.zip '{}' \; -find . -type f -name '*.dll' -exec rm '{}' \; - -find . -type f -name '*.info' -exec rm '{}' \; -find . -type f -name '*.dll' -exec rm '{}' \; - -cp *.zip ../latest/ - -echo -rsync --progress ../latest/*.zip buildbot@buildbot.libretro.com:/home/buildbot/www/nightly/win-x86_64/latest/ - -cd .. - -cd $RA_DIR -7z a -mx9 "${RA_DIR}.7z" * - -rsync --progress ../*.7z buildbot@buildbot.libretro.com:/home/buildbot/www/nightly/win-x86_64/ - -cd .. - -echo BUILDBOT TASK: cleaning up - -rm -rf $CORE_DIR.7z -rm -rf $CORE_DIR -rm -rf packages/latest -rm -rf $RA_DIR.7z -rm -rf $RA_DIR - -cd $WORKDIR -echo -#### END WINDOWS X64 BUILDBOT #### - diff --git a/recipes/nintendo/3ds b/recipes/nintendo/3ds index 06f4fa70..2726d7ae 100644 --- a/recipes/nintendo/3ds +++ b/recipes/nintendo/3ds @@ -1,16 +1,16 @@ 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 . gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . -mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC Makefile . mgba libretro-mgba https://github.com/libretro/mgba.git PROJECT YES GENERIC Makefile.libretro . -nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT NO GENERIC Makefile libretro +nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC Makefile libretro nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . -picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE NO GENERIC Makefile.libretro . +picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC Makefile.libretro . snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC Makefile.libretro . -tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT NO GENERIC Makefile . -tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT NO GENERIC Makefile . +tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile . +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . diff --git a/scripto b/scripto deleted file mode 100644 index b913d667..00000000 --- a/scripto +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -WORKDIR=$PWD -### run this inside a libretro super clone - - -### ios cores - -echo BUILDBOT TASK: packaging-cores -CORE_DIR=$PWD/ios_cores/$(date +%F)_cores -mkdir -p $CORE_DIR - -cd $CORE_DIR -mkdir -p ../latest/ - -find ../../dist/ios -name '*.dylib' -mmin -1000 -exec cp '{}' ./ \; -find ./ -type f -name '*.dylib' -exec zip -j '{}'.zip '{}' \; -find ./ -type f -name '*.dylib' -exec rm -rv '{}' \; -find ./ -type f -name '*.zip' -exec cp -v '{}' ../latest/ \; - -rsync -av ../* buildbot@bot.libretro.com:/home/buildbot/www/nightly/ios - -cd $WORKDIR - -### osx-x86_64 cores - -echo BUILDBOT TASK: packaging-cores -CORE_DIR=$PWD/osx-x86_64_cores/$(date +%F)_cores -mkdir -p $CORE_DIR - -cd $CORE_DIR -mkdir -p ../latest/ - -find ../../dist/osx-x86_64 -name '*.dylib' -mmin -1000 -exec cp '{}' ./ \; -find ./ -type f -name '*.dylib' -exec zip -j '{}'.zip '{}' \; -find ./ -type f -name '*.dylib' -exec rm -rv '{}' \; -find ./ -type f -name '*.zip' -exec cp -v '{}' ../latest/ \; - -rsync -av ../* buildbot@bot.libretro.com:/home/buildbot/www/nightly/osx-x86_64 - -cd $WORKDIR