This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit f12e37f1bfb216f144d4ab50401960a2ebbfd5d6 Author: Mike DePaulo <mikedep333@gmail.com> Date: Wed Mar 5 22:08:21 2014 -0500 Correct location of updated nsis-builder.bat --- bin/nsis-builder.bat | 2 +- nsis-builder.bat | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat index f2d00b8..5a857a4 100644 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -8,7 +8,7 @@ D: cd D:\Build\GIT\nightly\x2goclient rem use msysgit's sed rem enable debug -sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro +if "%1"=="--console" sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro %COMSPEC% /c config_win.bat mingw32-make dir release\x2goclient.exe diff --git a/nsis-builder.bat b/nsis-builder.bat deleted file mode 100644 index 5a857a4..0000000 --- a/nsis-builder.bat +++ /dev/null @@ -1,22 +0,0 @@ -call "D:\Qt\4.8.5\bin\qtvars.bat" -set PATH=%PATH%;D:\MinGW\libexec\gcc\mingw32\4.4.0\ -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\ -echo "hello" > D:\test.txt -D: -cd D:\Build\GIT\nightly\x2goclient -rem use msysgit's sed -rem enable debug -if "%1"=="--console" sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro -%COMSPEC% /c config_win.bat -mingw32-make -dir release\x2goclient.exe -cd nsis -mkdir x2goclient -xcopy /S D:\Build\scripts\current_files\x2goclient x2goclient -copy ..\release\x2goclient.exe x2goclient\ -upx x2goclient\x2goclient.exe -makensis x2goclient.nsi - - -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git