From 56fbf618ff5f39415281a37a81336a3262d8a4f5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Dec 2011 22:16:39 +0100 Subject: initial commit --- bin/nwt-build+upload-all-packages | 1 + bin/nwt-build+upload-package | 1 + bin/nwt-build-all-packages | 60 ++++++++++ bin/nwt-build-package | 243 ++++++++++++++++++++++++++++++++++++++ bin/nwt-gitcreate | 16 +++ bin/nwt-gitrevno | 28 +++++ bin/nwt-pkgneedsbuild | 47 ++++++++ bin/nwt-tarballrelease | 43 +++++++ bin/nwt-updatebuildmain | 34 ++++++ bin/nwt-upload-all-packages | 1 + bin/nwt-upload-package | 1 + 11 files changed, 475 insertions(+) create mode 120000 bin/nwt-build+upload-all-packages create mode 120000 bin/nwt-build+upload-package create mode 100755 bin/nwt-build-all-packages create mode 100755 bin/nwt-build-package create mode 100755 bin/nwt-gitcreate create mode 100755 bin/nwt-gitrevno create mode 100755 bin/nwt-pkgneedsbuild create mode 100755 bin/nwt-tarballrelease create mode 100755 bin/nwt-updatebuildmain create mode 120000 bin/nwt-upload-all-packages create mode 120000 bin/nwt-upload-package (limited to 'bin') diff --git a/bin/nwt-build+upload-all-packages b/bin/nwt-build+upload-all-packages new file mode 120000 index 0000000..21d6658 --- /dev/null +++ b/bin/nwt-build+upload-all-packages @@ -0,0 +1 @@ +nwt-build-all-packages \ No newline at end of file diff --git a/bin/nwt-build+upload-package b/bin/nwt-build+upload-package new file mode 120000 index 0000000..ce08442 --- /dev/null +++ b/bin/nwt-build+upload-package @@ -0,0 +1 @@ +nwt-build-package \ No newline at end of file diff --git a/bin/nwt-build-all-packages b/bin/nwt-build-all-packages new file mode 100755 index 0000000..35320f4 --- /dev/null +++ b/bin/nwt-build-all-packages @@ -0,0 +1,60 @@ +#!/bin/bash + +# Copyright (C) 2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +LIB_PACKAGES_NIGHTLY="\ +nwt-keyring nightly master +" +LIB_PACKAGES_MAIN="\ +nwt-keyring main build-main +" + +APP_PACKAGES_NIGHTLY="\ +nwt-hostconfig nightly master +" +APP_PACKAGES_MAIN="\ +nwt-hostconfig main build-main +" + +COMPONENT=${1:-""} + +# build the newest code... (nightly-builds) +[ "x$COMPONENT" = "xnightly" ] || [ -z $COMPONENT ] && { + echo -e $LIB_PACKAGES_NIGHTLY $APP_PACKAGES_NIGHTLY | while read pkg comp checkout; do + if [ "x$(basename $0)" = "xnwt-build-all-packages" ]; then + nwt-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xnwt-upload-all-packages" ]; then + nwt-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xnwt-build+upload-all-packages" ]; then + nwt-build-package $pkg $comp $checkout && nwt-upload-package $pkg $comp $checkout + fi + done +} + +# build all packages tagged as build-main +[ "x$COMPONENT" = "xmain" ] || [ -z $COMPONENT ] && { + echo -e $LIB_PACKAGES_MAIN $APP_PACKAGES_MAIN | while read pkg comp checkout; do + if [ "x$(basename $0)" = "xnwt-build-all-packages" ]; then + nwt-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xnwt-upload-all-packages" ]; then + nwt-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xnwt-build+upload-all-packages" ]; then + nwt-build-package $pkg $comp $checkout && nwt-upload-package $pkg $comp $checkout + fi + done +} diff --git a/bin/nwt-build-package b/bin/nwt-build-package new file mode 100755 index 0000000..ea6e6b9 --- /dev/null +++ b/bin/nwt-build-package @@ -0,0 +1,243 @@ +#!/bin/bash + +# Copyright (C) 2011 by Mike Gabriel +# +# This programme is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This programme is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +test -z $1 && { echo "usage: {main,main/,nightly,nightly/} []"; exit -1; } + +set -ex + +export GIT_SERVER="code.das-netzwerkteam.de" +export DEBEMAIL=debian@das-netzwerkteam.de +export DEBFULLNAME="NWT Packages" +export GPG_KEY="" + +set_vars() { + USE_SUDO="yes" + PDEBUILD="pdebuild --pbuilder qemubuilder" + TEMP_BASE="$HOME/tmp/" + + # first argv is the name of the Git project + PROJECT=$1 + + # grab repository component area from command line (2nd argv) or guess it + ARGV2_COMPONENT=$(echo "$2/" | cut -d"/" -f1) + ARGV2_CODENAME=$(echo "$2/" | cut -d"/" -f2) + COMPONENT=${ARGV2_COMPONENT:-${COMPONENT:-nightly}} + CODENAMES=${ARGV2_CODENAME:-${CODENAMES}} + [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1 + if [ "x$COMPONENT" = "xmain" ]; then + CHECKOUT=${3:-build-main} + elif [ "x$COMPONENT" = "xnightly" ]; then + CHECKOUT=${3:-master} + DATE="~${DATE:-$(date +%Y%m%d)}" + else + echo "error: no such package component area for NWT packages. Aborting..." + exit -1 + fi + # the DATE might be given as ,,today'' from the command line + [ "x$DATE" = "xtoday" ] && DATE="~$(date +%Y%m%d)" + + # setting paths + PROJECT_DIR=$HOME/build/$COMPONENT/$PROJECT + DIST_SUPPORTED="debian ubuntu" + PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT" + + # build for other architectures than amd64/i386 + EXTRA_ARCHS="${EXTRA_ARCHS:-}" + EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}" + + # creating paths + mkdir -p "$TEMP_BASE" + mkdir -p $PROJECT_DIR + mkdir -p $PKGDIST + + return 0 +} + +clear_pkgdist() { + + # pkgdist directory cleanup + cat BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do + l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} + echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { + for l_CODENAME in $CODENAMES; do + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then + for l_ARCH in amd64 i386; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb + done + fi + for l_EXTRA_ARCH in $EXTRA_ARCHS; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.changes + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.upload + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.build + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.dsc + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.tar.gz + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/*.deb + done + done + } + done + return 0 +} + +prepare_workspace() { + # in any case remove the BUILDS_FOR file + rm -f $PROJECT_DIR/BUILDS_FOR + + # make sure our local working copy is up to date... + + if [ -d $PROJECT_DIR/.git ]; then + cd $PROJECT_DIR && git reset --hard + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT + git pull origin $CHECKOUT + # and again, get the $CHECKOUT refspec in pure state + git reset --hard + else + cd $(dirname $PROJECT_DIR) + git clone git://$GIT_SERVER/$PROJECT.git + cd $PROJECT + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; + fi + cd $PROJECT_DIR + + # by default we build for all current debian versions + test -f BUILDS_FOR || cat > BUILDS_FOR </dev/null && { + for l_CODENAME in $CODENAMES; do + TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" + mkdir -p $TEMP_DIR/$PROJECT + git clone --local $PROJECT_DIR $TEMP_DIR/$PROJECT/ + cd $TEMP_DIR/$PROJECT + git checkout $CHECKOUT || git checkout master + GITREV=$(nwt-gitrevno) + # translate the version name for Debian releases + [ "x$l_CODENAME" = "xsid" ] && VERSION=unstable + [ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing + [ "x$l_CODENAME" = "xsqueeze" ] && VERSION=stable + [ "x$l_CODENAME" = "xlenny" ] && VERSION=oldstable + + # modify the section for non-main package builds + [ "x$COMPONENT" = "xmain" ] || { + mv debian/control debian/control.tmp + cat debian/control.tmp | sed "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control + } + + # modify changelog for this build + dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.it-zukunft-schule.de repository." + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} + OTHERMIRROR="deb http://packages.it-zukunft-schule.de/debian $l_CODENAME $COMPONENT" + [ "x$USE_SUDO" != "xyes" ] && { + [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { + cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 + } + cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch + } + } + for extra_arch in $EXTRA_ARCHS; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch + cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch + } + done + } + [ "x$USE_SUDO" = "xyes" ] && { + [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { + cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 + } + cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch + } + } + for extra_arch in $EXTRA_ARCHS; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch + cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch + } + done + } + cd - + rm -Rf $TEMP_DIR + done + echo + } + echo + done + return 0 +} + +upload_packages() { + # dupload the new packages to the reprepro repository + cd $PKGDIST + cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do + l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} + for l_CODENAME in $CODENAMES; do + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then + for l_ARCH in amd64 i386; do + cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH + ls $PROJECT_*.changes &>/dev/null && dupload --to nwt-$l_DIST-$l_CODENAME $PROJECT_*.changes + cd - + done + fi + for l_EXTRA_ARCH in $EXTRA_ARCHS; do + cd $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH + ls $PROJECT_*.changes &>/dev/null && dupload --to nwt-$l_DIST-$l_CODENAME $PROJECT_*.changes + cd - + done + done + done + cd - + return 0 +} + +### MAIN ### +set_vars $@ && { + if [ "x$(basename $0)" = "xnwt-build-package" ] || [ "x$(basename $0)" = "xnwt-build+upload-package" ]; then + cd $PROJECT_DIR && nwt-pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && { + clear_pkgdist + prepare_workspace && { + build_packages + } + } + fi + if [ "x$(basename $0)" = "xnwt-upload-package" ] || [ "x$(basename $0)" = "xnwt-build+upload-package" ]; then + upload_packages + fi +} diff --git a/bin/nwt-gitcreate b/bin/nwt-gitcreate new file mode 100755 index 0000000..98ce7b6 --- /dev/null +++ b/bin/nwt-gitcreate @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +for pkg in "$@"; do + subdir=$(dirname $pkg)/ + pkg=$(basename $pkg) + ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./setup-repository $subdir/$pkg '$pkg upstream project'" + ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./update-repository-posixacls $subdir/$pkg" + test -d "$pkg" && cd "$pkg" + echo "$pkg: MASTER BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git master + git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git upstream + git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git pristine-tar + echo "$pkg: PUSHING TAGS" && git push --tags ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git + cd .. +done diff --git a/bin/nwt-gitrevno b/bin/nwt-gitrevno new file mode 100755 index 0000000..2f121ff --- /dev/null +++ b/bin/nwt-gitrevno @@ -0,0 +1,28 @@ +#!/usr/bin/python + +# Copyright (C) 2010-2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +import subprocess +_proc = subprocess.Popen('git log --no-color --date=iso', + shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +try: + GIT_REVISION_DATE = str(len([ x for x in _proc.communicate()[0].splitlines() if x.startswith('Date:')])) +except IndexError: + GIT_REVISION_DATE = 'unknown' + +print GIT_REVISION_DATE diff --git a/bin/nwt-pkgneedsbuild b/bin/nwt-pkgneedsbuild new file mode 100755 index 0000000..2a192eb --- /dev/null +++ b/bin/nwt-pkgneedsbuild @@ -0,0 +1,47 @@ +#!/bin/bash + +# Copyright (C) 2010-2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +set -xe + +CHECKOUT=${1:-master} + +[ -d .git ] && { + + TIMESTAMP=$(date +%s) + CURRENT_BRANCH=$(git branch | grep "*" | awk '{print $2}') + + # switch to branch given as $CHECKOUT, if it does not exist locally, create it... + git checkout $CHECKOUT &>/dev/null || git checkout -b $CHECKOUT >/dev/null + + # switch to a tmp branch... + git checkout -b tmp-$TIMESTAMP &>/dev/null + + # pull $CHECKOUT from origin into the tmp branch + LANG=en_US.UTF-8 git pull origin $CHECKOUT 2>/dev/null | egrep "^Already up-to-date.$" &>/dev/null && { + # drop the tmp branch + git checkout $CURRENT_BRANCH &>/dev/null + git branch -D tmp-$TIMESTAMP >/dev/null + exit 1 + } || { + # drop the tmp branch + git checkout $CURRENT_BRANCH &>/dev/null + git branch -D tmp-$TIMESTAMP >/dev/null + exit 0 + } +} || exit 0 diff --git a/bin/nwt-tarballrelease b/bin/nwt-tarballrelease new file mode 100755 index 0000000..1b58077 --- /dev/null +++ b/bin/nwt-tarballrelease @@ -0,0 +1,43 @@ +#!/bin/sh + +# Copyright (C) 2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the tBerms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# Thanks to Jonas Smedegaard for inspiration... + +set -e + +RELEASE="$1" +test -n "$RELEASE" || { echo "usage: $(basename "$0") []"; exit 1; } + +CHECKOUT="${2:-master}" + +PROJECT="$(basename $PWD)" +TARGETDIR=".." + +MANIFEST="$(mktemp)" +TEMP_DIR="$(mktemp -d)" + +echo $MANIFEST + +trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 +git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" +( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true ) +( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}_$RELEASE/.git"* ) +( set -e; cd "$TEMP_DIR" && find "${PROJECT}_$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) +mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" +tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}_$RELEASE.tar.gz" diff --git a/bin/nwt-updatebuildmain b/bin/nwt-updatebuildmain new file mode 100755 index 0000000..f4f4917 --- /dev/null +++ b/bin/nwt-updatebuildmain @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (C) 2010-2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +set -e + +GITPROJECT=$(basename $(pwd)) +REF=$1 + +# we need to be within a working copy (base folder) and we need a !!! +test -z $1 || test -d ./.git || { + echo "usage: $(basename $0) " + echo "Call this command from within the base folder of a Git project's working copy..." + exit -1 +} + +# update the build-main branch with our newest blessed reference +git branch build-main &>/dev/null || true +git push origin $REF:build-main diff --git a/bin/nwt-upload-all-packages b/bin/nwt-upload-all-packages new file mode 120000 index 0000000..21d6658 --- /dev/null +++ b/bin/nwt-upload-all-packages @@ -0,0 +1 @@ +nwt-build-all-packages \ No newline at end of file diff --git a/bin/nwt-upload-package b/bin/nwt-upload-package new file mode 120000 index 0000000..ce08442 --- /dev/null +++ b/bin/nwt-upload-package @@ -0,0 +1 @@ +nwt-build-package \ No newline at end of file -- cgit v1.2.3 From 833fa376dd9722cbf8dc49f0b29802d30a455e31 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Dec 2011 23:15:31 +0100 Subject: fixing paths in nwt-gitcreate --- bin/nwt-gitcreate | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bin') diff --git a/bin/nwt-gitcreate b/bin/nwt-gitcreate index 98ce7b6..a511476 100755 --- a/bin/nwt-gitcreate +++ b/bin/nwt-gitcreate @@ -1,16 +1,16 @@ #!/bin/bash -set -e +set -xe for pkg in "$@"; do subdir=$(dirname $pkg)/ pkg=$(basename $pkg) - ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./setup-repository $subdir/$pkg '$pkg upstream project'" - ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./update-repository-posixacls $subdir/$pkg" + ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./setup-repository ${subdir}${pkg} '$pkg upstream project'" + ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./update-repository-posixacls ${subdir}${pkg}" test -d "$pkg" && cd "$pkg" - echo "$pkg: MASTER BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git master - git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git upstream - git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git pristine-tar - echo "$pkg: PUSHING TAGS" && git push --tags ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg}.git + echo "$pkg: MASTER BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} master + git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} upstream + git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} pristine-tar + echo "$pkg: PUSHING TAGS" && git push --tags ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} cd .. done -- cgit v1.2.3 From 70bdcc007b9f18e05b1a28c5bf7afbf97e16e79a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Dec 2011 23:54:32 +0100 Subject: fix repos name --- bin/nwt-build-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index ea6e6b9..071e736 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -157,9 +157,9 @@ build_packages() { } # modify changelog for this build - dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.it-zukunft-schule.de repository." + dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.das-netzwerkteam.de repository." mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} - OTHERMIRROR="deb http://packages.it-zukunft-schule.de/debian $l_CODENAME $COMPONENT" + OTHERMIRROR="deb http://packages.das-netzwerkteam.de/debian $l_CODENAME $COMPONENT" [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { -- cgit v1.2.3 From ce2de750f79f0d35840aad8656838d0f4483a4a1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Dec 2011 23:57:59 +0100 Subject: allow building from subpaths --- bin/nwt-build-package | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index 071e736..bf87ee0 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -32,7 +32,8 @@ set_vars() { TEMP_BASE="$HOME/tmp/" # first argv is the name of the Git project - PROJECT=$1 + PROJECT=$(basename $1) + PROJECT_PATH=$1 # grab repository component area from command line (2nd argv) or guess it ARGV2_COMPONENT=$(echo "$2/" | cut -d"/" -f1) @@ -117,7 +118,7 @@ prepare_workspace() { git reset --hard else cd $(dirname $PROJECT_DIR) - git clone git://$GIT_SERVER/$PROJECT.git + git clone git://$GIT_SERVER/$PROJECT_PATH.git cd $PROJECT git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; fi -- cgit v1.2.3 From c6d48e375b5e34650cad09bac3dbccc0c4ce84cc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 12 Dec 2011 00:48:23 +0100 Subject: build for all Debian releases and for Ubuntu LTS releases --- bin/nwt-build-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index bf87ee0..f478ae6 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -126,8 +126,8 @@ prepare_workspace() { # by default we build for all current debian versions test -f BUILDS_FOR || cat > BUILDS_FOR < Date: Mon, 12 Dec 2011 01:33:58 +0100 Subject: gpg key added, OTHERMIRROR set to '' --- bin/nwt-build-package | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index f478ae6..a058340 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -24,7 +24,7 @@ set -ex export GIT_SERVER="code.das-netzwerkteam.de" export DEBEMAIL=debian@das-netzwerkteam.de export DEBFULLNAME="NWT Packages" -export GPG_KEY="" +export GPG_KEY="4D19BF142E58A25A" set_vars() { USE_SUDO="yes" @@ -160,7 +160,8 @@ build_packages() { # modify changelog for this build dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.das-netzwerkteam.de repository." mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} - OTHERMIRROR="deb http://packages.das-netzwerkteam.de/debian $l_CODENAME $COMPONENT" + #OTHERMIRROR="deb http://packages.das-netzwerkteam.de/debian $l_CODENAME $COMPONENT" + OTHERMIRROR="" [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { -- cgit v1.2.3 From cafd51ba494ce0c291c9824b899524570a694051 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 12 Dec 2011 01:43:36 +0100 Subject: key change --- bin/nwt-build-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index a058340..5a059b1 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -24,7 +24,7 @@ set -ex export GIT_SERVER="code.das-netzwerkteam.de" export DEBEMAIL=debian@das-netzwerkteam.de export DEBFULLNAME="NWT Packages" -export GPG_KEY="4D19BF142E58A25A" +export GPG_KEY="4DC41CF116990FF8" set_vars() { USE_SUDO="yes" -- cgit v1.2.3 From 7f417c90d26e9d726c5119f6a34c888630801e2b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 19 Dec 2011 22:10:54 +0100 Subject: add git-remote at end of nwt-gitcreate script --- bin/nwt-gitcreate | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/nwt-gitcreate b/bin/nwt-gitcreate index a511476..27f4885 100755 --- a/bin/nwt-gitcreate +++ b/bin/nwt-gitcreate @@ -12,5 +12,6 @@ for pkg in "$@"; do git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} upstream git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} pristine-tar echo "$pkg: PUSHING TAGS" && git push --tags ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} + git remote add origin ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} cd .. done -- cgit v1.2.3 From d1659d8b5c52da9ea26e047032c40016bfb40018 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Dec 2011 16:00:36 +0100 Subject: add some improvements (tmp permission fix, always-build-native-packages-fix) --- bin/nwt-build-package | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index 5a059b1..3ba1890 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -30,6 +30,8 @@ set_vars() { USE_SUDO="yes" PDEBUILD="pdebuild --pbuilder qemubuilder" TEMP_BASE="$HOME/tmp/" + mkdir "$TEMP_BASE" + chmod 2770 "$TEMP_BASE" # first argv is the name of the Git project PROJECT=$(basename $1) @@ -141,10 +143,15 @@ build_packages() { for l_CODENAME in $CODENAMES; do TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" mkdir -p $TEMP_DIR/$PROJECT + chmod 2770 "$TEMP_DIR" -Rf git clone --local $PROJECT_DIR $TEMP_DIR/$PROJECT/ cd $TEMP_DIR/$PROJECT git checkout $CHECKOUT || git checkout master GITREV=$(nwt-gitrevno) + # we always build native packages for our repos + test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && { + echo "3.0 (native)" > debian/source/format + } # translate the version name for Debian releases [ "x$l_CODENAME" = "xsid" ] && VERSION=unstable [ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing -- cgit v1.2.3 From 75d856f630b7727fde9ea229ee57fc9c2c8f92dc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Dec 2011 16:50:59 +0100 Subject: fix BUILDS_FOR mechanism --- bin/nwt-build-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index 3ba1890..338a0b2 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -136,7 +136,7 @@ EOF build_packages() { # use pbuilder for building all variants of this package - cat BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do + cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { -- cgit v1.2.3 From e6e6baf406e705c81f806b86e1352bf070cce6ad Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Dec 2011 16:56:30 +0100 Subject: more fixes --- bin/nwt-build-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index 338a0b2..ccd6dbd 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -30,7 +30,7 @@ set_vars() { USE_SUDO="yes" PDEBUILD="pdebuild --pbuilder qemubuilder" TEMP_BASE="$HOME/tmp/" - mkdir "$TEMP_BASE" + mkdir -p "$TEMP_BASE" chmod 2770 "$TEMP_BASE" # first argv is the name of the Git project @@ -75,7 +75,7 @@ set_vars() { clear_pkgdist() { # pkgdist directory cleanup - cat BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do + cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { -- cgit v1.2.3 From 2533ac9afb98f8e5b236fec73f1b985ab94f8ff6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Dec 2011 17:01:53 +0100 Subject: fix --- bin/nwt-build-package | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/nwt-build-package b/bin/nwt-build-package index ccd6dbd..7531b15 100755 --- a/bin/nwt-build-package +++ b/bin/nwt-build-package @@ -25,6 +25,7 @@ export GIT_SERVER="code.das-netzwerkteam.de" export DEBEMAIL=debian@das-netzwerkteam.de export DEBFULLNAME="NWT Packages" export GPG_KEY="4DC41CF116990FF8" +export DIST_SUPPORTED="debian ubuntu" set_vars() { USE_SUDO="yes" @@ -57,7 +58,6 @@ set_vars() { # setting paths PROJECT_DIR=$HOME/build/$COMPONENT/$PROJECT - DIST_SUPPORTED="debian ubuntu" PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT" # build for other architectures than amd64/i386 @@ -138,7 +138,7 @@ build_packages() { # use pbuilder for building all variants of this package cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])} echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { for l_CODENAME in $CODENAMES; do TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" @@ -208,6 +208,7 @@ build_packages() { } echo done + echo return 0 } @@ -216,7 +217,7 @@ upload_packages() { cd $PKGDIST cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])} for l_CODENAME in $CODENAMES; do if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then for l_ARCH in amd64 i386; do -- cgit v1.2.3 From baf582456e485e2e4272c0b888f9ccdb10cde499 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Dec 2011 21:26:26 +0100 Subject: reworked buildscripts completely, so that they can be used for several projects --- bin/build+upload-all-packages | 1 + bin/build+upload-package | 1 + bin/build-all-packages | 59 +++++++++ bin/build-package | 263 ++++++++++++++++++++++++++++++++++++++ bin/gitcreate | 25 ++++ bin/gitrevno | 28 ++++ bin/nwt-build+upload-all-packages | 1 - bin/nwt-build+upload-package | 1 - bin/nwt-build-all-packages | 60 --------- bin/nwt-build-package | 253 ------------------------------------ bin/nwt-gitcreate | 17 --- bin/nwt-gitrevno | 28 ---- bin/nwt-pkgneedsbuild | 47 ------- bin/nwt-tarballrelease | 43 ------- bin/nwt-updatebuildmain | 34 ----- bin/nwt-upload-all-packages | 1 - bin/nwt-upload-package | 1 - bin/pkgneedsbuild | 47 +++++++ bin/tarballrelease | 43 +++++++ bin/updatebuildmain | 34 +++++ bin/upload-all-packages | 1 + bin/upload-package | 1 + 22 files changed, 503 insertions(+), 486 deletions(-) create mode 120000 bin/build+upload-all-packages create mode 120000 bin/build+upload-package create mode 100755 bin/build-all-packages create mode 100755 bin/build-package create mode 100755 bin/gitcreate create mode 100755 bin/gitrevno delete mode 120000 bin/nwt-build+upload-all-packages delete mode 120000 bin/nwt-build+upload-package delete mode 100755 bin/nwt-build-all-packages delete mode 100755 bin/nwt-build-package delete mode 100755 bin/nwt-gitcreate delete mode 100755 bin/nwt-gitrevno delete mode 100755 bin/nwt-pkgneedsbuild delete mode 100755 bin/nwt-tarballrelease delete mode 100755 bin/nwt-updatebuildmain delete mode 120000 bin/nwt-upload-all-packages delete mode 120000 bin/nwt-upload-package create mode 100755 bin/pkgneedsbuild create mode 100755 bin/tarballrelease create mode 100755 bin/updatebuildmain create mode 120000 bin/upload-all-packages create mode 120000 bin/upload-package (limited to 'bin') diff --git a/bin/build+upload-all-packages b/bin/build+upload-all-packages new file mode 120000 index 0000000..b8c12b0 --- /dev/null +++ b/bin/build+upload-all-packages @@ -0,0 +1 @@ +build-all-packages \ No newline at end of file diff --git a/bin/build+upload-package b/bin/build+upload-package new file mode 120000 index 0000000..2b48fdc --- /dev/null +++ b/bin/build+upload-package @@ -0,0 +1 @@ +build-package \ No newline at end of file diff --git a/bin/build-all-packages b/bin/build-all-packages new file mode 100755 index 0000000..3757c4b --- /dev/null +++ b/bin/build-all-packages @@ -0,0 +1,59 @@ +#!/bin/bash + +# Copyright (C) 2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +COMPONENT_MAIN="main" +COMPONENT_NIGHTLY="nightly" + +LIB_PACKAGES_NIGHTLY= +LIB_PACKAGES_MAIN= +APP_PACKAGES_NIGHTLY= +APP_PACKAGES_MAIN= + +PREFIX=$(echo $0 | cut -d"-" -f1) +test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; } + +test -z $1 && { echo "usage: $(basename $0) [{$COMPONENT_MAIN,$COMPONENT_NIGHTLY}]"; exit -1; } + +COMPONENT=${1:-""} + +# build the newest code... (nightly-builds) +[ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ] || [ -z $COMPONENT ] && { + echo -e $LIB_PACKAGES_NIGHTLY $APP_PACKAGES_NIGHTLY | while read pkg comp checkout; do + if [ "x$(basename $0)" = "x$PREFIX-build-all-packages" ]; then + $PREFIX-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "x$PREFIX-upload-all-packages" ]; then + $PREFIX-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "x$PREFIX-build+upload-all-packages" ]; then + $PREFIX-build-package $pkg $comp $checkout && $PREFIX-upload-package $pkg $comp $checkout + fi + done +} + +# build all packages tagged as build-main +[ "x$COMPONENT" = "x$COMPONENT_MAIN" ] || [ -z $COMPONENT ] && { + echo -e $LIB_PACKAGES_MAIN $APP_PACKAGES_MAIN | while read pkg comp checkout; do + if [ "x$(basename $0)" = "x$PREFIX-build-all-packages" ]; then + $PREFIX-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "x$PREFIX-upload-all-packages" ]; then + $PREFIX-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "x$PREFIX-build+upload-all-packages" ]; then + $PREFIX-build-package $pkg $comp $checkout && $PREFIX-upload-package $pkg $comp $checkout + fi + done +} diff --git a/bin/build-package b/bin/build-package new file mode 100755 index 0000000..f9c1648 --- /dev/null +++ b/bin/build-package @@ -0,0 +1,263 @@ +#!/bin/bash + +# Copyright (C) 2011 by Mike Gabriel +# +# This programme is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This programme is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +GIT_USER="gituser" +GIT_HOSTNAME="git.mydomain.org" + +DEBEMAIL="firstname.lastname@mydomain.org" +DEBFULLNAME="Firstname Lastname" +GPG_KEY= +DISTS_SUPPORTED="debian ubuntu" +BUILDS_FOR="\ +debian: squeeze wheezy sid\n\ +ubuntu: lucid precise\n\ +" + +COMPONENT_MAIN="main" +COMPONENT_NIGHTLY="nightly" +REPOS_SERVER="packages.mydomain.org" + +test -z $1 && { echo "usage: $(basename $0) [/] {main,main/,nightly,nightly/} []"; exit -1; } + +PREFIX=$(echo $0 | cut -d"-" -f1) +test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; } + +set -ex + +set_vars() { + USE_SUDO="yes" + PDEBUILD="pdebuild --pbuilder qemubuilder" + TEMP_BASE="$HOME/tmp/" + mkdir -p "$TEMP_BASE" + chmod 2770 "$TEMP_BASE" + + # first argv is the name of the Git project + PROJECT_PATH="$1" + PROJECT_PATH=${PROJECT_PATH/%.git/} + PROJECT="$(basename $PROJECT_PATH)" + + # grab repository component area from command line (2nd argv) or guess it + ARGV2_COMPONENT="$(echo "$2/" | cut -d"/" -f1)" + 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 + if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then + CHECKOUT="${3:-build-main}" + elif [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then + CHECKOUT="${3:-master}" + DATE="~${DATE:-$(date +%Y%m%d)}" + else + echo "error: no such package component area for this Git project. Aborting..." + exit -1 + fi + # the DATE might be given as ,,today'' from the command line + [ "x$DATE" = "xtoday" ] && DATE="~$(date +%Y%m%d)" + + # setting paths + PROJECT_DIR="$HOME/build/$COMPONENT/$PROJECT" + PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT" + + # build for other architectures than amd64/i386 + EXTRA_ARCHS="${EXTRA_ARCHS:-}" + EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}" + + # creating paths + mkdir -p "$TEMP_BASE" + mkdir -p "$PROJECT_DIR" + mkdir -p "$PKGDIST" + + return 0 +} + +clear_pkgdist() { + + # pkgdist directory cleanup + cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do + l_DIST="$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])" + CODENAMES="${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}" + echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { + for l_CODENAME in $CODENAMES; do + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then + for l_ARCH in amd64 i386; do + mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb" + done + fi + for l_EXTRA_ARCH in $EXTRA_ARCHS; do + mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.changes" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.upload" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.build" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.dsc" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.tar.gz" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/*.deb" + done + done + } + done + return 0 +} + +prepare_workspace() { + # in any case remove the BUILDS_FOR file + rm -f "$PROJECT_DIR/BUILDS_FOR" + + # make sure our local working copy is up to date... + + if [ -d "$PROJECT_DIR/.git" ]; then + cd "$PROJECT_DIR" && git reset --hard + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT + git pull origin $CHECKOUT + # and again, get the $CHECKOUT refspec in pure state + git reset --hard + else + cd "$(dirname $PROJECT_DIR)" + git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git + cd "$PROJECT" + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; + fi + cd "$PROJECT_DIR" + + # by default we build for all current debian versions + test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR + return 0 +} + +build_packages() { + # use pbuilder for building all variants of this package + cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do + l_DIST="$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])" + CODENAMES="${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])}" + echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { + for l_CODENAME in $CODENAMES; do + TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" + mkdir -p "$TEMP_DIR/$PROJECT" + chmod 2770 "$TEMP_DIR" -Rf + git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" + cd "$TEMP_DIR/$PROJECT" + git checkout $CHECKOUT || git checkout master + GITREV=$(gitrevno) + # we always build native packages for our repos + test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && { + echo "3.0 (native)" > debian/source/format + } + # translate the version name for Debian releases + [ "x$l_CODENAME" = "xsid" ] && VERSION=unstable + [ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing + [ "x$l_CODENAME" = "xsqueeze" ] && VERSION=stable + [ "x$l_CODENAME" = "xlenny" ] && VERSION=oldstable + + # modify the section for non-main package builds + [ "x$COMPONENT" != "xmain" ] || { + mv debian/control debian/control.tmp + cat debian/control.tmp | sed "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control + } + + # modify changelog for this build + dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository." + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} + OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT" + [ "x$USE_SUDO" != "xyes" ] && { + [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { + cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" + } + cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch + } + } + for extra_arch in $EXTRA_ARCHS; do + mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" + cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch + } + done + } + [ "x$USE_SUDO" = "xyes" ] && { + [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { + cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 + } + cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch + } + } + for extra_arch in $EXTRA_ARCHS; do + mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" + cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch + } + done + } + cd - + rm -Rf "$TEMP_DIR" + done + echo + } + echo + done + echo + return 0 +} + +upload_packages() { + # dupload the new packages to the reprepro repository + cd "$PKGDIST" + cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do + l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])} + for l_CODENAME in $CODENAMES; do + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then + for l_ARCH in amd64 i386; do + cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" + ls "$PROJECT_*.changes" &>/dev/null && dupload --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes" + cd - + done + fi + for l_EXTRA_ARCH in $EXTRA_ARCHS; do + cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH" + ls "$PROJECT_*.changes" &>/dev/null && dupload --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes" + cd - + done + done + done + cd - + return 0 +} + +### MAIN ### +set_vars $@ && { + if [ "x$(basename $0)" = "x$PREFIX-build-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-package" ]; then + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && { + clear_pkgdist + prepare_workspace && { + build_packages + } + } + fi + if [ "x$(basename $0)" = "x$PREFIX-upload-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-package" ]; then + upload_packages + fi +} diff --git a/bin/gitcreate b/bin/gitcreate new file mode 100755 index 0000000..612173b --- /dev/null +++ b/bin/gitcreate @@ -0,0 +1,25 @@ +#!/bin/bash + +set -xe + +GIT_USER= +GIT_HOSTNAME= +GIT_SSH_PORT=22 + +PREFIX=$(echo $0 | cut -d"-" -f1) +. ~/.buildscripts/$PREFIX.conf + + +for pkg in "$@"; do + subdir=$(dirname $pkg)/ + pkg=$(basename $pkg) + ssh -l$GIT_USER $GIT_HOSTNAME "cd ~/git && ./setup-repository ${subdir}${pkg} '$pkg upstream project'" + ssh -l$GIT_USER $GIT_HOSTNAME "cd ~/git && ./update-repository-posixacls ${subdir}${pkg}" + test -d "$pkg" && cd "$pkg" + echo "$pkg: MASTER BRANCH" && git push ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} master + git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} upstream + git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} pristine-tar + echo "$pkg: PUSHING TAGS" && git push --tags ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} + git remote add origin ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} + cd .. +done diff --git a/bin/gitrevno b/bin/gitrevno new file mode 100755 index 0000000..2f121ff --- /dev/null +++ b/bin/gitrevno @@ -0,0 +1,28 @@ +#!/usr/bin/python + +# Copyright (C) 2010-2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +import subprocess +_proc = subprocess.Popen('git log --no-color --date=iso', + shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +try: + GIT_REVISION_DATE = str(len([ x for x in _proc.communicate()[0].splitlines() if x.startswith('Date:')])) +except IndexError: + GIT_REVISION_DATE = 'unknown' + +print GIT_REVISION_DATE diff --git a/bin/nwt-build+upload-all-packages b/bin/nwt-build+upload-all-packages deleted file mode 120000 index 21d6658..0000000 --- a/bin/nwt-build+upload-all-packages +++ /dev/null @@ -1 +0,0 @@ -nwt-build-all-packages \ No newline at end of file diff --git a/bin/nwt-build+upload-package b/bin/nwt-build+upload-package deleted file mode 120000 index ce08442..0000000 --- a/bin/nwt-build+upload-package +++ /dev/null @@ -1 +0,0 @@ -nwt-build-package \ No newline at end of file diff --git a/bin/nwt-build-all-packages b/bin/nwt-build-all-packages deleted file mode 100755 index 35320f4..0000000 --- a/bin/nwt-build-all-packages +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2011 by Mike Gabriel -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -LIB_PACKAGES_NIGHTLY="\ -nwt-keyring nightly master -" -LIB_PACKAGES_MAIN="\ -nwt-keyring main build-main -" - -APP_PACKAGES_NIGHTLY="\ -nwt-hostconfig nightly master -" -APP_PACKAGES_MAIN="\ -nwt-hostconfig main build-main -" - -COMPONENT=${1:-""} - -# build the newest code... (nightly-builds) -[ "x$COMPONENT" = "xnightly" ] || [ -z $COMPONENT ] && { - echo -e $LIB_PACKAGES_NIGHTLY $APP_PACKAGES_NIGHTLY | while read pkg comp checkout; do - if [ "x$(basename $0)" = "xnwt-build-all-packages" ]; then - nwt-build-package $pkg $comp $checkout - elif [ "x$(basename $0)" = "xnwt-upload-all-packages" ]; then - nwt-upload-package $pkg $comp $checkout - elif [ "x$(basename $0)" = "xnwt-build+upload-all-packages" ]; then - nwt-build-package $pkg $comp $checkout && nwt-upload-package $pkg $comp $checkout - fi - done -} - -# build all packages tagged as build-main -[ "x$COMPONENT" = "xmain" ] || [ -z $COMPONENT ] && { - echo -e $LIB_PACKAGES_MAIN $APP_PACKAGES_MAIN | while read pkg comp checkout; do - if [ "x$(basename $0)" = "xnwt-build-all-packages" ]; then - nwt-build-package $pkg $comp $checkout - elif [ "x$(basename $0)" = "xnwt-upload-all-packages" ]; then - nwt-upload-package $pkg $comp $checkout - elif [ "x$(basename $0)" = "xnwt-build+upload-all-packages" ]; then - nwt-build-package $pkg $comp $checkout && nwt-upload-package $pkg $comp $checkout - fi - done -} diff --git a/bin/nwt-build-package b/bin/nwt-build-package deleted file mode 100755 index 7531b15..0000000 --- a/bin/nwt-build-package +++ /dev/null @@ -1,253 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2011 by Mike Gabriel -# -# This programme is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This programme is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -test -z $1 && { echo "usage: {main,main/,nightly,nightly/} []"; exit -1; } - -set -ex - -export GIT_SERVER="code.das-netzwerkteam.de" -export DEBEMAIL=debian@das-netzwerkteam.de -export DEBFULLNAME="NWT Packages" -export GPG_KEY="4DC41CF116990FF8" -export DIST_SUPPORTED="debian ubuntu" - -set_vars() { - USE_SUDO="yes" - PDEBUILD="pdebuild --pbuilder qemubuilder" - TEMP_BASE="$HOME/tmp/" - mkdir -p "$TEMP_BASE" - chmod 2770 "$TEMP_BASE" - - # first argv is the name of the Git project - PROJECT=$(basename $1) - PROJECT_PATH=$1 - - # grab repository component area from command line (2nd argv) or guess it - ARGV2_COMPONENT=$(echo "$2/" | cut -d"/" -f1) - ARGV2_CODENAME=$(echo "$2/" | cut -d"/" -f2) - COMPONENT=${ARGV2_COMPONENT:-${COMPONENT:-nightly}} - CODENAMES=${ARGV2_CODENAME:-${CODENAMES}} - [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1 - if [ "x$COMPONENT" = "xmain" ]; then - CHECKOUT=${3:-build-main} - elif [ "x$COMPONENT" = "xnightly" ]; then - CHECKOUT=${3:-master} - DATE="~${DATE:-$(date +%Y%m%d)}" - else - echo "error: no such package component area for NWT packages. Aborting..." - exit -1 - fi - # the DATE might be given as ,,today'' from the command line - [ "x$DATE" = "xtoday" ] && DATE="~$(date +%Y%m%d)" - - # setting paths - PROJECT_DIR=$HOME/build/$COMPONENT/$PROJECT - PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT" - - # build for other architectures than amd64/i386 - EXTRA_ARCHS="${EXTRA_ARCHS:-}" - EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}" - - # creating paths - mkdir -p "$TEMP_BASE" - mkdir -p $PROJECT_DIR - mkdir -p $PKGDIST - - return 0 -} - -clear_pkgdist() { - - # pkgdist directory cleanup - cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do - l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} - echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { - for l_CODENAME in $CODENAMES; do - if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then - for l_ARCH in amd64 i386; do - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb - done - fi - for l_EXTRA_ARCH in $EXTRA_ARCHS; do - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.changes - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.upload - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.build - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.dsc - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.tar.gz - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/*.deb - done - done - } - done - return 0 -} - -prepare_workspace() { - # in any case remove the BUILDS_FOR file - rm -f $PROJECT_DIR/BUILDS_FOR - - # make sure our local working copy is up to date... - - if [ -d $PROJECT_DIR/.git ]; then - cd $PROJECT_DIR && git reset --hard - git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT - git pull origin $CHECKOUT - # and again, get the $CHECKOUT refspec in pure state - git reset --hard - else - cd $(dirname $PROJECT_DIR) - git clone git://$GIT_SERVER/$PROJECT_PATH.git - cd $PROJECT - git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; - fi - cd $PROJECT_DIR - - # by default we build for all current debian versions - test -f BUILDS_FOR || cat > BUILDS_FOR </dev/null && { - for l_CODENAME in $CODENAMES; do - TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" - mkdir -p $TEMP_DIR/$PROJECT - chmod 2770 "$TEMP_DIR" -Rf - git clone --local $PROJECT_DIR $TEMP_DIR/$PROJECT/ - cd $TEMP_DIR/$PROJECT - git checkout $CHECKOUT || git checkout master - GITREV=$(nwt-gitrevno) - # we always build native packages for our repos - test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && { - echo "3.0 (native)" > debian/source/format - } - # translate the version name for Debian releases - [ "x$l_CODENAME" = "xsid" ] && VERSION=unstable - [ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing - [ "x$l_CODENAME" = "xsqueeze" ] && VERSION=stable - [ "x$l_CODENAME" = "xlenny" ] && VERSION=oldstable - - # modify the section for non-main package builds - [ "x$COMPONENT" = "xmain" ] || { - mv debian/control debian/control.tmp - cat debian/control.tmp | sed "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control - } - - # modify changelog for this build - dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.das-netzwerkteam.de repository." - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} - #OTHERMIRROR="deb http://packages.das-netzwerkteam.de/debian $l_CODENAME $COMPONENT" - OTHERMIRROR="" - [ "x$USE_SUDO" != "xyes" ] && { - [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { - cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 - } - cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch - } - } - for extra_arch in $EXTRA_ARCHS; do - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch - cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch - } - done - } - [ "x$USE_SUDO" = "xyes" ] && { - [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { - cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 - } - cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch - } - } - for extra_arch in $EXTRA_ARCHS; do - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch - cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch - } - done - } - cd - - rm -Rf $TEMP_DIR - done - echo - } - echo - done - echo - return 0 -} - -upload_packages() { - # dupload the new packages to the reprepro repository - cd $PKGDIST - cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do - l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])} - for l_CODENAME in $CODENAMES; do - if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then - for l_ARCH in amd64 i386; do - cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH - ls $PROJECT_*.changes &>/dev/null && dupload --to nwt-$l_DIST-$l_CODENAME $PROJECT_*.changes - cd - - done - fi - for l_EXTRA_ARCH in $EXTRA_ARCHS; do - cd $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH - ls $PROJECT_*.changes &>/dev/null && dupload --to nwt-$l_DIST-$l_CODENAME $PROJECT_*.changes - cd - - done - done - done - cd - - return 0 -} - -### MAIN ### -set_vars $@ && { - if [ "x$(basename $0)" = "xnwt-build-package" ] || [ "x$(basename $0)" = "xnwt-build+upload-package" ]; then - cd $PROJECT_DIR && nwt-pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && { - clear_pkgdist - prepare_workspace && { - build_packages - } - } - fi - if [ "x$(basename $0)" = "xnwt-upload-package" ] || [ "x$(basename $0)" = "xnwt-build+upload-package" ]; then - upload_packages - fi -} diff --git a/bin/nwt-gitcreate b/bin/nwt-gitcreate deleted file mode 100755 index 27f4885..0000000 --- a/bin/nwt-gitcreate +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -xe - -for pkg in "$@"; do - subdir=$(dirname $pkg)/ - pkg=$(basename $pkg) - ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./setup-repository ${subdir}${pkg} '$pkg upstream project'" - ssh -lnwt code.das-netzwerkteam.de "cd ~/git && ./update-repository-posixacls ${subdir}${pkg}" - test -d "$pkg" && cd "$pkg" - echo "$pkg: MASTER BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} master - git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} upstream - git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} pristine-tar - echo "$pkg: PUSHING TAGS" && git push --tags ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} - git remote add origin ssh://nwt@code.das-netzwerkteam.de:32032/~/git/${subdir}${pkg} - cd .. -done diff --git a/bin/nwt-gitrevno b/bin/nwt-gitrevno deleted file mode 100755 index 2f121ff..0000000 --- a/bin/nwt-gitrevno +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) 2010-2011 by Mike Gabriel -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -import subprocess -_proc = subprocess.Popen('git log --no-color --date=iso', - shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -try: - GIT_REVISION_DATE = str(len([ x for x in _proc.communicate()[0].splitlines() if x.startswith('Date:')])) -except IndexError: - GIT_REVISION_DATE = 'unknown' - -print GIT_REVISION_DATE diff --git a/bin/nwt-pkgneedsbuild b/bin/nwt-pkgneedsbuild deleted file mode 100755 index 2a192eb..0000000 --- a/bin/nwt-pkgneedsbuild +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2010-2011 by Mike Gabriel -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -set -xe - -CHECKOUT=${1:-master} - -[ -d .git ] && { - - TIMESTAMP=$(date +%s) - CURRENT_BRANCH=$(git branch | grep "*" | awk '{print $2}') - - # switch to branch given as $CHECKOUT, if it does not exist locally, create it... - git checkout $CHECKOUT &>/dev/null || git checkout -b $CHECKOUT >/dev/null - - # switch to a tmp branch... - git checkout -b tmp-$TIMESTAMP &>/dev/null - - # pull $CHECKOUT from origin into the tmp branch - LANG=en_US.UTF-8 git pull origin $CHECKOUT 2>/dev/null | egrep "^Already up-to-date.$" &>/dev/null && { - # drop the tmp branch - git checkout $CURRENT_BRANCH &>/dev/null - git branch -D tmp-$TIMESTAMP >/dev/null - exit 1 - } || { - # drop the tmp branch - git checkout $CURRENT_BRANCH &>/dev/null - git branch -D tmp-$TIMESTAMP >/dev/null - exit 0 - } -} || exit 0 diff --git a/bin/nwt-tarballrelease b/bin/nwt-tarballrelease deleted file mode 100755 index 1b58077..0000000 --- a/bin/nwt-tarballrelease +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2011 by Mike Gabriel -# -# This is free software; you can redistribute it and/or modify -# it under the tBerms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# Thanks to Jonas Smedegaard for inspiration... - -set -e - -RELEASE="$1" -test -n "$RELEASE" || { echo "usage: $(basename "$0") []"; exit 1; } - -CHECKOUT="${2:-master}" - -PROJECT="$(basename $PWD)" -TARGETDIR=".." - -MANIFEST="$(mktemp)" -TEMP_DIR="$(mktemp -d)" - -echo $MANIFEST - -trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 -git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true ) -( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}_$RELEASE/.git"* ) -( set -e; cd "$TEMP_DIR" && find "${PROJECT}_$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) -mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" -tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}_$RELEASE.tar.gz" diff --git a/bin/nwt-updatebuildmain b/bin/nwt-updatebuildmain deleted file mode 100755 index f4f4917..0000000 --- a/bin/nwt-updatebuildmain +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2010-2011 by Mike Gabriel -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -set -e - -GITPROJECT=$(basename $(pwd)) -REF=$1 - -# we need to be within a working copy (base folder) and we need a !!! -test -z $1 || test -d ./.git || { - echo "usage: $(basename $0) " - echo "Call this command from within the base folder of a Git project's working copy..." - exit -1 -} - -# update the build-main branch with our newest blessed reference -git branch build-main &>/dev/null || true -git push origin $REF:build-main diff --git a/bin/nwt-upload-all-packages b/bin/nwt-upload-all-packages deleted file mode 120000 index 21d6658..0000000 --- a/bin/nwt-upload-all-packages +++ /dev/null @@ -1 +0,0 @@ -nwt-build-all-packages \ No newline at end of file diff --git a/bin/nwt-upload-package b/bin/nwt-upload-package deleted file mode 120000 index ce08442..0000000 --- a/bin/nwt-upload-package +++ /dev/null @@ -1 +0,0 @@ -nwt-build-package \ No newline at end of file diff --git a/bin/pkgneedsbuild b/bin/pkgneedsbuild new file mode 100755 index 0000000..2a192eb --- /dev/null +++ b/bin/pkgneedsbuild @@ -0,0 +1,47 @@ +#!/bin/bash + +# Copyright (C) 2010-2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +set -xe + +CHECKOUT=${1:-master} + +[ -d .git ] && { + + TIMESTAMP=$(date +%s) + CURRENT_BRANCH=$(git branch | grep "*" | awk '{print $2}') + + # switch to branch given as $CHECKOUT, if it does not exist locally, create it... + git checkout $CHECKOUT &>/dev/null || git checkout -b $CHECKOUT >/dev/null + + # switch to a tmp branch... + git checkout -b tmp-$TIMESTAMP &>/dev/null + + # pull $CHECKOUT from origin into the tmp branch + LANG=en_US.UTF-8 git pull origin $CHECKOUT 2>/dev/null | egrep "^Already up-to-date.$" &>/dev/null && { + # drop the tmp branch + git checkout $CURRENT_BRANCH &>/dev/null + git branch -D tmp-$TIMESTAMP >/dev/null + exit 1 + } || { + # drop the tmp branch + git checkout $CURRENT_BRANCH &>/dev/null + git branch -D tmp-$TIMESTAMP >/dev/null + exit 0 + } +} || exit 0 diff --git a/bin/tarballrelease b/bin/tarballrelease new file mode 100755 index 0000000..1b58077 --- /dev/null +++ b/bin/tarballrelease @@ -0,0 +1,43 @@ +#!/bin/sh + +# Copyright (C) 2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the tBerms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# Thanks to Jonas Smedegaard for inspiration... + +set -e + +RELEASE="$1" +test -n "$RELEASE" || { echo "usage: $(basename "$0") []"; exit 1; } + +CHECKOUT="${2:-master}" + +PROJECT="$(basename $PWD)" +TARGETDIR=".." + +MANIFEST="$(mktemp)" +TEMP_DIR="$(mktemp -d)" + +echo $MANIFEST + +trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 +git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" +( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true ) +( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}_$RELEASE/.git"* ) +( set -e; cd "$TEMP_DIR" && find "${PROJECT}_$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) +mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" +tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}_$RELEASE.tar.gz" diff --git a/bin/updatebuildmain b/bin/updatebuildmain new file mode 100755 index 0000000..f4f4917 --- /dev/null +++ b/bin/updatebuildmain @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (C) 2010-2011 by Mike Gabriel +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +set -e + +GITPROJECT=$(basename $(pwd)) +REF=$1 + +# we need to be within a working copy (base folder) and we need a !!! +test -z $1 || test -d ./.git || { + echo "usage: $(basename $0) " + echo "Call this command from within the base folder of a Git project's working copy..." + exit -1 +} + +# update the build-main branch with our newest blessed reference +git branch build-main &>/dev/null || true +git push origin $REF:build-main diff --git a/bin/upload-all-packages b/bin/upload-all-packages new file mode 120000 index 0000000..b8c12b0 --- /dev/null +++ b/bin/upload-all-packages @@ -0,0 +1 @@ +build-all-packages \ No newline at end of file diff --git a/bin/upload-package b/bin/upload-package new file mode 120000 index 0000000..2b48fdc --- /dev/null +++ b/bin/upload-package @@ -0,0 +1 @@ +build-package \ No newline at end of file -- cgit v1.2.3 From 62b47aba27c20caf5d4fb2dea10c3ea1a724d3dd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 21 Dec 2011 00:02:55 +0100 Subject: fixed scripts, configured other build servers --- bin/build-all-packages | 2 +- bin/build-package | 113 ++++++++++++++++++++++++++++--------------------- bin/gitcreate | 2 +- 3 files changed, 66 insertions(+), 51 deletions(-) (limited to 'bin') diff --git a/bin/build-all-packages b/bin/build-all-packages index 3757c4b..86e72be 100755 --- a/bin/build-all-packages +++ b/bin/build-all-packages @@ -25,7 +25,7 @@ LIB_PACKAGES_MAIN= APP_PACKAGES_NIGHTLY= APP_PACKAGES_MAIN= -PREFIX=$(echo $0 | cut -d"-" -f1) +PREFIX=$(echo `basename $0` | cut -d"-" -f1) test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; } test -z $1 && { echo "usage: $(basename $0) [{$COMPONENT_MAIN,$COMPONENT_NIGHTLY}]"; exit -1; } diff --git a/bin/build-package b/bin/build-package index f9c1648..cc7a9d4 100755 --- a/bin/build-package +++ b/bin/build-package @@ -32,10 +32,11 @@ ubuntu: lucid precise\n\ COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" REPOS_SERVER="packages.mydomain.org" +PACKAGES_WITHOUT_OTHERMIRROR="keyring" test -z $1 && { echo "usage: $(basename $0) [/] {main,main/,nightly,nightly/} []"; exit -1; } -PREFIX=$(echo $0 | cut -d"-" -f1) +PREFIX=$(echo `basename $0` | cut -d"-" -f1) test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; } set -ex @@ -86,14 +87,43 @@ set_vars() { return 0 } -clear_pkgdist() { +prepare_workspace() { + # in any case remove the BUILDS_FOR file + rm -f "$PROJECT_DIR/BUILDS_FOR" + # make sure our local working copy is up to date... + + if [ -d "$PROJECT_DIR/.git" ]; then + cd "$PROJECT_DIR" && git reset --hard + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT + git pull origin $CHECKOUT + # and again, get the $CHECKOUT refspec in pure state + git reset --hard + else + cd "$(dirname $PROJECT_DIR)" + git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git + cd "$PROJECT" + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; + fi + cd "$PROJECT_DIR" + + # by default we build for all current debian versions + test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR + return 0 +} + +clear_pkgdist() { # pkgdist directory cleanup cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do - l_DIST="$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])" - CODENAMES="${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}" + l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])" + l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}" echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { - for l_CODENAME in $CODENAMES; do + for l_CODENAME in $l_CODENAMES; do + + # in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip + # the wrong distribution here... + test -z $CODENAMES || echo $line | grep $CODENAMES || break + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then for l_ARCH in amd64 i386; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" @@ -113,48 +143,30 @@ clear_pkgdist() { rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.dsc" rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.tar.gz" rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/*.deb" - done + done done } done return 0 } -prepare_workspace() { - # in any case remove the BUILDS_FOR file - rm -f "$PROJECT_DIR/BUILDS_FOR" - - # make sure our local working copy is up to date... - - if [ -d "$PROJECT_DIR/.git" ]; then - cd "$PROJECT_DIR" && git reset --hard - git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT - git pull origin $CHECKOUT - # and again, get the $CHECKOUT refspec in pure state - git reset --hard - else - cd "$(dirname $PROJECT_DIR)" - git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git - cd "$PROJECT" - git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; - fi - cd "$PROJECT_DIR" - - # by default we build for all current debian versions - test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR - return 0 -} - build_packages() { # use pbuilder for building all variants of this package cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do - l_DIST="$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])" - CODENAMES="${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])}" + l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])" + l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}" echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { - for l_CODENAME in $CODENAMES; do + for l_CODENAME in $l_CODENAMES; do + + # in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip + # the wrong distribution here... + test -z $CODENAMES || echo $line | grep $CODENAMES || break + TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" mkdir -p "$TEMP_DIR/$PROJECT" chmod 2770 "$TEMP_DIR" -Rf + + cd "$PROJECT_DIR" git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" cd "$TEMP_DIR/$PROJECT" git checkout $CHECKOUT || git checkout master @@ -178,47 +190,45 @@ build_packages() { # modify changelog for this build dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository." mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} - OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT" + OTHERMIRROR="" + echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT" + [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" 0<&- } cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch 0<&- } done } [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 0<&- } cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch 0<&- } done } - cd - rm -Rf "$TEMP_DIR" done - echo } - echo done - echo return 0 } @@ -226,9 +236,14 @@ upload_packages() { # dupload the new packages to the reprepro repository cd "$PKGDIST" cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do - l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z])} - for l_CODENAME in $CODENAMES; do + l_DIST=$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:]) + l_CODENAMES=${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])} + for l_CODENAME in $l_CODENAMES; do + + # in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip + # the wrong distribution here... + test -z $CODENAMES || echo $line | grep $CODENAMES || break + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then for l_ARCH in amd64 i386; do cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" @@ -251,8 +266,8 @@ upload_packages() { set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-package" ]; then cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && { - clear_pkgdist prepare_workspace && { + clear_pkgdist build_packages } } diff --git a/bin/gitcreate b/bin/gitcreate index 612173b..159b298 100755 --- a/bin/gitcreate +++ b/bin/gitcreate @@ -6,7 +6,7 @@ GIT_USER= GIT_HOSTNAME= GIT_SSH_PORT=22 -PREFIX=$(echo $0 | cut -d"-" -f1) +PREFIX=$(echo `basename $0` | cut -d"-" -f1) . ~/.buildscripts/$PREFIX.conf -- cgit v1.2.3 From 0aa148fdd5fec10290622f32bede3c640a0a153a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 21 Dec 2011 00:10:17 +0100 Subject: manage several dupload configs --- bin/build-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/build-package b/bin/build-package index cc7a9d4..8a1f94f 100755 --- a/bin/build-package +++ b/bin/build-package @@ -247,13 +247,13 @@ upload_packages() { if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then for l_ARCH in amd64 i386; do cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - ls "$PROJECT_*.changes" &>/dev/null && dupload --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes" + ls "$PROJECT_*.changes" &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes" cd - done fi for l_EXTRA_ARCH in $EXTRA_ARCHS; do cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH" - ls "$PROJECT_*.changes" &>/dev/null && dupload --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes" + ls "$PROJECT_*.changes" &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes" cd - done done -- cgit v1.2.3 From db9cf4ebce4eaa26767ea30dee085021a4aec242 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 21 Dec 2011 00:18:15 +0100 Subject: add a PREFIX-public git-remote site for each public location --- bin/gitcreate | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/gitcreate b/bin/gitcreate index 159b298..3d93faf 100755 --- a/bin/gitcreate +++ b/bin/gitcreate @@ -20,6 +20,7 @@ for pkg in "$@"; do git branch | grep upstream &>/dev/null && echo "$pkg: RELEASE BRANCH" && git push ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} upstream git branch | grep pristine-tar &>/dev/null && echo "$pkg: PRISTINE-TAR" && git push ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} pristine-tar echo "$pkg: PUSHING TAGS" && git push --tags ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} - git remote add origin ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} + git remote | grep origin >/dev/null || git remote add origin ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} + git remote add ${PREFIX}-public ssh://$GIT_USER@$GIT_HOSTNAME:$GIT_SSH_PORT/~/git/${subdir}${pkg} cd .. done -- cgit v1.2.3