summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-01-01 01:41:59 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-01-01 01:41:59 +0100
commita25b21a27c99430f16912b351b5f201ec6fed396 (patch)
tree2aa231add129875820b008b95097c94e2603e3f5
parent86b60413dccda6ceb5b8a6837973f4201debf553 (diff)
downloadbuildscripts-a25b21a27c99430f16912b351b5f201ec6fed396.tar.gz
buildscripts-a25b21a27c99430f16912b351b5f201ec6fed396.tar.bz2
buildscripts-a25b21a27c99430f16912b351b5f201ec6fed396.zip
add support for building from branch build-$RELEASE
-rwxr-xr-xbin/build-package3
-rw-r--r--home/.buildscripts/x2go.conf1
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/build-package b/bin/build-package
index 3e15745..eac058e 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -33,6 +33,7 @@ ubuntu: lucid precise\n\
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
+COMPONENT_BUNDLES="bundle-release1 bundle-release2"
REPOS_SERVER="packages.mydomain.org"
PACKAGES_WITHOUT_OTHERMIRROR="keyring"
GNUPGHOME=$HOME/.gnupg
@@ -64,6 +65,8 @@ set_vars() {
[ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1
if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then
CHECKOUT="${3:-build-main}"
+ elif [ echo "$COMPONENT_RELEASES" | grep "$COMPONENT" ]; then
+ CHECKOUT="${3:-build-$COMPONENT}"
elif [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then
CHECKOUT="${3:-master}"
DATE="~${DATE:-$(date +%Y%m%d)}"
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index c62cb67..bd056ad 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -13,6 +13,7 @@ debian: squeeze wheezy sid"
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="heuler"
+COMPONENT_RELEASES="baikal"
REPOS_SERVER="packages.x2go.org"
PACKAGE_WITHOUT_OTHERMIRROR="x2go-keyring"