This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from bc3b072 Add mingw32-4.8+qt-4.8+release.wrapper.sh new d24b7f9 bin/build-nsis-package.sh: PROJECT_DIR should be set to the default when null and is optional. new 2d917e1 bin/nsis-builder.bat: don't edit x2goclient.pro, let config_win.bat handle this. new 0f2fe28 bin/generate-nsis-version.pl: consolidate date to always use YYYY.MM.DD, simplify hash append for nightly builds. 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/build-nsis-package.sh | 4 ++-- bin/generate-nsis-version.pl | 17 ++++++----------- bin/nsis-builder.bat | 10 ++-------- 3 files changed, 10 insertions(+), 21 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 d24b7f9cdeb60737522b4cd0e9afcee2e0821800 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 10 01:19:40 2015 +0200 bin/build-nsis-package.sh: PROJECT_DIR should be set to the default when null and is optional. --- bin/build-nsis-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index f16766a..0bae4e3 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -41,7 +41,7 @@ COMPONENT_BUNDLES="baikal" REPOS_SERVER="code.x2go.org" GNUPGHOME=$HOME/.gnupg -test -z $1 && { echo "usage: {PROJECT_DIR=/cygwin/path/} $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; } +test -z $1 && { echo "usage: [PROJECT_DIR=/cygwin/path/] $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; } NO_DELAY=${NO_DELAY:-"no"} FORCE_BUILD=${FORCE_BUILD:-"yes"} @@ -84,7 +84,7 @@ set_vars() { [ "x$DATE" = "xtoday" ] && DATE="$(date +%Y%m%d)" # setting paths - : ${PROJECT_DIR="/cygdrive/d/Build/GIT/nightly/$l_DIST/$l_CODENAME/x2goclient"} + : ${PROJECT_DIR:="/cygdrive/d/Build/GIT/nightly/$l_DIST/$l_CODENAME/x2goclient"} PKGDIST="/cygdrive/d/Build/pkg-dist/nightly/$l_DIST/$l_CODENAME/x2goclient" # build for other architectures than amd64/i386 -- 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 0f2fe2857f6b66f5fd9c5718af818aff7530f0d6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 10 02:17:24 2015 +0200 bin/generate-nsis-version.pl: consolidate date to always use YYYY.MM.DD, simplify hash append for nightly builds. --- bin/generate-nsis-version.pl | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/bin/generate-nsis-version.pl b/bin/generate-nsis-version.pl index 7c136d3..a562ebe 100755 --- a/bin/generate-nsis-version.pl +++ b/bin/generate-nsis-version.pl @@ -4,13 +4,7 @@ use strict; use POSIX qw(strftime); -my $date; - -if (defined $ENV{'RELEASE'}) { - $date = strftime "%Y%m%d", localtime; -} else { - $date = strftime "%Y.%m.%d", localtime; -} +my $date = strftime "%Y.%m.%d", localtime; open(F,"<$ARGV[0]/src/version.h") or die; my @lines=<F>; @@ -27,11 +21,12 @@ close(F); $text=join("",@lines); -if (defined $ENV{'RELEASE'}) { - $text=~s/X2GOCLIENT_VERSION/$version-$date/; -} else { - $text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/; +my $replacement="$version-$date"; +if (!defined $ENV{'RELEASE'}) { + $replacement .= "-$hash"; } + +$text=~s/X2GOCLIENT_VERSION/$replacement/; #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 2d917e19f50e6bd5169d33017ba0279238fa15d8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 10 02:05:29 2015 +0200 bin/nsis-builder.bat: don't edit x2goclient.pro, let config_win.bat handle this. Also, don't clean up the build dir. It's potentially harmful and config_win.bat will do that for us on the next run. --- bin/nsis-builder.bat | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat index acf1b68..c47b6ec 100755 --- a/bin/nsis-builder.bat +++ b/bin/nsis-builder.bat @@ -22,25 +22,19 @@ 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% +%COMSPEC% /c config_win.bat release || exit /b %errorlevel% cd client_build mingw32-make -j%NUMBER_OF_PROCESSORS% || 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 -sed -i 's/^^#CONFIG += console/CONFIG += console/' x2goclient.pro -%COMSPEC% /c config_win.bat || exit /b %errorlevel% +%COMSPEC% /c config_win.bat debug || exit /b %errorlevel% cd client_build 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 cd .. rem Don't bother with a debug build for x2gohelper.exe -- 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