summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-11-27 13:06:15 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-27 13:06:15 +0100
commita95619d0ee778632cdad5bcf698a4bb88fab5676 (patch)
tree55af14eab8ffdfae9dbe2b40ef5d7fd5ea63e221
parent090c6f0a7ff49acb49be67433a7114ff8bfe5a70 (diff)
use pre-build hook to check for pre-export execution
Git-Dch: Ignore
-rw-r--r--debian/gbp.conf5
-rwxr-xr-xprepare-release22
2 files changed, 21 insertions, 6 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8da0358df..a5e885896 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,7 @@
[DEFAULT]
-; we need preexport here
-;prebuild = ./prepare-release pre-export
+; we need a preexport here
+;preexport = ./prepare-release pre-export
+prebuild = ./prepare-release pre-build
postbuild = ./prepare-release post-build
debian-branch = master
debian-tag = %(version)s
diff --git a/prepare-release b/prepare-release
index 8605719b1..89d5feae9 100755
--- a/prepare-release
+++ b/prepare-release
@@ -60,6 +60,7 @@ if [ "$1" = 'pre-export' ]; then
grep --files-with-matches '<date>' doc/*.xml | while read file; do \
LASTMOD="$(date -d "@$(git log --format='%at' --max-count=1 --invert-grep --fixed-strings --grep 'review
typo
+release
Git-Dch: Ignore' "$file")" '+%Y-%m-%dT00:00:00Z')"
sed -i -e "s#^\([ ]\+\)<date>.*</date>\$#\1<date>$LASTMOD</date>#" "$file"
done
@@ -69,6 +70,17 @@ Git-Dch: Ignore' "$file")" '+%Y-%m-%dT00:00:00Z')"
echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…'
make update-po
fi
+elif [ "$1" = 'pre-build' ]; then
+ if [ "$DISTRIBUTION" = "UNRELEASED" ]; then
+ echo 'BUILDING AN UNRELEASED VERSION'
+ else
+ CONFVERSION="$(sed -ne "s/^PACKAGE_VERSION=\"\(.*\)\"$/\1/p" configure.ac)"
+ if [ "$VERSION" != "$CONFVERSION" ]; then
+ echo "changelog (${VERSION}) and configure (${CONFVERSION}) talk about different versions!"
+ echo "You probably want to run »./prepare-release pre-export« to fix this."
+ exit 1
+ fi
+ fi
elif [ "$1" = 'post-build' ]; then
if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
echo >&2 "REMEMBER: Tag this release with »git tag -s ${VERSION}« if you are satisfied"
@@ -166,12 +178,14 @@ elif [ "$1" = 'coverage' ]; then
genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC}
else
echo >&1 "Usage:\t$0 pre-export
+\t$0 pre-build
\t$0 post-build
-If you use »gbp buildpackage« you can leave these alone as they will
-be run at the right places auto-magically. Otherwise you should use
-»pre-export« to update po and pot files as well as version numbering.
-»post-build« can be used to run some more or less useful checks later on.
+Updating po-files and versions as well as some basic checks are done
+by »pre-export« which needs to be run before package building.
+If you use »gbp buildpackage« you will be notified if you forget.
+»pre-build« and »post-build« can be used to run some more or less
+useful checks automatically run by »gbp« otherwise.
\t$0 library
\t$0 buildlog filename…