From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 30 Apr 2019 21:52:12 +0000 (-0400)
Subject: doc: Make python bindings doc build
X-Git-Tag: v2.0.0-pre5~36
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=73ddea7aabbfad91f3298730a9efc4d8610a9ba8;hp=09fc237ba2de4aa08993dc3131cea86f3c7e1c57

doc: Make python bindings doc build

Babeltrace 1 Python bindings (the babeltrace package) were removed in
commit

    1c81bd8895c0 ("Remove babeltrace 1 Python bindings and tests")

However, the Python doc still references it.  It tries to import it to
get the version, and therefore fails to build.  Update it to import the
bt2 package instead.

Change-Id: I656a89ad83069f6794abf4c775a14fb9be2ecba0
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1124
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
---

diff --git a/doc/bindings/python/Makefile.am b/doc/bindings/python/Makefile.am
index 6737c79e..e12ed589 100644
--- a/doc/bindings/python/Makefile.am
+++ b/doc/bindings/python/Makefile.am
@@ -9,9 +9,8 @@ EXTRA_DIST = $(srcdir)/source $(srcdir)/sphinx-build.py
 
 all-local: $(SPHINX_HTML_TARGET) $(SPHINX_DIRHTML_TARGET)
 
-PYTHON_BABELTRACE_BUILD_LIB_DIR = $(abs_top_builddir)/bindings/python/babeltrace/build/build_lib
 PYTHON_BT2_BUILD_LIB_DIR = $(abs_top_builddir)/bindings/python/bt2/build/build_lib
-PP = $(PYTHON_BABELTRACE_BUILD_LIB_DIR):$(PYTHON_BT2_BUILD_LIB_DIR)
+PP = $(PYTHON_BT2_BUILD_LIB_DIR)
 LLP = $(abs_top_builddir)/lib/.libs
 LOCAL_SPHINXBUILD = PYTHONPATH="$(PP)" LD_LIBRARY_PATH="$(LLP)" $(PYTHON) $(srcdir)/sphinx-build.py
 SPHINX_SRC = $(wildcard $(SPHINX_SOURCE_DIR)/*.rst)
diff --git a/doc/bindings/python/source/conf.py b/doc/bindings/python/source/conf.py
index 9e52c569..e39de7c6 100644
--- a/doc/bindings/python/source/conf.py
+++ b/doc/bindings/python/source/conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import babeltrace
+import bt2
 import os
 
 
@@ -15,8 +15,8 @@ source_suffix = '.rst'
 source_encoding = 'utf-8-sig'
 master_doc = 'index'
 project = 'Babeltrace legacy Python bindings'
-copyright = '2017, EfficiOS Inc.'
-version = babeltrace.__version__
+copyright = '2019, EfficiOS Inc.'
+version = bt2.__version__
 release = version
 language = None
 today = ''