Get ready for 1.11.0RC1

Update version numbers.
Drop CERES_VERSION_ABI macro.

Change-Id: Ib3eadabb318afe206bb196a5221b195d26cbeaa0
This commit is contained in:
Sameer Agarwal
2015-09-05 16:50:20 -07:00
parent 1ac3dd223c
commit a66d89dcda
10 changed files with 18 additions and 44 deletions
+1 -22
View File
@@ -40,14 +40,9 @@ fi
TMP="/tmp/ceres-solver-$1"
DOCS_TMP="/tmp/ceres-solver-docs-$1"
VERSION=$(grep 'SET(CERES_VERSION_' CMakeLists.txt | \
VERSION=$(grep 'set(CERES_VERSION_' CMakeLists.txt | \
sed -e 's/\(.*\) \(.*\))/\2/' | \
tr '\n' '.' | sed -e 's/.$//')
ABI_VERSION=$(grep 'SET(CERES_ABI_VERSION' CMakeLists.txt | \
sed -e 's/SET(CERES_ABI_VERSION //' | \
sed -e 's/)//')
VERSION_IN_SPEC=$(grep '^Version:' scripts/ceres-solver.spec | \
sed -e 's/Version: *//')
GIT_COMMIT=$(git log -1 HEAD |grep commit)
if [[ $1 != $VERSION ]] ; then
@@ -57,22 +52,12 @@ if [[ $1 != $VERSION ]] ; then
exit 1
fi
if [[ $VERSION_IN_SPEC != $VERSION ]] ; then
echo "ERROR: Version string from scripts/ceres-solver.spec, which is"
echo " $VERSION_IN_SPEC, does not match the version"
echo " from the toplevel CMakeLists.txt, which is $ABI_VERSION."
echo " You may not be in the toplevel source directory, or the"
echo " versions are out of sync."
exit 1
fi
# Export repository.
git checkout-index -f -a --prefix=$TMP/
# Build the VERSION file.
VERSIONFILE=$TMP/VERSION
echo "version $VERSION" >> $VERSIONFILE
echo "abi_version $VERSION" >> $VERSIONFILE
echo "$GIT_COMMIT" >> $VERSIONFILE
# Build the documentation.
@@ -92,10 +77,4 @@ cat <<EOF
TODO:
- Upload /tmp/ceres-solver-$1.tar.gz
- Update the release string in scripts/ceres-solver.spec if this is a RC
release or the first release after a RC release.
- Build and upload RPM package.
EOF