This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 5f8af1b Make PROJECT_DIR settable new 0091090 nsis-builder.bat: build both regular and debug new 474e09c generate-nsis-version.pl: Generate release strings new 61bd803 nsis-builder.bat: Use # of CPU threads as jobs for make. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/generate-nsis-version.pl | 14 ++++++++++++-- bin/nsis-builder.bat | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 10 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 0091090417731e50f7699c545a39217925359f7b Author: Mike DePaulo <mikedep333@gmail.com> Date: Fri May 8 15:59:53 2015 -0400 nsis-builder.bat: build both regular and debug A change will be made to x2goclient.git\nsis\x2goclient.nsi to package the x2goclient.debug.exe file. --- bin/nsis-builder.bat | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat index 38ef344..d4d2817 100755 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -12,21 +12,40 @@ if "%1"=="mingw32-4.8" ( 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\ + +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% +cd client_build +mingw32-make || 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 -rem enable debug -if "%3"=="--console" sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro +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 +copy release\x2goclient.exe ..\nsis\x2goclient\x2goclient.debug.exe +mingw32-make clean cd .. + +rem Don't bother with a debug build for x2gohelper.exe cd x2gohelper mingw32-make || exit /b %errorlevel% +dir ..\client_build\release\x2gohelper.exe +copy ..\client_build\release\x2gohelper.exe ..\nsis\x2goclient\ cd .. -dir client_build\release\x2gohelper.exe -rmdir /s /q nsis\x2goclient + cd nsis -mkdir x2goclient if "%1"=="mingw32-4.4" ( xcopy /S D:\Build\scripts\current_files\%1\%2\x2goclient x2goclient ) @@ -34,8 +53,7 @@ if "%1"=="mingw32-4.4" ( if "%1"=="mingw32-4.8" ( call ..\copy-deps-win32.bat 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% +cd .. -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 474e09c8e9dd7ae5a4571157172f10a4a4d6d54c Author: Mike DePaulo <mikedep333@gmail.com> Date: Fri May 8 16:10:53 2015 -0400 generate-nsis-version.pl: Generate release strings if env var $RELEASE is defined. This enables us to do official builds of x2goclient from Jenkins. --- bin/generate-nsis-version.pl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/generate-nsis-version.pl b/bin/generate-nsis-version.pl index 8a85032..7c136d3 100755 --- a/bin/generate-nsis-version.pl +++ b/bin/generate-nsis-version.pl @@ -4,7 +4,13 @@ use strict; use POSIX qw(strftime); -my $date = strftime "%Y.%m.%d", localtime; +my $date; + +if (defined $ENV{'RELEASE'}) { + $date = strftime "%Y%m%d", localtime; +} else { + $date = strftime "%Y.%m.%d", localtime; +} open(F,"<$ARGV[0]/src/version.h") or die; my @lines=<F>; @@ -21,7 +27,11 @@ close(F); $text=join("",@lines); -$text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/; +if (defined $ENV{'RELEASE'}) { + $text=~s/X2GOCLIENT_VERSION/$version-$date/; +} else { + $text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/; +} #print $text; open(F,">$ARGV[0]/nsis/x2goclient.nsi") or die; -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 61bd803063c861c883922a4cf8b6c33cbc5cce15 Author: Mike DePaulo <mikedep333@gmail.com> Date: Fri May 8 17:15:47 2015 -0400 nsis-builder.bat: Use # of CPU threads as jobs for make. Unless overriden by the env var: JOBS --- bin/nsis-builder.bat | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat index d4d2817..acf1b68 100755 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -1,4 +1,9 @@ D: + +if not defined JOBS ( +set JOBS=%NUMBER_OF_PROCESSORS% +) + 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\ @@ -21,7 +26,7 @@ rem use msysgit's sed 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% +mingw32-make -j%NUMBER_OF_PROCESSORS% || exit /b %errorlevel% dir release\x2goclient.exe copy release\x2goclient.exe ..\nsis\x2goclient\ mingw32-make clean @@ -32,7 +37,7 @@ rem use msysgit's sed 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% +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 -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org