[X2Go-Commits] [buildscripts] 02/03: bin/nsis-builder.bat: don't edit x2goclient.pro, let config_win.bat handle this.

git-admin at x2go.org git-admin at x2go.org
Sun May 10 02:25:21 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 2d917e19f50e6bd5169d33017ba0279238fa15d8
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun May 10 02:05:29 2015 +0200

    bin/nsis-builder.bat: don't edit x2goclient.pro, let config_win.bat handle this.
    
    Also, don't clean up the build dir. It's potentially harmful and
    config_win.bat will do that for us on the next run.
---
 bin/nsis-builder.bat |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat
index acf1b68..c47b6ec 100755
--- a/bin/nsis-builder.bat
+++ b/bin/nsis-builder.bat
@@ -22,25 +22,19 @@ 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%
+%COMSPEC% /c config_win.bat release || exit /b %errorlevel%
 cd client_build
 mingw32-make -j%NUMBER_OF_PROCESSORS% || 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
-sed -i 's/^^#CONFIG += console/CONFIG += console/' x2goclient.pro
-%COMSPEC% /c config_win.bat || exit /b %errorlevel%
+%COMSPEC% /c config_win.bat debug || exit /b %errorlevel%
 cd client_build
 mingw32-make -j%NUMBER_OF_PROCESSORS% || 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

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list