summaryrefslogtreecommitdiff
path: root/lib/talloc/script
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2010-02-08 10:05:24 -0500
committerSimo Sorce <idra@samba.org>2010-02-08 10:12:50 -0500
commit6bf2a821b7a5fb0890b6fc9cd439a915252477a1 (patch)
treec4f51cc6ca9c9325a17e34d0cc3321547c96101f /lib/talloc/script
parent1422a9465482deeba1218755e1d4d0a02e6abc3f (diff)
downloadsamba-6bf2a821b7a5fb0890b6fc9cd439a915252477a1.tar.gz
samba-6bf2a821b7a5fb0890b6fc9cd439a915252477a1.tar.bz2
samba-6bf2a821b7a5fb0890b6fc9cd439a915252477a1.zip
talloc: Fix abi checks in release script
We must perform abi checks against the version we are going to release. Not against the current tree we are in.
Diffstat (limited to 'lib/talloc/script')
-rwxr-xr-xlib/talloc/script/release-script.sh41
1 files changed, 24 insertions, 17 deletions
diff --git a/lib/talloc/script/release-script.sh b/lib/talloc/script/release-script.sh
index fd5c1eff5d..2f354ab35a 100755
--- a/lib/talloc/script/release-script.sh
+++ b/lib/talloc/script/release-script.sh
@@ -10,19 +10,6 @@ if [ ! -d "lib/talloc" ]; then
exit 1
fi
-# Check exports and signatures are up to date
-pushd lib/talloc
-./script/abi_checks.sh talloc talloc.h
-abicheck=$?
-popd
-if [ ! "$abicheck" = "0" ]; then
- echo "ERROR: ABI Checks produced warnings!"
- exit 1
-fi
-
-git clean -f -x -d lib/talloc
-git clean -f -x -d lib/replace
-
curbranch=`git branch |grep "^*" | tr -d "* "`
version=$1
@@ -35,15 +22,36 @@ if [ ! "$?" = "0" ]; then
exit 1
fi
+function cleanquit {
+ #Clean up
+ git checkout $curbranch
+ git branch -d talloc-release-script-${strver}
+ exit $1
+}
+
+# NOTE: use cleanquit after this point
git checkout talloc-release-script-${strver}
# Test configure agrees with us
confver=`grep "^AC_INIT" lib/talloc/configure.ac | tr -d "AC_INIT(talloc, " | tr -d ")"`
if [ ! "$confver" = "$version" ]; then
echo "Wrong version, requested release for ${version}, found ${confver}"
- exit 1
+ cleanquit 1
+fi
+
+# Check exports and signatures are up to date
+pushd lib/talloc
+./script/abi_checks.sh talloc talloc.h
+abicheck=$?
+popd
+if [ ! "$abicheck" = "0" ]; then
+ echo "ERROR: ABI Checks produced warnings!"
+ cleanquit 1
fi
+git clean -f -x -d lib/talloc
+git clean -f -x -d lib/replace
+
# Now build tarball
cp -a lib/talloc talloc-${version}
cp -a lib/replace talloc-${version}/libreplace
@@ -53,6 +61,5 @@ popd
tar cvzf talloc-${version}.tar.gz talloc-${version}
rm -fr talloc-${version}
-#Clean up
-git checkout $curbranch
-git branch -d talloc-release-script-${strver}
+cleanquit 0
+