diff options
| -rwxr-xr-x | bin/build-deb-package | 6 | ||||
| -rwxr-xr-x | bin/build-rpm-package | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/build-deb-package b/bin/build-deb-package index 0ea31f3..1a4c183 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -40,6 +40,8 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME=$HOME/.gnupg +FORCE_BUILD=${FORCE_BUILD:-"no"} + test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } PREFIX=$(echo `basename $0` | cut -d"-" -f1) @@ -64,7 +66,7 @@ set_vars() { ARGV2_CODENAME="$(echo "$2/" | cut -d"/" -f2)" COMPONENT="${ARGV2_COMPONENT:-${COMPONENT:-$COMPONENT_NIGHTLY}}" CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" - [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1 + [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then CHECKOUT="${3:-build-main}" @@ -317,7 +319,7 @@ upload_packages() { ### 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" -eq 0 ] && { + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { prepare_workspace && { clear_pkgdist build_packages diff --git a/bin/build-rpm-package b/bin/build-rpm-package index c38617c..a87e152 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -41,6 +41,8 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME=$HOME/.gnupg +FORCE_BUILD=${FORCE_BUILD:-"no"} + test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } PREFIX=$(echo `basename $0` | cut -d"-" -f1) @@ -63,7 +65,7 @@ set_vars() { ARGV2_CODENAME="$(echo "$2/" | cut -d"/" -f2)" COMPONENT="${ARGV2_COMPONENT:-${COMPONENT:-$COMPONENT_NIGHTLY}}" CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" - [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1 + [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then CHECKOUT="${3:-build-main}" @@ -266,7 +268,7 @@ upload_packages() { ### 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" -eq 0 ] && { + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { prepare_workspace && { clear_pkgdist build_packages |