diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-03-05 22:08:21 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-03-05 22:08:21 -0500 |
| commit | f12e37f1bfb216f144d4ab50401960a2ebbfd5d6 (patch) | |
| tree | 0f5344fd8833137e64499e982eda1998d6aefa48 | |
| parent | 3897f4afc038f640a6ab9f7d2a7d87f1d0be8562 (diff) | |
| download | buildscripts-f12e37f1bfb216f144d4ab50401960a2ebbfd5d6.tar.gz buildscripts-f12e37f1bfb216f144d4ab50401960a2ebbfd5d6.tar.bz2 buildscripts-f12e37f1bfb216f144d4ab50401960a2ebbfd5d6.zip | |
Correct location of updated nsis-builder.bat
| -rw-r--r-- | bin/nsis-builder.bat | 2 | ||||
| -rw-r--r-- | nsis-builder.bat | 22 |
2 files changed, 1 insertions, 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
-
-
|