From 2ee0c00a85cf68cf689b80e713874d14bef391fd Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Fri, 12 Sep 2014 07:33:39 -0400 Subject: Initial work on handlings multiple versions of MinGW + Qt. MinGW 4.4 and Qt 4.8.5 are still hardcoded. --- bin/nsis-builder.bat | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) mode change 100644 => 100755 bin/nsis-builder.bat (limited to 'bin/nsis-builder.bat') diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat old mode 100644 new mode 100755 index c61dc7b..32b3413 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -1,28 +1,33 @@ -call "D:\Qt\4.8.5\bin\qtvars.bat" -set PATH=%PATH%;D:\MinGW\libexec\gcc\mingw32\4.4.0\ +D: +if "%1"=="mingw32-4.4" ( + cd D:\Build\GIT\nightly\mingw32-4.4\qt-4.8\x2goclient\ + rem this includes setting PATH=%PATH%;D:\MinGW\libexec\gcc\mingw32\4.4.0\ + call "D:\Qt\4.8.5\bin\qtvars.bat" +) +if "%1"=="mingw32-4.8" ( + cd D:\Build\GIT\nightly\mingw32-4.8\qt-4.8\x2goclient\ + rem this includes setting PATH=%PATH%;D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\libexec\gcc\i686-w64-mingw32\4.8.2\ + call "D:\Qt\4.8.6\bin\qtvars.bat" +) 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\ -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 +if "%3"=="--console" sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro %COMSPEC% /c config_win.bat || exit /b %errorlevel% mingw32-make || exit /b %errorlevel% dir release\x2goclient.exe -cd x2gohelper +cd x2gohelper mingw32-make || exit /b %errorlevel% cd .. dir release\x2gohelper.exe rmdir /s /q nsis\x2goclient cd nsis mkdir x2goclient -xcopy /S D:\Build\scripts\current_files\x2goclient x2goclient +xcopy /S D:\Build\scripts\current_files\%1\%2\x2goclient x2goclient copy ..\release\x2goclient.exe x2goclient\ copy ..\release\x2gohelper.exe x2goclient\ upx x2goclient\x2goclient.exe upx x2goclient\x2gohelper.exe makensis x2goclient.nsi || exit /b %errorlevel% - - -- cgit v1.2.3