From f7723c54af894481217ccaaed8a776a9cc05244f Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 14 Mar 2017 11:28:54 -0700 Subject: [PATCH] add debug build for msvc, fix webapp posting of windows debug builds, add manifest file for msvc builds needed for XP --- libretro-buildbot-recipe.sh | 17 +++++++++++------ .../retroarch-windows-msvc2010-x64_seh.conf | 1 + .../retroarch-windows-msvc2010-x86_dw2.conf | 1 + retroarch-build-msvc2010-x64.bat | 1 + retroarch-build-msvc2010-x86.bat | 1 + retroarch-debug-build-msvc2010-x64.bat | 17 +++++++++++++++++ retroarch-debug-build-msvc2010-x86.bat | 16 ++++++++++++++++ 7 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 retroarch-debug-build-msvc2010-x64.bat create mode 100644 retroarch-debug-build-msvc2010-x86.bat diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 26354e07..57050777 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1181,7 +1181,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then buildbot_log "$MESSAGE" echo buildbot job: $MESSAGE - ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/-cg` + ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/` xcodebuild -project RetroArch.xcodeproj -target "RetroArch Cg" -configuration Release | tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_CG_${PLATFORM}.log @@ -1487,12 +1487,12 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO if [ -n ${CUSTOM_BUILD} ]; then ${CUSTOM_BUILD} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - fi strip -s retroarch.exe cp -v retroarch.exe windows/retroarch.exe | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log cp -v retroarch.exe windows/retroarch.exe + cp -v retroarch.exe.manifest windows/retroarch.exe.manifest 2>/dev/null status=$? echo $status @@ -1507,14 +1507,19 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO ${HELPER} ${MAKE} clean - ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/-debug` + ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch-debug" http://buildbot.fiveforty.net/build_entry/` ${HELPER} ${MAKE} -j${JOBS} DEBUG=1 GL_DEBUG=1 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.txt for i in $(seq 3); do for bin in $(ntldd -R *exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -vu "$bin" . ; done; done + if [ -n ${CUSTOM_BUILD_DEBUG} ]; then + ${CUSTOM_BUILD_DEBUG} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + fi + cp -v retroarch.exe windows/retroarch_debug.exe | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log cp -v *.dll windows/ cp -v retroarch.exe windows/retroarch_debug.exe + cp -v retroarch.exe.manifest windows/retroarch.exe.manifest 2>/dev/null curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/ ENTRY_ID="" @@ -1893,7 +1898,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then echo "buildbot job: $jobid Building" echo - ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/-dex` + ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/` cd dist-scripts rm *.a @@ -1914,7 +1919,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" buildbot_log "$MESSAGE" echo buildbot job: $MESSAGE - ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/-cex` + ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/` time sh ./dist-cores.sh cex-ps3 &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_cex.log if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" @@ -1930,7 +1935,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then ENTRY_ID="" buildbot_log "$MESSAGE" echo buildbot job: $MESSAGE - ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/-ode` + ENTRY_ID=`curl -X POST -d type="start" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/` time sh ./dist-cores.sh ode-ps3 &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_ode.log if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" diff --git a/recipes/windows/retroarch-windows-msvc2010-x64_seh.conf b/recipes/windows/retroarch-windows-msvc2010-x64_seh.conf index 415dd41f..5ce15b4c 100644 --- a/recipes/windows/retroarch-windows-msvc2010-x64_seh.conf +++ b/recipes/windows/retroarch-windows-msvc2010-x64_seh.conf @@ -9,3 +9,4 @@ CXX /mingw64/bin/g++ CONFIGURE echo RA YES CUSTOM_BUILD ../retroarch-build-msvc2010-x64.bat +CUSTOM_BUILD_DEBUG ../retroarch-debug-build-msvc2010-x64.bat diff --git a/recipes/windows/retroarch-windows-msvc2010-x86_dw2.conf b/recipes/windows/retroarch-windows-msvc2010-x86_dw2.conf index 9056a2f6..3bdd1b90 100644 --- a/recipes/windows/retroarch-windows-msvc2010-x86_dw2.conf +++ b/recipes/windows/retroarch-windows-msvc2010-x86_dw2.conf @@ -10,3 +10,4 @@ CXX11 g++ CONFIGURE echo RA YES CUSTOM_BUILD ../retroarch-build-msvc2010-x86.bat +CUSTOM_BUILD_DEBUG ../retroarch-debug-build-msvc2010-x86.bat diff --git a/retroarch-build-msvc2010-x64.bat b/retroarch-build-msvc2010-x64.bat index 5fc7bb74..d5755beb 100644 --- a/retroarch-build-msvc2010-x64.bat +++ b/retroarch-build-msvc2010-x64.bat @@ -12,5 +12,6 @@ set TMP= echo Building RetroArch... vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild "Release|x64" /Project RetroArch-msvc2010 /ProjectConfig "Release|x64" move x64\Release\RetroArch-msvc2010.exe ../../retroarch.exe +move x64\Release\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest cat buildlog.txt echo Build finished. diff --git a/retroarch-build-msvc2010-x86.bat b/retroarch-build-msvc2010-x86.bat index f70ab86a..3a558904 100644 --- a/retroarch-build-msvc2010-x86.bat +++ b/retroarch-build-msvc2010-x86.bat @@ -11,5 +11,6 @@ set TMP= echo Building RetroArch... vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild Release move Release\RetroArch-msvc2010.exe ../../retroarch.exe +move Release\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest cat buildlog.txt echo Build finished. diff --git a/retroarch-debug-build-msvc2010-x64.bat b/retroarch-debug-build-msvc2010-x64.bat new file mode 100644 index 00000000..95a0c386 --- /dev/null +++ b/retroarch-debug-build-msvc2010-x64.bat @@ -0,0 +1,17 @@ +@echo off +cd pkg\msvc +rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 +rem del x64\Debug\RetroArch-msvc2010.exe 2>nul +echo %date% %time% >buildlog.txt +tskill vcexpress 2>nul +set platform= +set PLATFORM= +set tmp= +set TMP= +echo Building RetroArch... +vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild "Debug|x64" /Project RetroArch-msvc2010 /ProjectConfig "Debug|x64" +move x64\Debug\RetroArch-msvc2010.exe ../../retroarch.exe +move x64\Debug\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest +cat buildlog.txt +echo Build finished. diff --git a/retroarch-debug-build-msvc2010-x86.bat b/retroarch-debug-build-msvc2010-x86.bat new file mode 100644 index 00000000..ea2b3e2f --- /dev/null +++ b/retroarch-debug-build-msvc2010-x86.bat @@ -0,0 +1,16 @@ +@echo off +cd pkg\msvc +call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +rem del Debug\RetroArch-msvc2010.exe 2>nul +echo %date% %time% >buildlog.txt +tskill vcexpress 2>nul +set platform= +set PLATFORM= +set tmp= +set TMP= +echo Building RetroArch... +vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild Debug +move Debug\RetroArch-msvc2010.exe ../../retroarch.exe +move Debug\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest +cat buildlog.txt +echo Build finished.