[X2Go-Commits] buildscripts.git - master (branch) updated: 63edba4964c723d4116dc6daeb476d1c5e5d8480
X2Go dev team
git-admin at x2go.org
Sat Nov 30 20:50:32 CET 2013
The branch, master has been updated
via 63edba4964c723d4116dc6daeb476d1c5e5d8480 (commit)
from c1f0d58bbbd8e7233f3190a5d2119581bc3c8742 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63edba4964c723d4116dc6daeb476d1c5e5d8480
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Nov 30 20:49:58 2013 +0100
don't write the DEB_BUILDS_FOR config to file anymore, handle as variable in memory
-----------------------------------------------------------------------
Summary of changes:
bin/build-deb-package | 38 ++++++++++++++++----------------------
home/.buildscripts/itzks.conf | 3 +--
home/.buildscripts/nwt.conf | 4 +---
home/.buildscripts/x2go.conf | 3 +--
4 files changed, 19 insertions(+), 29 deletions(-)
The diff of changes is:
diff --git a/bin/build-deb-package b/bin/build-deb-package
index 1a4c183..233a936 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -26,12 +26,8 @@ DEBEMAIL="firstname.lastname at mydomain.org"
DEBFULLNAME="Firstname Lastname"
GPG_KEY=
DISTS_SUPPORTED="debian ubuntu"
-DEBIAN_DISTROS="lenny squeeze wheezy jessie sid"
-UBUNTU_DISTROS="lucid maverick natty oneiric precise"
-DEB_BUILDS_FOR="\
-debian: squeeze wheezy jessie sid\n\
-ubuntu: lucid precise\n\
-"
+DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,sid"
+UBUNTU_DISTROS="lucid,precise"
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
@@ -41,6 +37,7 @@ PACKAGES_WITHOUT_OTHERMIRROR="keyring"
GNUPGHOME=$HOME/.gnupg
FORCE_BUILD=${FORCE_BUILD:-"no"}
+DEB_BUILDS_FOR=${DEB_BUILDS_FOR:-"debian:$DEBIAN_DISTROS ubuntu:$UBUNTU_DISTROS"}
test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; }
@@ -98,9 +95,6 @@ set_vars() {
}
prepare_workspace() {
- # in any case remove the DEB_BUILDS_FOR file
- rm -f "$PROJECT_DIR/DEB_BUILDS_FOR"
-
# make sure our local working copy is up to date...
if [ -d "$PROJECT_DIR/.git" ]; then
@@ -126,21 +120,21 @@ prepare_workspace() {
cd "$PROJECT_DIR"
# by default we build for all current debian versions
- if test -z $ARGV2_CODENAME; then
- test -f DEB_BUILDS_FOR || echo -e "$DEB_BUILDS_FOR" > DEB_BUILDS_FOR
- elif echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
- echo "debian: $ARGV2_CODENAME" > DEB_BUILDS_FOR
- elif echo "$UBUNTU_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
- echo "ubuntu: $ARGV2_CODENAME" >/dev/null
+ if [ -n $ARGV2_CODENAME ]; then
+ if echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
+ DEB_BUILDS_FOR="debian:$ARGV2_CODENAME"
+ elif echo "$UBUNTU_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
+ DEB_BUILDS_FOR="ubuntu:$ARGV2_CODENAME"
+ fi
fi
return 0
}
clear_pkgdist() {
# pkgdist directory cleanup
- cat "$PROJECT_DIR/DEB_BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+ echo "$DEB_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do
l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
- l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}"
+ l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
for l_CODENAME in $l_CODENAMES; do
@@ -180,9 +174,9 @@ clear_pkgdist() {
build_packages() {
# use pbuilder for building all variants of this package
- cat "$PROJECT_DIR/DEB_BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+ echo "$DEB_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do
l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
- l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}"
+ l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
for l_CODENAME in $l_CODENAMES; do
@@ -288,9 +282,9 @@ build_packages() {
upload_packages() {
# dupload the new packages to the reprepro repository
- cat "$PROJECT_DIR/DEB_BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
- l_DIST=$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])
- l_CODENAMES=${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}
+ echo "$DEB_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do
+ l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
+ l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
for l_CODENAME in $l_CODENAMES; do
# in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip
diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf
index 75c44d1..d3930d5 100644
--- a/home/.buildscripts/itzks.conf
+++ b/home/.buildscripts/itzks.conf
@@ -8,8 +8,7 @@ DEBFULLNAME="ITZKS Packages"
GPG_KEY="E41B37C658842183"
DISTS_SUPPORTED="debian ubuntu"
-DEB_BUILDS_FOR="\
-debian: squeeze wheezy jessie sid"
+DEB_BUILDS_FOR="debian:squeeze,wheezy,jessie,sid"
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf
index dd662a6..ad7a791 100644
--- a/home/.buildscripts/nwt.conf
+++ b/home/.buildscripts/nwt.conf
@@ -8,9 +8,7 @@ DEBEMAIL=debian at das-netzwerkteam.de
DEBFULLNAME="NWT Packages"
GPG_KEY="4DC41CF116990FF8"
DISTS_SUPPORTED="debian ubuntu"
-DEB_BUILDS_FOR="\
-debian: lenny squeeze wheezy jessie sid\n\
-ubuntu: lucid precise"
+DEB_BUILDS_FOR="debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise"
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index eda1867..3c3d6d3 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -8,8 +8,7 @@ DEBEMAIL=git-admin at x2go.org
DEBFULLNAME="X2go Git Administrator"
GPG_KEY="F4A7678C9C6B0B2B"
DISTS_SUPPORTED="debian"
-DEB_BUILDS_FOR="\
-debian: squeeze wheezy jessie sid"
+DEB_BUILDS_FOR="debian:squeeze,wheezy,jessie,sid"
RPMEMAIL=git-admin at x2go.org
RPMFULLNAME="X2go Git Administrator"
hooks/post-receive
--
buildscripts.git (X2Go packaging scripts)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (X2Go packaging scripts).
More information about the x2go-commits
mailing list