r51438 - in /scripts/examples: check-build svn-buildpackage-pdebuild
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Jan 24 14:59:18 UTC 2010
Author: gregoa
Date: Sun Jan 24 14:59:11 2010
New Revision: 51438
URL: http://svn.debian.org/wsvn/?sc=1&rev=51438
Log:
split svn-buildpackage-pdebuild and check-build:
- update the former
- the latter now also works as a stand-alone script
Added:
scripts/examples/check-build (with props)
Modified:
scripts/examples/svn-buildpackage-pdebuild
Added: scripts/examples/check-build
URL: http://svn.debian.org/wsvn/scripts/examples/check-build?rev=51438&op=file
==============================================================================
--- scripts/examples/check-build (added)
+++ scripts/examples/check-build Sun Jan 24 14:59:11 2010
@@ -1,0 +1,89 @@
+#!/bin/sh
+
+# Copyright: 2010, gregor herrmann <gregoa at debian.org>
+# Licensed under the same terms as Perl (Artistic | GPL-1+)
+
+# pass $BUILDDIR
+
+BUILDDIR=${BUILDDIR:-".."}
+if [ ! -d "$BUILDDIR" ] ; then
+ echo "E: Build directory \"$BUILDDIR\" does not exist."
+ echo " Maybe you forgot to set the BUILDDIR variable?"
+ echo " Exiting ..."
+ exit 1
+fi
+
+rm -rf $BUILDDIR/*obsolete*
+rm -f $BUILDDIR/*_source.changes
+rm -f $BUILDDIR/*.dsc.asc
+
+PACKAGE=$(head -1 debian/changelog | perl -pe 's|^([^\s]+) .*|$1|')
+VERSION=$(head -1 debian/changelog | perl -pe 's|^.+ \((?:\d:)?(.+)\) .*|$1|')
+
+CHANGES=$BUILDDIR/${PACKAGE}_${VERSION}_$(dpkg-architecture -qDEB_HOST_ARCH).changes
+DSC=$BUILDDIR/${PACKAGE}_${VERSION}.dsc
+
+if [ ! -r "$CHANGES" -o ! -r "$DSC" ] ; then
+ echo "E: Can't read \"$CHANGES\" or \"$DSC\"."
+ echo " Is BUILDDIR set correctly: \"$BUILDDIR\"?"
+ echo " Exiting ..."
+ exit 1
+fi
+
+FORMAT=$(grep ^Format: $DSC | cut -f2 -d" ")
+DIFFGZ=$BUILDDIR/${PACKAGE}_${VERSION}.diff.gz
+DEBGZ=$BUILDDIR/${PACKAGE}_${VERSION}.debian.tar.gz
+
+echo "lintian:"
+echo "========"
+lintian -i -I --show-overrides --pedantic --color auto "$CHANGES"
+
+if [ "$FORMAT" = "1.0" -a -x /usr/bin/linda ] ; then
+ echo "linda:"
+ echo "======"
+ linda -i -s -t E,W,I "$CHANGES"
+fi
+
+read -n 1 -p "debc? y/N " DEBC
+if [ "$DEBC" = "y" ]; then
+ debc | less
+fi
+echo
+
+read -n 1 -p "piuparts? y/N " PIU
+if [ "$PIU" = "y" ]; then
+ sudo /usr/sbin/piuparts -p --warn-on-others --warn-symlinks "$CHANGES"
+fi
+echo
+
+PKGVER=$(echo ${PACKAGE}-${VERSION} | perl -pe 's;^(.+)(?:-.+)$;$1;')
+AUTOPATCH=debian/patches/debian-changes-${VERSION}
+if [ "$FORMAT" = "1.0" ] && zgrep -E "^\+\+\+ " "$DIFFGZ" | grep -v $PKGVER/debian > /dev/null; then
+ echo
+ echo "changes in .diff.gz outside debian/!"
+ read -n 1 -p "view .diff.gz? y/N " VIEWDIFFGZ
+ if [ "$VIEWDIFFGZ" = "y" ]; then
+ filterdiff -z -x "$PKGVER/debian/*" "$DIFFGZ" | colordiff | /usr/bin/less -R
+ fi
+ echo
+ echo "maybe: mkdir debian/patches && diff2patches $DIFFGZ"
+ echo
+elif [ "$FORMAT" = "3.0" ] && tar tzvf "$DEBGZ" | grep -q "$AUTOPATCH"; then
+ echo
+ echo "automatically created patch in .debian.tar.gz!"
+ read -n 1 -p "extract patch from .debian.tar.gz? y/N " VIEWDEBGZ
+ if [ "$VIEWDEBGZ" = "y" ]; then
+ tar xzf "$DEBGZ" "$AUTOPATCH"
+ cat "$AUTOPATCH"
+ fi
+ echo
+else
+ read -n 1 -p "ready for upload? y/N " UPLOAD
+ if [ "$UPLOAD" = "y" ]; then
+ echo
+ cat "$CHANGES"
+ echo
+ echo dput $(readlink -f "$CHANGES")
+ fi
+ echo
+fi
Propchange: scripts/examples/check-build
------------------------------------------------------------------------------
svn:executable = *
Modified: scripts/examples/svn-buildpackage-pdebuild
URL: http://svn.debian.org/wsvn/scripts/examples/svn-buildpackage-pdebuild?rev=51438&op=diff
==============================================================================
--- scripts/examples/svn-buildpackage-pdebuild (original)
+++ scripts/examples/svn-buildpackage-pdebuild Sun Jan 24 14:59:11 2010
@@ -1,33 +1,36 @@
#!/bin/bash
-# Copyright gregor herrmann <gregoa at debian.org>
+# Copyright 2010, gregor herrmann <gregoa at debian.org>
# Licensed under the same terms as Perl (Artistic | GPL-1+)
# wrapper script for building and checking packages
# with svn-buildpackage and pdebuild
BUILDDIR="`pwd`/../build-area"
+DIST=
+BUILDER=
BUILDOPTS=
PDEBUILDOPTS=
+PBUILDEROPTS=
-# distributions (cowbuilder chroots)
+# distributions:
# e = etch, l = lenny, q = squeeze
# options:
-# b = binary, j = -jX, s = -sa, i = pdebuild-internal, v = -vX, t = notest
-while getopts elqij:sbv:t O; do
+# b = binary, j = -jX, s = -sa, i = pdebuild-internal, v = -vX, t = notest, -w = twice
+while getopts elqij:sbv:tw O; do
case "$O" in
# pbuilder example
#P)
# DIST="--pbuilder pbuilder -- --basetgz /var/cache/pbuilder/base.tgz"
# ;;
e)
- DIST="-- --debian-etch-workaround --basepath /var/cache/pbuilder/etch-base.cow"
+ PBUILDEROPTS="--debian-etch-workaround --basepath /var/cache/pbuilder/etch-base.cow"
;;
l)
- DIST="-- --basepath /var/cache/pbuilder/lenny-base.cow"
+ PBUILDEROPTS="--basepath /var/cache/pbuilder/lenny-base.cow"
;;
q)
- DIST="-- --basepath /var/cache/pbuilder/squeeze-base.cow"
+ PBUILDEROPTS="--basepath /var/cache/pbuilder/squeeze-base.cow"
;;
b)
BUILDOPTS="$BUILDOPTS -B -m${DEBEMAIL}"
@@ -39,7 +42,10 @@
BUILDOPTS="$BUILDOPTS -sa"
;;
i)
- PDEBUILDOPTS="--use-pdebuild-internal"
+ PDEBUILDOPTS="$PDEBUILDOPTS --use-pdebuild-internal"
+ ;;
+ w)
+ export DOUBLE=yes
;;
v)
BUILDOPTS="$BUILDOPTS -v${OPTARG}"
@@ -54,50 +60,8 @@
shift $((OPTIND - 1))
[ -n "$BUILDOPTS" ] && BUILDOPTS="--debbuildopts \"$BUILDOPTS\""
+[ -n "$PBUILDEROPTS" ] && PBUILDEROPTS="-- $PBUILDEROPTS"
-svn-buildpackage --svn-builder="pdebuild --auto-debsign --buildresult $BUILDDIR/ $PDEBUILDOPTS $BUILDOPTS $DIST" "$@" || exit 1
+svn-buildpackage --svn-builder="pdebuild --auto-debsign --buildresult $BUILDDIR/ $PDEBUILDOPTS $BUILDOPTS $BUILDER $PBUILDEROPTS" "$@" || exit 1
-rm -rf $BUILDDIR/*obsolete*
-rm -f $BUILDDIR/*_source.changes
-rm -f $BUILDDIR/*.dsc.asc
-
-CHANGES=$(ls $BUILDDIR/*changes -rt| tail -n 1)
-DIFFGZ=$(ls $BUILDDIR/*.diff.gz -rt| tail -n 1)
-PKGVER=$(echo $DIFFGZ | perl -pe 's;^.+/(.+)_(.+)-.+$;\1-\2;')
-
-echo "lintian:"
-echo "========"
-lintian -i -I --show-overrides --pedantic --color auto $CHANGES
-
-read -n 1 -p "debc? y/N " DEBC
-if [ "$DEBC" = "y" ]; then
- debc | less
-fi
-echo
-
-read -n 1 -p "piuparts? y/N " PIU
-if [ "$PIU" = "y" ]; then
- DEB=$(ls $BUILDDIR/*.deb -rt| tail -n 1)
- sudo /usr/sbin/piuparts -p --warn-on-others $DEB
-fi
-echo
-
-if zgrep -E "^\+\+\+ " "$DIFFGZ" | grep -v $PKGVER/debian > /dev/null; then
- echo "changes in .diff.gz outside debian/!"
- read -n 1 -p "view .diff.gz? y/N " VIEWDIFFGZ
- if [ "$VIEWDIFFGZ" = "y" ]; then
- filterdiff -z -x "$PKGVER/debian/*" $DIFFGZ | colordiff | /usr/bin/less -R
- fi
- echo
- echo "maybe: mkdir debian/patches && diff2patches $DIFFGZ"
- echo
-else
- read -n 1 -p "ready for upload? y/N " UPLOAD
- if [ "$UPLOAD" = "y" ]; then
- echo
- cat $CHANGES
- echo
- echo dput $CHANGES
- fi
- echo
-fi
+source $(dirname $0)/check-build
More information about the Pkg-perl-cvs-commits
mailing list