saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 16:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanups in preparation for a release.

Browse Source 
1. Fix the release script to ignore the version.h checking.
2. Fix some ceres documentation formatting errors.

Change-Id: I3fd6b85e771b242f463d6a36c3efd8d691f9242f
This commit is contained in:
Sameer Agarwal
2014-10-08 12:48:16 -07:00
parent 7b6bd1cd31
commit 6768b3586a
4 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/make_release
+1 -24
View File
@@ -46,11 +46,6 @@ VERSION=$(grep 'SET(CERES_VERSION_' CMakeLists.txt | \
ABI_VERSION=$(grep 'SET(CERES_ABI_VERSION' CMakeLists.txt | \
sed -e 's/SET(CERES_ABI_VERSION //' | \
sed -e 's/)//')
VERSION_IN_HEADER=$(grep '#define CERES_VERSION' include/ceres/ceres.h | \
sed -e 's/#define CERES_VERSION //')
ABI_VERSION_IN_HEADER=$(grep '#define CERES_ABI_VERSION' \
include/ceres/ceres.h | \
sed -e 's/#define CERES_ABI_VERSION //')
VERSION_IN_SPEC=$(grep '^Version:' scripts/ceres-solver.spec | \
sed -e 's/Version: *//')
GIT_COMMIT=$(git log -1 HEAD |grep commit)
@@ -62,24 +57,6 @@ if [[ $1 != $VERSION ]] ; then
exit 1
fi
if [[ $VERSION_IN_HEADER != $VERSION ]] ; then
echo "ERROR: CERES_VERSION version from include/ceres/ceres.h, which is"
echo " $VERSION_IN_HEADER, does not match the ABI 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
if [[ $ABI_VERSION_IN_HEADER != $ABI_VERSION ]] ; then
echo "ERROR: CERES_ABI_VERSION from include/ceres/ceres.h, which is"
echo " $ABI_VERSION_IN_HEADER, does not match the ABI 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
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"
@@ -111,7 +88,7 @@ rm -rf $TMP
rm -rf $DOCS_TMP
# Reminder to upload.
cat <<EOF
cat <<EOF
TODO:
- Upload /tmp/ceres-solver-$1.tar.gz