[23076] in Source-Commits
/svn/athena r22739 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Thu Feb 7 23:30:49 2008
Date: Thu, 7 Feb 2008 23:30:15 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200802080430.XAA03158@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-02-07 23:30:14 -0500 (Thu, 07 Feb 2008)
New Revision: 22739
Added:
trunk/debathena/scripts/debian-versions.sh
Modified:
trunk/debathena/scripts/SbuildHack.pm
trunk/debathena/scripts/all-schroots
trunk/debathena/scripts/da
trunk/debathena/scripts/daequivsupload
trunk/debathena/scripts/daupload-release
Log:
Centralize database of Debathena supported codenames and their tags
into a new script, debian-versions.sh.
Many scripts can be cleaned up substantially once we drop sarge support.
Modified: trunk/debathena/scripts/SbuildHack.pm
===================================================================
--- trunk/debathena/scripts/SbuildHack.pm 2008-02-07 23:57:00 UTC (rev 22738)
+++ trunk/debathena/scripts/SbuildHack.pm 2008-02-08 04:30:14 UTC (rev 22739)
@@ -8,17 +8,7 @@
my $v = shift;
my $binNMUver = shift;
die("Wrong binNMUver!") unless ($binNMUver == 171717);
- my %tags = (
- 'sarge' => '~debian3.1',
- 'etch' => '~debian4.0',
- 'lenny' => '~debian4.1~0.1',
- 'breezy' => '~ubuntu5.10',
- 'dapper' => '~ubuntu6.06',
- 'edgy' => '~ubuntu6.10',
- 'feisty' => '~ubuntu7.04',
- 'gutsy' => '~ubuntu7.10'
- );
- return "$v$tags{$main::distribution}";
+ return "$v".`. $(dirname "$0")/debian-versions.sh; gettag $main::distribution`;
};
*old_begin_session = \&Sbuild::Chroot::begin_session;
Modified: trunk/debathena/scripts/all-schroots
===================================================================
--- trunk/debathena/scripts/all-schroots 2008-02-07 23:57:00 UTC (rev 22738)
+++ trunk/debathena/scripts/all-schroots 2008-02-08 04:30:14 UTC (rev 22739)
@@ -11,33 +11,31 @@
# Debian/Ubuntu version, and ephemeral session chroots are used
# instead of source chroots.
+source $(dirname "$0")/debian-versions.sh
+
if [ "$1" = "-A" ]; then
shift
prog=$1; shift
-$prog sarge-i386-sbuild "$@"
-$prog etch-amd64-sbuild "$@"
-$prog lenny-amd64-sbuild "$@"
-$prog dapper-amd64-sbuild "$@"
-$prog edgy-amd64-sbuild "$@"
-$prog feisty-amd64-sbuild "$@"
-$prog gutsy-amd64-sbuild "$@"
+for code in "$DEBIAN_CODES"; do
+ if [ "$code" = "sarge" ]; then
+ $prog sarge-i386-sbuild "$@"
+ else
+ $prog ${code}-amd64-sbuild "$@"
+ fi
+done
else
prog=$1; shift
-$prog sarge-i386-sbuild-source "$@"
-$prog etch-i386-sbuild-source "$@"
-$prog etch-amd64-sbuild-source "$@"
-$prog lenny-i386-sbuild-source "$@"
-$prog lenny-amd64-sbuild-source "$@"
-$prog dapper-i386-sbuild-source "$@"
-$prog dapper-amd64-sbuild-source "$@"
-$prog edgy-i386-sbuild-source "$@"
-$prog edgy-amd64-sbuild-source "$@"
-$prog feisty-i386-sbuild-source "$@"
-$prog feisty-amd64-sbuild-source "$@"
-$prog gutsy-i386-sbuild-source "$@"
-$prog gutsy-amd64-sbuild-source "$@"
+for code in "$DEBIAN_CODES"; do
+ if [ "$code" = "sarge" ]; then
+ $prog sarge-i386-sbuild-source "$@"
+ else
+ $prog ${code}-i386-sbuild-source "$@"
+ $prog ${code}-amd64-sbuild-source "$@"
+ fi
+done
+
fi
Modified: trunk/debathena/scripts/da
===================================================================
--- trunk/debathena/scripts/da 2008-02-07 23:57:00 UTC (rev 22738)
+++ trunk/debathena/scripts/da 2008-02-08 04:30:14 UTC (rev 22739)
@@ -15,6 +15,8 @@
# Typically this script is used to build Debathena packages, in which
# case PROGRAM is sbuildhack and ARGUMENTS is a path to a .dsc file.
+source $(dirname "$0")/debian-versions.sh
+
A=0
if [ "$1" = -A ]; then A=1; shift; fi
prog="$1"; shift
@@ -50,19 +52,14 @@
echo >&2
}
-t sarge-i386 -A "$@"
-t dapper-amd64 -A "$@"
-[ $A -eq 1 ] || t dapper-i386 "$@"
-t edgy-amd64 -A "$@"
-[ $A -eq 1 ] || t edgy-i386 "$@"
-t etch-amd64 -A "$@"
-[ $A -eq 1 ] || t etch-i386 "$@"
-t feisty-amd64 -A "$@"
-[ $A -eq 1 ] || t feisty-i386 "$@"
-t gutsy-amd64 -A "$@"
-[ $A -eq 1 ] || t gutsy-i386 "$@"
-t lenny-amd64 -A "$@"
-[ $A -eq 1 ] || t lenny-i386 "$@"
+for code in $DEBIAN_CODES; do
+ if [ "$code" = "sarge" ]; then
+ t sarge-i386 -A "$@"
+ continue
+ fi
+ t "$code"-amd64 -A "$@"
+ [ $A -eq 1 ] || t "$code"-i386 "$@"
+done
tput bold >&2
hr
Modified: trunk/debathena/scripts/daequivsupload
===================================================================
--- trunk/debathena/scripts/daequivsupload 2008-02-07 23:57:00 UTC (rev 22738)
+++ trunk/debathena/scripts/daequivsupload 2008-02-08 04:30:14 UTC (rev 22739)
@@ -6,8 +6,10 @@
# packages are very simple, there is no need to build them separately
# for each dist.
+source $(dirname "$0")/debian-versions.sh
+
: ${DEBATHENA_APT=/mit/debathena/apt}
-for dist in sarge etch lenny dapper edgy feisty gutsy; do
- reprepro -Vb $DEBATHENA_APT --ignore=wrongdistribution include "$dist" "$1"
+for code in $DEBIAN_CODES; do
+ reprepro -Vb $DEBATHENA_APT --ignore=wrongdistribution include "$code" "$1"
done
Modified: trunk/debathena/scripts/daupload-release
===================================================================
--- trunk/debathena/scripts/daupload-release 2008-02-07 23:57:00 UTC (rev 22738)
+++ trunk/debathena/scripts/daupload-release 2008-02-08 04:30:14 UTC (rev 22739)
@@ -13,8 +13,12 @@
# Upon completion, moves all of the generated files into the "built"
# subdirectory.
-: ${DEBATHENA_APT=/mit/debathena/apt}
+source $(dirname "$0")/debian-versions.sh
+if [ -z "$DEBATHENA_APT" ]; then
+ DEBATHENA_APT=/mit/debathena/apt
+fi
+
case "$(basename "$0")" in
daupload-release)
repo=$DEBATHENA_APT
@@ -53,27 +57,32 @@
missing=
[ -s "$change" ]
if [ $S -ne 1 ]; then
- check "$base~debian3.1_i386.changes"
- check "$base~debian4.0_amd64.changes"
- check "$base~debian4.1~0.1_amd64.changes"
- check "$base~ubuntu6.06_amd64.changes"
- check "$base~ubuntu6.10_amd64.changes"
- check "$base~ubuntu7.04_amd64.changes"
- check "$base~ubuntu7.10_amd64.changes"
+ for code in $DEBIAN_CODES; do
+ if [ "$code" = "sarge" ]; then
+ check "$base~debian3.1_i386.changes"
+ else
+ tag=$(gettag "$code")
+ check "${base}${tag}_amd64.changes"
+ fi
+ done
if [ $A -eq 1 ]; then
- uncheck "$base~debian4.0_i386.changes"
- uncheck "$base~debian4.1~0.1_i386.changes"
- uncheck "$base~ubuntu6.06_i386.changes"
- uncheck "$base~ubuntu6.10_i386.changes"
- uncheck "$base~ubuntu7.04_i386.changes"
- uncheck "$base~ubuntu7.10_i386.changes"
+ for code in $DEBIAN_CODES; do
+ if [ "$code" = "sarge" ]; then
+ true;
+ else
+ tag=$(gettag "$code")
+ uncheck "${base}${tag}_i386.changes"
+ fi
+ done
else
- check "$base~debian4.0_i386.changes"
- check "$base~debian4.1~0.1_i386.changes"
- check "$base~ubuntu6.06_i386.changes"
- check "$base~ubuntu6.10_i386.changes"
- check "$base~ubuntu7.04_i386.changes"
- check "$base~ubuntu7.10_i386.changes"
+ for code in $DEBIAN_CODES; do
+ if [ "$code" = "sarge" ]; then
+ true;
+ else
+ tag=$(gettag "$code")
+ check "${base}${tag}_i386.changes"
+ fi
+ done
fi
fi
@@ -87,45 +96,32 @@
REPREPRO="v reprepro -Vb $repo"
REPREPROI="$REPREPRO --ignore=wrongdistribution"
-$REPREPROI include sarge "$change"
-$REPREPROI include etch "$change"
-$REPREPROI include lenny "$change"
-$REPREPROI include dapper "$change"
-$REPREPROI include edgy "$change"
-$REPREPROI include feisty "$change"
-$REPREPROI include gutsy "$change"
+for code in $DEBIAN_CODES; do
+ $REPREPROI include "$code" "$change"
+done
if [ $S -ne 1 ]; then
- $REPREPRO include sarge "$base~debian3.1_i386.changes"
- [ $A -eq 1 ] || $REPREPRO include etch "$base~debian4.0_i386.changes"
- $REPREPRO include etch "$base~debian4.0_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include lenny "$base~debian4.1~0.1_i386.changes"
- $REPREPRO include lenny "$base~debian4.1~0.1_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include dapper "$base~ubuntu6.06_i386.changes"
- $REPREPRO include dapper "$base~ubuntu6.06_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include edgy "$base~ubuntu6.10_i386.changes"
- $REPREPRO include edgy "$base~ubuntu6.10_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include feisty "$base~ubuntu7.04_i386.changes"
- $REPREPRO include feisty "$base~ubuntu7.04_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include gutsy "$base~ubuntu7.10_i386.changes"
- $REPREPRO include gutsy "$base~ubuntu7.10_amd64.changes"
+ for code in $DEBIAN_CODES; do
+ if [ "$code" = "sarge" ]; then
+ $REPREPRO include sarge "$base~debian3.1_i386.changes"
+ else
+ tag=$(gettag "$code")
+ [ $A -eq 1 ] || $REPREPRO include "$code" "${base}${tag}_i386.changes"
+ $REPREPRO include "$code" "${base}${tag}_amd64.changes"
+ fi
+ done
fi
-
changes=$change
-changes=$changes\ $base~debian3.1_i386.changes
-[ $A -eq 1 ] || changes=$changes\ $base~debian4.0_i386.changes
-changes=$changes\ $base~debian4.0_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ $base~debian4.1~0.1_i386.changes
-changes=$changes\ $base~debian4.1~0.1_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ $base~ubuntu6.06_i386.changes
-changes=$changes\ $base~ubuntu6.06_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ $base~ubuntu6.10_i386.changes
-changes=$changes\ $base~ubuntu6.10_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ $base~ubuntu7.04_i386.changes
-changes=$changes\ $base~ubuntu7.04_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ $base~ubuntu7.10_i386.changes
-changes=$changes\ $base~ubuntu7.10_amd64.changes
+for code in $$DEBIAN_CODES; do
+ if [ "$code" = "sarge" ]; then
+ changes=$changes\ $base~debian3.1_i386.changes
+ else
+ tag=$(gettag "$code")
+ [ $A -eq 1 ] || changes=$changes\ "${base}${tag}"_i386.changes
+ changes=$changes\ "${base}${tag}"_amd64.changes
+ fi
+done
files=${change%.changes}.build\ $changes
origfiles=
Added: trunk/debathena/scripts/debian-versions.sh
Property changes on: trunk/debathena/scripts/debian-versions.sh
___________________________________________________________________
Name: svn:executable
+ *
