[SCM] Samba Shared Repository - branch master updated
Simo Sorce
idra at samba.org
Mon Feb 8 08:30:49 MST 2010
The branch, master has been updated
via 6339de7... release-scripts: parametrize scripts
from 6bf2a82... talloc: Fix abi checks in release script
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6339de7f4fef46fb3ad32d1ecf9379f5b5d24ccb
Author: Simo Sorce <idra at samba.org>
Date: Mon Feb 8 10:25:13 2010 -0500
release-scripts: parametrize scripts
This should make it easier to keep all release scripts alined as it will reduce
the difference between them to ideally a few variables
Also moves the tdb script in the scripts directory.
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/script/release-script.sh | 31 +++++++++-------
lib/tdb/release-script.sh | 48 --------------------------
lib/{talloc => tdb}/script/release-script.sh | 34 ++++++++++--------
3 files changed, 35 insertions(+), 78 deletions(-)
delete mode 100755 lib/tdb/release-script.sh
copy lib/{talloc => tdb}/script/release-script.sh (55%)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/script/release-script.sh b/lib/talloc/script/release-script.sh
index 2f354ab..4b8aac7 100755
--- a/lib/talloc/script/release-script.sh
+++ b/lib/talloc/script/release-script.sh
@@ -1,11 +1,14 @@
#!/bin/bash
+LNAME=talloc
+LINCLUDE=talloc.h
+
if [ "$1" = "" ]; then
echo "Please provide version string, eg: 1.2.0"
exit 1
fi
-if [ ! -d "lib/talloc" ]; then
+if [ ! -d "lib/${LNAME}" ]; then
echo "Run this script from the samba base directory."
exit 1
fi
@@ -16,32 +19,32 @@ version=$1
strver=`echo ${version} | tr "." "-"`
# Checkout the release tag
-git branch -f talloc-release-script-${strver} talloc-${strver}
+git branch -f ${LNAME}-release-script-${strver} ${LNAME}-${strver}
if [ ! "$?" = "0" ]; then
- echo "Unable to checkout talloc-${strver} release"
+ echo "Unable to checkout ${LNAME}-${strver} release"
exit 1
fi
function cleanquit {
#Clean up
git checkout $curbranch
- git branch -d talloc-release-script-${strver}
+ git branch -d ${LNAME}-release-script-${strver}
exit $1
}
# NOTE: use cleanquit after this point
-git checkout talloc-release-script-${strver}
+git checkout ${LNAME}-release-script-${strver}
# Test configure agrees with us
-confver=`grep "^AC_INIT" lib/talloc/configure.ac | tr -d "AC_INIT(talloc, " | tr -d ")"`
+confver=`grep "^AC_INIT" lib/${LNAME}/configure.ac | tr -d "AC_INIT(${LNAME}, " | tr -d ")"`
if [ ! "$confver" = "$version" ]; then
echo "Wrong version, requested release for ${version}, found ${confver}"
cleanquit 1
fi
# Check exports and signatures are up to date
-pushd lib/talloc
-./script/abi_checks.sh talloc talloc.h
+pushd lib/${LNAME}
+./script/abi_checks.sh ${LNAME} ${LINCLUDE}
abicheck=$?
popd
if [ ! "$abicheck" = "0" ]; then
@@ -49,17 +52,17 @@ if [ ! "$abicheck" = "0" ]; then
cleanquit 1
fi
-git clean -f -x -d lib/talloc
+git clean -f -x -d lib/${LNAME}
git clean -f -x -d lib/replace
# Now build tarball
-cp -a lib/talloc talloc-${version}
-cp -a lib/replace talloc-${version}/libreplace
-pushd talloc-${version}
+cp -a lib/${LNAME} ${LNAME}-${version}
+cp -a lib/replace ${LNAME}-${version}/libreplace
+pushd ${LNAME}-${version}
./autogen.sh
popd
-tar cvzf talloc-${version}.tar.gz talloc-${version}
-rm -fr talloc-${version}
+tar cvzf ${LNAME}-${version}.tar.gz ${LNAME}-${version}
+rm -fr ${LNAME}-${version}
cleanquit 0
diff --git a/lib/tdb/release-script.sh b/lib/tdb/release-script.sh
deleted file mode 100755
index 273ca30..0000000
--- a/lib/tdb/release-script.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "" ]; then
- echo "Please provide version string, eg: 1.2.0"
- exit 1
-fi
-
-if [ ! -d "lib/tdb" ]; then
- echo "Run this script from the samba base directory."
- exit 1
-fi
-
-git clean -f -x -d lib/tdb
-git clean -f -x -d lib/replace
-
-curbranch=`git branch |grep "^*" | tr -d "* "`
-
-version=$1
-strver=`echo ${version} | tr "." "-"`
-
-# Checkout the release tag
-git branch -f tdb-release-script-${strver} tdb-${strver}
-if [ ! "$?" = "0" ]; then
- echo "Unable to checkout tdb-${strver} release"
- exit 1
-fi
-
-git checkout tdb-release-script-${strver}
-
-# Test configure agrees with us
-confver=`grep "^AC_INIT" lib/tdb/configure.ac | tr -d "AC_INIT(tdb, " | tr -d ")"`
-if [ ! "$confver" = "$version" ]; then
- echo "Wrong version, requested release for ${version}, found ${confver}"
- exit 1
-fi
-
-# Now build tarball
-cp -a lib/tdb tdb-${version}
-cp -a lib/replace tdb-${version}/libreplace
-pushd tdb-${version}
-./autogen.sh
-popd
-tar cvzf tdb-${version}.tar.gz tdb-${version}
-rm -fr tdb-${version}
-
-#Clean up
-git checkout $curbranch
-git branch -d tdb-release-script-${strver}
diff --git a/lib/talloc/script/release-script.sh b/lib/tdb/script/release-script.sh
similarity index 55%
copy from lib/talloc/script/release-script.sh
copy to lib/tdb/script/release-script.sh
index 2f354ab..e9a023d 100755
--- a/lib/talloc/script/release-script.sh
+++ b/lib/tdb/script/release-script.sh
@@ -1,11 +1,14 @@
#!/bin/bash
+LNAME=tdb
+LINCLUDE=include/tdb.h
+
if [ "$1" = "" ]; then
echo "Please provide version string, eg: 1.2.0"
exit 1
fi
-if [ ! -d "lib/talloc" ]; then
+if [ ! -d "lib/${LNAME}" ]; then
echo "Run this script from the samba base directory."
exit 1
fi
@@ -16,32 +19,32 @@ version=$1
strver=`echo ${version} | tr "." "-"`
# Checkout the release tag
-git branch -f talloc-release-script-${strver} talloc-${strver}
+git branch -f ${LNAME}-release-script-${strver} ${LNAME}-${strver}
if [ ! "$?" = "0" ]; then
- echo "Unable to checkout talloc-${strver} release"
+ echo "Unable to checkout ${LNAME}-${strver} release"
exit 1
fi
function cleanquit {
#Clean up
git checkout $curbranch
- git branch -d talloc-release-script-${strver}
+ git branch -d ${LNAME}-release-script-${strver}
exit $1
}
# NOTE: use cleanquit after this point
-git checkout talloc-release-script-${strver}
+git checkout ${LNAME}-release-script-${strver}
# Test configure agrees with us
-confver=`grep "^AC_INIT" lib/talloc/configure.ac | tr -d "AC_INIT(talloc, " | tr -d ")"`
+confver=`grep "^AC_INIT" lib/${LNAME}/configure.ac | tr -d "AC_INIT(${LNAME}, " | tr -d ")"`
if [ ! "$confver" = "$version" ]; then
echo "Wrong version, requested release for ${version}, found ${confver}"
- cleanquit 1
+ exit 1
fi
# Check exports and signatures are up to date
-pushd lib/talloc
-./script/abi_checks.sh talloc talloc.h
+pushd lib/${LNAME}
+./script/abi_checks.sh ${LNAME} ${LINCLUDE}
abicheck=$?
popd
if [ ! "$abicheck" = "0" ]; then
@@ -49,17 +52,16 @@ if [ ! "$abicheck" = "0" ]; then
cleanquit 1
fi
-git clean -f -x -d lib/talloc
+git clean -f -x -d lib/${LNAME}
git clean -f -x -d lib/replace
# Now build tarball
-cp -a lib/talloc talloc-${version}
-cp -a lib/replace talloc-${version}/libreplace
-pushd talloc-${version}
+cp -a lib/${LNAME} ${LNAME}-${version}
+cp -a lib/replace ${LNAME}-${version}/libreplace
+pushd ${LNAME}-${version}
./autogen.sh
popd
-tar cvzf talloc-${version}.tar.gz talloc-${version}
-rm -fr talloc-${version}
+tar cvzf ${LNAME}-${version}.tar.gz ${LNAME}-${version}
+rm -fr ${LNAME}-${version}
cleanquit 0
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list