This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from a320e93 bin/build-rpm-package: add SRPM upload capability. new e1e4795 bin/build-{deb,nsis,rpm}-package: fix FORCE_BUILD and NO_DELAY logic to treat any value other than "no" or "0" as true. new 4785a98 bin/build-rpm-package: fix error in NO_DELAY logic. new 73009d5 bin/build-{deb,nsis}-package: add NO_DELAY option and logic copied over from bin/build-rpm-package. 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-deb-package | 6 ++++-- bin/build-nsis-package.sh | 6 ++++-- bin/build-rpm-package | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) -- Alioth's /srv/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 e1e4795e4e1277fd28ecb33be763b148a9a6df64 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 29 04:04:36 2015 +0100 bin/build-{deb,nsis,rpm}-package: fix FORCE_BUILD and NO_DELAY logic to treat any value other than "no" or "0" as true. --- bin/build-deb-package | 5 +++-- bin/build-nsis-package.sh | 5 +++-- bin/build-rpm-package | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index 0ac9f1d..ba6ce14 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -344,8 +344,9 @@ delay_build() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { - if [ "x$FORCE_BUILD" = "xyes" ]; then + # Treat any value other than "no" and "0" as true. + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { + if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ]; then delay_build fi lock_workspace diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index 64087a6..aec26a4 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -267,8 +267,9 @@ delay_build() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "xbuild-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { - if [ "x$FORCE_BUILD" = "xyes" ]; then + # Treat any value other than "no" and "0" as true. + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { + if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ]; then delay_build fi lock_workspace diff --git a/bin/build-rpm-package b/bin/build-rpm-package index d923b76..0680e4e 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -453,8 +453,9 @@ delay_build() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { - if [ "x$FORCE_BUILD" = "xyes" ] && [ "x$NO_DELAY" != "xyes" ]; then + # Treat any value other than "no" and "0" as true. + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { + if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then delay_build fi lock_workspace -- Alioth's /srv/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 4785a98e9996c30d29f7db9f5503742824bed782 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 29 04:12:25 2015 +0100 bin/build-rpm-package: fix error in NO_DELAY logic. --- bin/build-rpm-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 0680e4e..e0b514e 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -455,7 +455,7 @@ set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then # Treat any value other than "no" and "0" as true. cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { - if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then + if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && [ "x$NO_DELAY" != "xno" ] && [ "x$NO_DELAY" != "x0" ]; then delay_build fi lock_workspace -- Alioth's /srv/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 73009d54fe2ff297e9694a84e05dd7bc591f69d0 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 29 04:14:51 2015 +0100 bin/build-{deb,nsis}-package: add NO_DELAY option and logic copied over from bin/build-rpm-package. --- bin/build-deb-package | 3 ++- bin/build-nsis-package.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index ba6ce14..38bb18b 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -41,6 +41,7 @@ test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main PREFIX=$(echo `basename $0` | cut -d"-" -f1) test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; } +NO_DELAY=${NO_DELAY:-"no"} FORCE_BUILD=${FORCE_BUILD:-"no"} DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:$DEBIAN_DISTROS ubuntu:$UBUNTU_DISTROS"} @@ -346,7 +347,7 @@ set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then # Treat any value other than "no" and "0" as true. cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { - if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ]; then + if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && [ "x$NO_DELAY" != "xno" ] && [ "x$NO_DELAY" != "x0" ]; then delay_build fi lock_workspace diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index aec26a4..0aa6e9a 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -43,6 +43,7 @@ GNUPGHOME=$HOME/.gnupg test -z $1 && { echo "usage: $(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"} echo ${NSIS_BUILD_FOR} @@ -269,7 +270,7 @@ set_vars $@ && { if [ "x$(basename $0)" = "xbuild-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; then # Treat any value other than "no" and "0" as true. cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { - if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ]; then + if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && [ "x$NO_DELAY" != "xno" ] && [ "x$NO_DELAY" != "x0" ]; then delay_build fi lock_workspace -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org