This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/x2goclient-cleanup in repository buildscripts. commit cac50bdbf61b09eaee418b26cdeab159816e2d63 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 23:55:58 2015 +0100 build-nsis-package.sh, nsis-builder.bat: make compatible with x2goclient's cleanup branch. --- bin/build-nsis-package.sh | 4 ++-- bin/nsis-builder.bat | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index 42fed20..5ecadb6 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -196,11 +196,11 @@ build_packages() { ./generate-nsis-version.pl $PROJECT_DIR cd $PROJECT_DIR - cp -a debian/changelog txt/ + cp -a debian/changelog res/txt/ # create git changelog immediately prior to building the SRPM package git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog - cp ChangeLog.gitlog txt/git-info + cp ChangeLog.gitlog res/txt/git-info cd /cygdrive/d/Build/buildscripts/bin/ 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% -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git