diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-03-05 23:55:58 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-05 23:55:58 +0100 |
| commit | cac50bdbf61b09eaee418b26cdeab159816e2d63 (patch) | |
| tree | 38be7388d154eea55db2361254faae76c525dc4b /bin/nsis-builder.bat | |
| parent | df2ad298382c1c904a9e9f419485862cbd10c67e (diff) | |
| download | buildscripts-cac50bdbf61b09eaee418b26cdeab159816e2d63.tar.gz buildscripts-cac50bdbf61b09eaee418b26cdeab159816e2d63.tar.bz2 buildscripts-cac50bdbf61b09eaee418b26cdeab159816e2d63.zip | |
build-nsis-package.sh, nsis-builder.bat: make compatible with x2goclient's cleanup branch.
Diffstat (limited to 'bin/nsis-builder.bat')
| -rwxr-xr-x | bin/nsis-builder.bat | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat index 5b78522..38ef344 100755 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -16,12 +16,14 @@ rem use msysgit's sed rem enable debug
if "%3"=="--console" 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
-cd x2gohelper
+cd ..
+cd x2gohelper
mingw32-make || exit /b %errorlevel%
cd ..
-dir release\x2gohelper.exe
+dir client_build\release\x2gohelper.exe
rmdir /s /q nsis\x2goclient
cd nsis
mkdir x2goclient
@@ -32,8 +34,8 @@ if "%1"=="mingw32-4.4" ( if "%1"=="mingw32-4.8" (
call ..\copy-deps-win32.bat x2goclient
)
-copy ..\release\x2goclient.exe x2goclient\
-copy ..\release\x2gohelper.exe 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%
|