Add version to all PYBINDINGS modules.

Make all modules have externally-specified (by build script) version. It must be externally specified since we can't know which tag the code was checked out from.
mapsme · Jan 15, 2019 · a6898bf · a6898bf
1 parent 3b0ffde
commit a6898bf
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,6 +163,7 @@ if (NOT Boost_FOUND)
 endif()
 
 if (PYBINDINGS)
+  add_subdirectory(pyhelpers)
   if (PYTHON_VERSION VERSION_GREATER 3.0)
     set(_Boost_PYTHON3_HEADERS "boost/python.hpp")
     if (NOT DEFINED BOOST_PYTHON_LIBNAME)

diff --git a/generator/mwm_diff/pymwm_diff/CMakeLists.txt b/generator/mwm_diff/pymwm_diff/CMakeLists.txt
@@ -5,6 +5,8 @@ set(
   bindings.cpp
 )
 
+include_directories(${CMAKE_BINARY_DIR})
+
 omim_add_library(${PROJECT_NAME} MODULE ${SRC})
 
 omim_link_libraries(

diff --git a/generator/mwm_diff/pymwm_diff/bindings.cpp b/generator/mwm_diff/pymwm_diff/bindings.cpp
@@ -8,6 +8,8 @@
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
 
+#include "pyhelpers/module_version.hpp"
+
 #include <boost/python.hpp>
 
 #if defined(__clang__)
@@ -20,6 +22,7 @@ using namespace std;
 BOOST_PYTHON_MODULE(pymwm_diff)
 {
   using namespace boost::python;
+  scope().attr("__version__") = PYBINDINGS_VERSION;
 
   def("make_diff", generator::mwm_diff::MakeDiff);
   def("apply_diff", generator::mwm_diff::ApplyDiff);

diff --git a/kml/pykmlib/CMakeLists.txt b/kml/pykmlib/CMakeLists.txt
@@ -5,6 +5,8 @@ set(
   bindings.cpp
 )
 
+include_directories(${CMAKE_BINARY_DIR})
+
 omim_add_library(${PROJECT_NAME} MODULE ${SRC})
 
 omim_link_libraries(

diff --git a/kml/pykmlib/bindings.cpp b/kml/pykmlib/bindings.cpp
@@ -29,6 +29,7 @@
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
 
+#include "pyhelpers/module_version.hpp"
 #include "pyhelpers/vector_uint8.hpp"
 #include "pyhelpers/vector_list_conversion.hpp"
 
@@ -642,6 +643,7 @@ std::string IndexToClassificatorType(uint32_t index)
 
 BOOST_PYTHON_MODULE(pykmlib)
 {
+  scope().attr("__version__") = PYBINDINGS_VERSION;
   register_exception_translator<std::runtime_error>(&TranslateRuntimeError);
   TimestampConverter();
   LatLonConverter();

diff --git a/local_ads/pylocal_ads/CMakeLists.txt b/local_ads/pylocal_ads/CMakeLists.txt
@@ -5,6 +5,8 @@ set(
   bindings.cpp
 )
 
+include_directories(${CMAKE_BINARY_DIR})
+
 omim_add_library(${PROJECT_NAME} MODULE ${SRC})
 
 omim_link_libraries(

diff --git a/local_ads/pylocal_ads/bindings.cpp b/local_ads/pylocal_ads/bindings.cpp
@@ -15,6 +15,7 @@
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
 
+#include "pyhelpers/module_version.hpp"
 #include "pyhelpers/vector_uint8.hpp"
 #include "pyhelpers/vector_list_conversion.hpp"
 
@@ -47,6 +48,7 @@ boost::python::list PyDeserialize(std::vector<uint8_t> const & blob)
 BOOST_PYTHON_MODULE(pylocal_ads)
 {
   using namespace boost::python;
+  scope().attr("__version__") = PYBINDINGS_VERSION;
 
   // Register the to-python converters.
   to_python_converter<std::vector<uint8_t>, vector_uint8t_to_str>();

diff --git a/pyhelpers/CMakeLists.txt b/pyhelpers/CMakeLists.txt
@@ -0,0 +1,5 @@
+if (NOT PYBINDINGS_VERSION)
+    message(FATAL_ERROR "You need to specify PYBINDINGS_VERSION to build PYBINDINGS")
+endif()
+
+configure_file(module_version.hpp.in module_version.hpp)
diff --git a/pyhelpers/module_version.hpp.in b/pyhelpers/module_version.hpp.in
@@ -0,0 +1 @@
+#define PYBINDINGS_VERSION "@PYBINDINGS_VERSION@"
diff --git a/search/pysearch/CMakeLists.txt b/search/pysearch/CMakeLists.txt
@@ -5,6 +5,8 @@ set(
   bindings.cpp
 )
 
+include_directories(${CMAKE_BINARY_DIR})
+
 omim_add_library(${PROJECT_NAME} MODULE ${SRC})
 
 omim_link_libraries(

diff --git a/search/pysearch/bindings.cpp b/search/pysearch/bindings.cpp
@@ -20,6 +20,8 @@
 
 #include "base/assert.hpp"
 
+#include "pyhelpers/module_version.hpp"
+
 #include <boost/python.hpp>
 
 #include <iomanip>
@@ -266,6 +268,7 @@ struct SearchEngineProxy
 BOOST_PYTHON_MODULE(pysearch)
 {
   using namespace boost::python;
+  scope().attr("__version__") = PYBINDINGS_VERSION;
 
   def("init", &Init);
 

diff --git a/tracking/pytracking/CMakeLists.txt b/tracking/pytracking/CMakeLists.txt
@@ -5,6 +5,8 @@ set(
   bindings.cpp
 )
 
+include_directories(${CMAKE_BINARY_DIR})
+
 omim_add_library(${PROJECT_NAME} MODULE ${SRC})
 
 omim_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} tracking coding geometry base)

diff --git a/tracking/pytracking/bindings.cpp b/tracking/pytracking/bindings.cpp
@@ -2,6 +2,7 @@
 
 #include "coding/traffic.hpp"
 
+#include "pyhelpers/module_version.hpp"
 #include "pyhelpers/pair.hpp"
 #include "pyhelpers/vector_uint8.hpp"
 
@@ -12,6 +13,8 @@
 BOOST_PYTHON_MODULE(pytracking)
 {
   using namespace boost::python;
+  scope().attr("__version__") = PYBINDINGS_VERSION;
+
   using tracking::Protocol;
 
   // Register the to-python converters.

diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt
@@ -5,6 +5,8 @@ set(
   bindings.cpp
 )
 
+include_directories(${CMAKE_BINARY_DIR})
+
 omim_add_library(${PROJECT_NAME} MODULE ${SRC})
 
 if (PLATFORM_MAC)

diff --git a/traffic/pytraffic/bindings.cpp b/traffic/pytraffic/bindings.cpp
@@ -15,6 +15,7 @@
 #include "std/string.hpp"
 #include "std/vector.hpp"
 
+#include "pyhelpers/module_version.hpp"
 #include "pyhelpers/vector_list_conversion.hpp"
 #include "pyhelpers/vector_uint8.hpp"
 
@@ -162,6 +163,7 @@ void LoadClassificator(string const & classifPath)
 BOOST_PYTHON_MODULE(pytraffic)
 {
   using namespace boost::python;
+  scope().attr("__version__") = PYBINDINGS_VERSION;
 
   // Register the to-python converters.
   to_python_converter<vector<uint8_t>, vector_uint8t_to_str>();