Preparations for 1.9.0 release. Version bump. minor docs update. Change-Id: I2fbe20ba4af6b2e186fe244c96ce6d6464fe0469
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8626a4e..f157c2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -83,11 +83,11 @@ # For versions without ABI changes, bump the smallest number in CERES_VERSION, # but leave the CERES_ABI_VERSION unchanged. SET(CERES_VERSION_MAJOR 1) -SET(CERES_VERSION_MINOR 8) +SET(CERES_VERSION_MINOR 9) SET(CERES_VERSION_PATCH 0) SET(CERES_VERSION ${CERES_VERSION_MAJOR}.${CERES_VERSION_MINOR}.${CERES_VERSION_PATCH}) -SET(CERES_ABI_VERSION 1.8.0) +SET(CERES_ABI_VERSION 1.9.0) ENABLE_TESTING()
diff --git a/docs/source/building.rst b/docs/source/building.rst index 14614d2..f894708 100644 --- a/docs/source/building.rst +++ b/docs/source/building.rst
@@ -11,7 +11,7 @@ You can start with the `latest stable release <http://ceres-solver.org/ceres-solver-1.8.0.tar.gz>`_ . Or if you want the latest version, you can clone the git repository - .. code-block:: bash +.. code-block:: bash git clone https://ceres-solver.googlesource.com/ceres-solver @@ -327,7 +327,7 @@ Download the ``Android NDK``. Run ``ndk-build`` from inside the ``jni`` directory. Use the ``libceres.a`` that gets created. -.. _section-ios +.. _section-ios: Building on iOS =============== @@ -335,7 +335,7 @@ You need iOS version 6.0 or higher to build Ceres Solver. -To build Ceres for iOS, we need to force `CMake` to find the +To build Ceres for iOS, we need to force ``CMake`` to find the toolchains from the iOS SDK instead of using the standard ones. The following incanation does the needful: @@ -346,22 +346,22 @@ -DEIGEN_INCLUDE_DIR=/path/to/eigen/header \ -DIOS_PLATFORM=<PLATFORM> -`PLATFORM` can be one of `OS`, `SIMULATOR` and `SIMULATOR64`. You can -build for `OS` (`armv7`, `armv7s`, `arm64`), `SIMULATOR` (`i386`) or -`SIMULATOR64` (`x86_64`) separately and use `LIPO` to merge them into -one static library. See `cmake/iOS.cmake` for more options. +``PLATFORM`` can be one of ``OS``, ``SIMULATOR`` and ``SIMULATOR64``. You can +build for ``OS`` (``armv7``, ``armv7s``, ``arm64``), ``SIMULATOR`` (``i386``) or +``SIMULATOR64`` (``x86_64``) separately and use ``LIPO`` to merge them into +one static library. See ``cmake/iOS.cmake`` for more options. -After building, you will get `libceres.a` and `libminiglog.a` +After building, you will get ``libceres.a`` and ``libminiglog.a`` You need to add these two libraries into your xcode project. The default cmake configuration builds a bare bones version of Ceres Solver that only depends on Eigen and MINIGLOG, this should be sufficient for solving small to moderate sized problems (No -`SPARSE_SCHUR`, `SPARSE_NORMAL_CHOLESKY` linear solvers and no -`CLUSTER_JACOBI` and `CLUSTER_TRIDIAGONAL` preconditioners). +``SPARSE_SCHUR``, ``SPARSE_NORMAL_CHOLESKY`` linear solvers and no +``CLUSTER_JACOBI`` and ``CLUSTER_TRIDIAGONAL`` preconditioners). -If you decide to use `LAPACK` and `BLAS`, then you also need to add -`Accelerate.framework` to your xcode project's linking dependency. +If you decide to use ``LAPACK`` and ``BLAS``, then you also need to add +``Accelerate.framework`` to your xcode project's linking dependency. .. _section-customizing:
diff --git a/include/ceres/ceres.h b/include/ceres/ceres.h index fca4907..acb402c 100644 --- a/include/ceres/ceres.h +++ b/include/ceres/ceres.h
@@ -34,8 +34,8 @@ #ifndef CERES_PUBLIC_CERES_H_ #define CERES_PUBLIC_CERES_H_ -#define CERES_VERSION 1.8.0 -#define CERES_ABI_VERSION 1.8.0 +#define CERES_VERSION 1.9.0 +#define CERES_ABI_VERSION 1.9.0 #include "ceres/autodiff_cost_function.h" #include "ceres/autodiff_local_parameterization.h"
diff --git a/scripts/ceres-solver.spec b/scripts/ceres-solver.spec index 780c85d..5d4a786 100644 --- a/scripts/ceres-solver.spec +++ b/scripts/ceres-solver.spec
@@ -1,15 +1,15 @@ Name: ceres-solver -Version: 1.8.0 +Version: 1.9.0 # Release candidate versions are messy. Give them a release of # e.g. "0.1.0%{?dist}" for RC1 (and remember to adjust the Source0 # URL). Non-RC releases go back to incrementing integers starting at 1. -Release: 0.3.0%{?dist} +Release: 0.1.0%{?dist} Summary: A non-linear least squares minimizer Group: Development/Libraries License: BSD -URL: http://code.google.com/p/ceres-solver/ -Source0: http://%{name}.googlecode.com/files/%{name}-%{version}rc3.tar.gz +URL: http://ceres-solver.org/ +Source0: http://%{name}.org/%{name}-%{version}rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if (0%{?rhel} == 06) @@ -110,6 +110,9 @@ %changelog +* Fri May 16 2013 Sameer Agarwal <sameeragarwal@google.com> - 1.9.0-0.1.0 +- Bump version + * Tue Nov 12 2013 Sameer Agarwal <sameeragarwal@google.com> - 1.8.0-0.3.0 - Bump version