fix typos

This commit is contained in:
Radius 2015-01-31 20:33:48 -05:00
parent 920e0d2df6
commit bcfc4f6e50
3 changed files with 92 additions and 102 deletions

View File

@ -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

View File

@ -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

78
radius-buildbot Normal file
View File

@ -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 ####