From 7b2c1471db2c27adafde57ad37cf55b4a840194b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 Jan 2015 13:25:56 +0100 Subject: [PATCH 1/3] Add libretro-dat-pull to libretro-fetch.sh --- libretro-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/libretro-fetch.sh b/libretro-fetch.sh index ae8698fc..f0682f7c 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -176,3 +176,4 @@ fetch_project "$REPO_BASE/libretro/TempGBA-libretro.git" "libretro-tempgba" "lib fetch_project "$REPO_BASE/libretro/gpsp.git" "libretro-gpsp" "libretro/gpsp" fetch_project "$REPO_BASE/libretro/emux.git" "libretro-emux" "libretro/Emux" fetch_project "$REPO_BASE/libretro/libretrodb.git" "libretrodb" "libretro/libretrodb" +fetch_project "$REPO_BASE/libretro/libretro-dat-pull.git" "libretro-dat-pull" "libretro/libretro-dat-pull" From 920e0d2df6ccc81ca4f499afec7f075874fd31e2 Mon Sep 17 00:00:00 2001 From: Radius Date: Sat, 31 Jan 2015 20:24:33 -0500 Subject: [PATCH 2/3] Add MAME2010 and MAME0023 targets for win x64. MAME2003 still fails a the linking phase --- libretro-buildbot-recipe.sh | 5 +++++ recipes/win_x64/cores-mingw-w64-sjlj | 2 ++ recipes/win_x64/cores-mingw-w64-sjlj.conf | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 60742d12..b9bbf580 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -215,6 +215,11 @@ build_libretro_generic_makefile() { ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} else echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" + if [ "${NAME}" == "mame2010" ]; + then + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools + fi + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} fi diff --git a/recipes/win_x64/cores-mingw-w64-sjlj b/recipes/win_x64/cores-mingw-w64-sjlj index 7d9fef9e..44630a8f 100644 --- a/recipes/win_x64/cores-mingw-w64-sjlj +++ b/recipes/win_x64/cores-mingw-w64-sjlj @@ -1,3 +1,5 @@ +mame078 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile . PTR64=1 ARCH= +mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile.libretro . VRENDER=soft PTR64=1 mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=1 PARTIAL=0 mess libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PTR64=1 PARTIAL=1 ume libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=1 PARTIAL=1 diff --git a/recipes/win_x64/cores-mingw-w64-sjlj.conf b/recipes/win_x64/cores-mingw-w64-sjlj.conf index 24bc5497..dc6134e4 100644 --- a/recipes/win_x64/cores-mingw-w64-sjlj.conf +++ b/recipes/win_x64/cores-mingw-w64-sjlj.conf @@ -1,7 +1,7 @@ PATH /c/Toolchains/mingw64_posix/bin:/c/Toolchains/python64 platform MINGW64 ARCH x86_64 -MAKE mingw32-make.exe +MAKE make CC gcc CXX g++ - +PTR64 1 From bcfc4f6e5067f01d4c8fb5f89ed92d433eeb1ed0 Mon Sep 17 00:00:00 2001 From: Radius Date: Sat, 31 Jan 2015 20:33:48 -0500 Subject: [PATCH 3/3] fix typos --- buildbot-script | 89 ------------------------------------- libretro-buildbot-recipe.sh | 27 +++++------ radius-buildbot | 78 ++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 102 deletions(-) delete mode 100644 buildbot-script create mode 100644 radius-buildbot diff --git a/buildbot-script b/buildbot-script deleted file mode 100644 index 7b78d325..00000000 --- a/buildbot-script +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -cd buildbot_ndk -rm *.log -git pull -time PLATFORM=ndk ./libretro-buildbot-recipe.sh recipes/recipes-android | tee ndk-build.log -echo -echo - -RA_DIR=$(pwd)/retroarch/android/ -cd $RA_DIR -mkdir pkg -cd pkg - -mkdir "$(date +%F)_cores" "$(date +%F)_cores" -cp -Rv ../../../dist/android/* "$(date +%F)_cores" -cp -v ../../../ndk-build.log "$(date +%F)_RetroArch.log" -cp -v ../phoenix/bin/retroarch-debug.apk "$(date +%F)_RetroArch.apk" -find . -type f -name '*.so' -exec zip '{}'.zip '{}' \; - -rsync --progress * user@host:/home/buildbot/www/nightly/android/ -cd -echo -echo - -cd buildbot_x64 -rm *.log -git pull -time ./libretro-buildbot-recipe.sh recipes/recipes.win-mingw64-seh | tee win-mingw64-seh-build.log -echo -echo -time ./libretro-buildbot-recipe.sh recipes/recipes.win-mingw64-sjlj | tee win-mingw64-sjlj-build.log -echo -echo - -RA_DIR=$(pwd)/packages_x64/$(date +%F)_cores -mkdir $RA_DIR -p -cd $RA_DIR -cp -v ../../dist/win_x64/*.dll . -cp -v ../../dist/info/*.info . -cp -v ../../win-mingw64*.log . - -7z u -mx9 "${RA_DIR}.7z" * -rsync --progress ../*.7z user@host:/home/buildbot/www/nightly/win-x86_64 -cd -echo -echo - -cd buildbot_x86 -rm *.log -git pull -time ./libretro-buildbot-recipe.sh recipes/recipes.win-mingw32-dw2 | tee win-mingw32-dw2-build.log -echo -echo -time ./libretro-buildbot-recipe.sh recipes/recipes.win-mingw32-sjlj | tee win-mingw32-sjlj-build.log -echo -echo - -RA_DIR=$(pwd)/packages_x86/$(date +%F)_cores -mkdir $RA_DIR -p -cd $RA_DIR -cp -v ../../dist/win_x86/*.dll . -cp -v ../../dist/info/*.info . -cp -v ../../win-mingw32*.log . - -7z u -mx9 "${RA_DIR}.7z" * -rsync --progress ../*.7z user@host:/home/buildbot/www/nightly/win-x86 -cd -echo -echo - -cd buildbot_psp -rm *.log -git pull -time SUFFIX=_psp1 PLATFORM=psp1 ./libretro-buildbot-recipe.sh recipes/recipes.pspsdk | tee psp-build.log -echo -echo - -RA_DIR=$(pwd)/retroarch/psp1/pkg/ -cd $RA_DIR - -cp -v ../../../dist/info/fceumm_libretro.info ../../../dist/info/fmsx_libretro.info ../../../dist/info/gambatte_libretro.info ../../../dist/info/mednafen_pce_fast_libretro.info ../../../dist/info/nxengine_libretro.info ../../../dist/info/prboom_libretro.info ../../../dist/info/tempgba_libretro.info ./cores/ -cp -v ../../../psp*.log . - -7z u -mx9 "$(date +%F)_RetroArch.7z" * -rsync --progress *.7z user@host:/home/buildbot/www/nightly/psp -cd -echo -echo diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index b9bbf580..022a5c42 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -211,15 +211,16 @@ build_libretro_generic_makefile() { echo "compiling..." if [ -z "${ARGS}" ] then - echo "buid 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} else - echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" if [ "${NAME}" == "mame2010" ]; then + + echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools fi - + echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} fi @@ -268,10 +269,10 @@ build_libretro_generic_theos() { echo "compiling..." if [ -z "${ARGS}" ] then - echo "buid 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} else - echo "buid 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} fi @@ -315,10 +316,10 @@ build_libretro_generic_jni() { echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}" + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" ${NDK} -j${JOBS} APP_ABI=${a} else - echo "buid 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} fi if [ $? -eq 0 ]; @@ -363,10 +364,10 @@ build_libretro_bsnes_jni() { echo "compiling for ${a}..." if [ -z "${ARGS}" ] then - echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}" + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" ${NDK} -j${JOBS} APP_ABI=${a} else - echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}" + echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" ${NDK} -j${JOBS} APP_ABI=${a} fi if [ $? -eq 0 ]; @@ -412,10 +413,10 @@ build_libretro_generic_gl_makefile() { echo "compiling..." if [ -z "${ARGS}" ]; then - echo "buid 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} else - echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS}" + echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS}" ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} fi @@ -477,10 +478,10 @@ build_libretro_bsnes() { ${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}" elif [ "${PROFILE}" == "bnes" ]; then - echo "buid 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} else - echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}" + echo "build command: ${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 diff --git a/radius-buildbot b/radius-buildbot new file mode 100644 index 00000000..b6bf562f --- /dev/null +++ b/radius-buildbot @@ -0,0 +1,78 @@ + +#!/bin/sh + +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 #### +