Minor cleanups in preparation for a release.
1. Fix the release script to ignore the version.h checking.
2. Fix some ceres documentation formatting errors.
Change-Id: I3fd6b85e771b242f463d6a36c3efd8d691f9242f
diff --git a/docs/source/faqs.rst b/docs/source/faqs.rst
index e9a3ad9..81601da 100644
--- a/docs/source/faqs.rst
+++ b/docs/source/faqs.rst
@@ -169,7 +169,7 @@
installed. Both of these preconditioners use a clustering
algorithm. Use ``SINGLE_LINKAGE`` before ``CANONICAL_VIEWS``.
-#. Use :function:`Solver::Summary::FullReport` to diagnose performance problems.
+#. Use :func:`Solver::Summary::FullReport` to diagnose performance problems.
When diagnosing Ceres performance issues - runtime and convergence,
the first place to start is by looking at the output of
diff --git a/docs/source/gradient_tutorial.rst b/docs/source/gradient_tutorial.rst
index 318bcf2..9ffc555 100644
--- a/docs/source/gradient_tutorial.rst
+++ b/docs/source/gradient_tutorial.rst
@@ -21,7 +21,7 @@
=====================
We consider the minimization of the famous `Rosenbrock's function
-<http://en.wikipedia.org/wiki/Rosenbrock_function>`_ [#f9]_.
+<http://en.wikipedia.org/wiki/Rosenbrock_function>`_ [#f1]_.
We begin by defining an instance of the ``FirstOrderFunction``
interface. This is the object that is responsible for computing the
diff --git a/docs/source/nnls_solving.rst b/docs/source/nnls_solving.rst
index e25ae32..a283f98 100644
--- a/docs/source/nnls_solving.rst
+++ b/docs/source/nnls_solving.rst
@@ -632,7 +632,7 @@
evaluation of the matrix vector product :math:`Sx` for an arbitrary
vector :math:`x`. There are two ways in which this product can be
evaluated, and this can be controlled using
-``Solver::Options::use_explicit_schur_complement`. Depending on the
+``Solver::Options::use_explicit_schur_complement``. Depending on the
problem at hand, the performance difference between these two methods
can be quite substantial.
diff --git a/scripts/make_release b/scripts/make_release
index d3ca820..0365d4a 100755
--- a/scripts/make_release
+++ b/scripts/make_release
@@ -46,11 +46,6 @@
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 @@
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 $DOCS_TMP
# Reminder to upload.
-cat <<EOF
+cat <<EOF
TODO:
- Upload /tmp/ceres-solver-$1.tar.gz
