summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-01-29 04:14:51 +0100
committerMihai Moldovan <ionic@ionic.de>2015-01-29 04:14:51 +0100
commit73009d54fe2ff297e9694a84e05dd7bc591f69d0 (patch)
tree14019579069b6051d113d1455984e496b093b403
parent4785a98e9996c30d29f7db9f5503742824bed782 (diff)
downloadbuildscripts-73009d54fe2ff297e9694a84e05dd7bc591f69d0.tar.gz
buildscripts-73009d54fe2ff297e9694a84e05dd7bc591f69d0.tar.bz2
buildscripts-73009d54fe2ff297e9694a84e05dd7bc591f69d0.zip
bin/build-{deb,nsis}-package: add NO_DELAY option and logic copied over from bin/build-rpm-package.
-rwxr-xr-xbin/build-deb-package3
-rwxr-xr-xbin/build-nsis-package.sh3
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