This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 0091090417731e50f7699c545a39217925359f7b Author: Mike DePaulo <mikedep333@gmail.com> Date: Fri May 8 15:59:53 2015 -0400 nsis-builder.bat: build both regular and debug A change will be made to x2goclient.git\nsis\x2goclient.nsi to package the x2goclient.debug.exe file. --- bin/nsis-builder.bat | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat index 38ef344..d4d2817 100755 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -12,21 +12,40 @@ if "%1"=="mingw32-4.8" ( set PATH=%PATH%;C:\Program Files (x86)\Git\bin\ set PATH=%PATH%;D:\x2goclient-contrib\upx\3.91_bin\ set PATH=%PATH%;C:\Program Files (x86)\NSIS\Unicode\ + +rmdir /s /q nsis\x2goclient +mkdir nsis\x2goclient + +rem regular build +rem use msysgit's sed +sed -i 's/^^CONFIG += console/#CONFIG += console/' x2goclient.pro +%COMSPEC% /c config_win.bat || exit /b %errorlevel% +cd client_build +mingw32-make || exit /b %errorlevel% +dir release\x2goclient.exe +copy release\x2goclient.exe ..\nsis\x2goclient\ +mingw32-make clean +cd .. + +rem debug build rem use msysgit's sed -rem enable debug -if "%3"=="--console" sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro +sed -i 's/^^#CONFIG += console/CONFIG += console/' x2goclient.pro %COMSPEC% /c config_win.bat || exit /b %errorlevel% cd client_build mingw32-make || exit /b %errorlevel% dir release\x2goclient.exe +copy release\x2goclient.exe ..\nsis\x2goclient\x2goclient.debug.exe +mingw32-make clean cd .. + +rem Don't bother with a debug build for x2gohelper.exe cd x2gohelper mingw32-make || exit /b %errorlevel% +dir ..\client_build\release\x2gohelper.exe +copy ..\client_build\release\x2gohelper.exe ..\nsis\x2goclient\ cd .. -dir client_build\release\x2gohelper.exe -rmdir /s /q nsis\x2goclient + cd nsis -mkdir x2goclient if "%1"=="mingw32-4.4" ( xcopy /S D:\Build\scripts\current_files\%1\%2\x2goclient x2goclient ) @@ -34,8 +53,7 @@ if "%1"=="mingw32-4.4" ( if "%1"=="mingw32-4.8" ( call ..\copy-deps-win32.bat x2goclient ) -copy ..\client_build\release\x2goclient.exe x2goclient\ -copy ..\client_build\release\x2gohelper.exe x2goclient\ upx x2goclient\x2goclient.exe upx x2goclient\x2gohelper.exe makensis x2goclient.nsi || exit /b %errorlevel% +cd .. -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git