From 45dc11d3483d712ad1dc9c6092d4917deab31a24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 11 May 2016 15:47:35 -0400 Subject: [PATCH] Move Python bindings to babeltrace subfolder MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This change reflects the arborescence used to install Babeltrace's python bindings and allows Babeltrace's tests to use the normal module name namespace. Signed-off-by: Jérémie Galarneau --- bindings/python/Makefile.am | 35 +------------------ bindings/python/babeltrace/Makefile.am | 34 ++++++++++++++++++ .../python/{ => babeltrace}/__init__.py.in | 0 bindings/python/{ => babeltrace}/common.py | 0 .../examples/babeltrace_and_lttng.py | 0 .../{ => babeltrace}/examples/ctf_writer.py | 0 .../examples/example-api-test.py | 0 .../{ => babeltrace}/examples/sched_switch.py | 0 .../examples/sequence_test.py | 0 bindings/python/{ => babeltrace}/nativebt.i | 0 .../{ => babeltrace}/python-complements.c | 0 .../{ => babeltrace}/python-complements.h | 0 bindings/python/{ => babeltrace}/reader.py | 0 bindings/python/{ => babeltrace}/writer.py | 0 configure.ac | 1 + doc/bindings/python/Makefile.am | 12 +++---- 16 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 bindings/python/babeltrace/Makefile.am rename bindings/python/{ => babeltrace}/__init__.py.in (100%) rename bindings/python/{ => babeltrace}/common.py (100%) rename bindings/python/{ => babeltrace}/examples/babeltrace_and_lttng.py (100%) rename bindings/python/{ => babeltrace}/examples/ctf_writer.py (100%) rename bindings/python/{ => babeltrace}/examples/example-api-test.py (100%) rename bindings/python/{ => babeltrace}/examples/sched_switch.py (100%) rename bindings/python/{ => babeltrace}/examples/sequence_test.py (100%) rename bindings/python/{ => babeltrace}/nativebt.i (100%) rename bindings/python/{ => babeltrace}/python-complements.c (100%) rename bindings/python/{ => babeltrace}/python-complements.h (100%) rename bindings/python/{ => babeltrace}/reader.py (100%) rename bindings/python/{ => babeltrace}/writer.py (100%) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 5564203d..43982898 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -1,34 +1 @@ -NATIVEBT_PY = nativebt.py -NATIVEBT_WRAP_C = nativebt_wrap.c -INIT_PY = __init__.py -INIT_PY_IN = $(srcdir)/$(INIT_PY).in -NATIVEBT_I = $(srcdir)/nativebt.i - -all-local: $(INIT_PY) - -$(INIT_PY): $(INIT_PY_IN) - sed "s/BABELTRACE_VERSION_STR/$(PACKAGE_VERSION)/g" < $< > $@ - -AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ -I$(top_srcdir)/bindings/python - -EXTRA_DIST = common.py reader.py writer.py $(INIT_PY_IN) $(NATIVEBT_I) -nodist_btpackage_PYTHON = $(INIT_PY) $(NATIVEBT_PY) common.py reader.py writer.py -nativebtlib_LTLIBRARIES = _nativebt.la - -btpackagedir = $(pythondir)/babeltrace -nativebtlibdir = $(btpackagedir) - -MAINTAINERCLEANFILES = $(NATIVEBT_PY) $(NATIVEBT_WRAP_C) - -nodist__nativebt_la_SOURCES = $(NATIVEBT_WRAP_C) -_nativebt_la_SOURCES = python-complements.h python-complements.c -_nativebt_la_LDFLAGS = -module -_nativebt_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) -_nativebt_la_LIBS = $(GLIB_LIBS) -_nativebt_la_LIBADD = $(top_builddir)/formats/ctf/libbabeltrace-ctf.la - -# SWIG 'warning md variable unused' fixed after SWIG build: -$(NATIVEBT_WRAP_C): $(NATIVEBT_I) - $(SWIG) -python -Wall -I$(srcdir) -I$(top_srcdir)/include -outcurrentdir $< - -CLEANFILES = $(NATIVEBT_PY) $(NATIVEBT_WRAP_C) $(INIT_PY) +SUBDIRS = babeltrace diff --git a/bindings/python/babeltrace/Makefile.am b/bindings/python/babeltrace/Makefile.am new file mode 100644 index 00000000..26f388ca --- /dev/null +++ b/bindings/python/babeltrace/Makefile.am @@ -0,0 +1,34 @@ +NATIVEBT_PY = nativebt.py +NATIVEBT_WRAP_C = nativebt_wrap.c +INIT_PY = __init__.py +INIT_PY_IN = $(srcdir)/$(INIT_PY).in +NATIVEBT_I = $(srcdir)/nativebt.i + +all-local: $(INIT_PY) + +$(INIT_PY): $(INIT_PY_IN) + sed "s/BABELTRACE_VERSION_STR/$(PACKAGE_VERSION)/g" < $< > $@ + +AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ -I$(srcdir) + +EXTRA_DIST = common.py reader.py writer.py $(INIT_PY_IN) $(NATIVEBT_I) +nodist_btpackage_PYTHON = $(INIT_PY) $(NATIVEBT_PY) common.py reader.py writer.py +nativebtlib_LTLIBRARIES = _nativebt.la + +btpackagedir = $(pythondir)/babeltrace +nativebtlibdir = $(btpackagedir) + +MAINTAINERCLEANFILES = $(NATIVEBT_PY) $(NATIVEBT_WRAP_C) + +nodist__nativebt_la_SOURCES = $(NATIVEBT_WRAP_C) +_nativebt_la_SOURCES = python-complements.h python-complements.c +_nativebt_la_LDFLAGS = -module +_nativebt_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) +_nativebt_la_LIBS = $(GLIB_LIBS) +_nativebt_la_LIBADD = $(top_builddir)/formats/ctf/libbabeltrace-ctf.la + +# SWIG 'warning md variable unused' fixed after SWIG build: +$(NATIVEBT_WRAP_C): $(NATIVEBT_I) + $(SWIG) -python -Wall -I$(srcdir) -I$(top_srcdir)/include -outcurrentdir $< + +CLEANFILES = $(NATIVEBT_PY) $(NATIVEBT_WRAP_C) $(INIT_PY) diff --git a/bindings/python/__init__.py.in b/bindings/python/babeltrace/__init__.py.in similarity index 100% rename from bindings/python/__init__.py.in rename to bindings/python/babeltrace/__init__.py.in diff --git a/bindings/python/common.py b/bindings/python/babeltrace/common.py similarity index 100% rename from bindings/python/common.py rename to bindings/python/babeltrace/common.py diff --git a/bindings/python/examples/babeltrace_and_lttng.py b/bindings/python/babeltrace/examples/babeltrace_and_lttng.py similarity index 100% rename from bindings/python/examples/babeltrace_and_lttng.py rename to bindings/python/babeltrace/examples/babeltrace_and_lttng.py diff --git a/bindings/python/examples/ctf_writer.py b/bindings/python/babeltrace/examples/ctf_writer.py similarity index 100% rename from bindings/python/examples/ctf_writer.py rename to bindings/python/babeltrace/examples/ctf_writer.py diff --git a/bindings/python/examples/example-api-test.py b/bindings/python/babeltrace/examples/example-api-test.py similarity index 100% rename from bindings/python/examples/example-api-test.py rename to bindings/python/babeltrace/examples/example-api-test.py diff --git a/bindings/python/examples/sched_switch.py b/bindings/python/babeltrace/examples/sched_switch.py similarity index 100% rename from bindings/python/examples/sched_switch.py rename to bindings/python/babeltrace/examples/sched_switch.py diff --git a/bindings/python/examples/sequence_test.py b/bindings/python/babeltrace/examples/sequence_test.py similarity index 100% rename from bindings/python/examples/sequence_test.py rename to bindings/python/babeltrace/examples/sequence_test.py diff --git a/bindings/python/nativebt.i b/bindings/python/babeltrace/nativebt.i similarity index 100% rename from bindings/python/nativebt.i rename to bindings/python/babeltrace/nativebt.i diff --git a/bindings/python/python-complements.c b/bindings/python/babeltrace/python-complements.c similarity index 100% rename from bindings/python/python-complements.c rename to bindings/python/babeltrace/python-complements.c diff --git a/bindings/python/python-complements.h b/bindings/python/babeltrace/python-complements.h similarity index 100% rename from bindings/python/python-complements.h rename to bindings/python/babeltrace/python-complements.h diff --git a/bindings/python/reader.py b/bindings/python/babeltrace/reader.py similarity index 100% rename from bindings/python/reader.py rename to bindings/python/babeltrace/reader.py diff --git a/bindings/python/writer.py b/bindings/python/babeltrace/writer.py similarity index 100% rename from bindings/python/writer.py rename to bindings/python/babeltrace/writer.py diff --git a/configure.ac b/configure.ac index 7a31bc7b..e843c7a7 100644 --- a/configure.ac +++ b/configure.ac @@ -345,6 +345,7 @@ AC_CONFIG_FILES([ include/Makefile bindings/Makefile bindings/python/Makefile + bindings/python/babeltrace/Makefile tests/Makefile tests/bin/Makefile tests/bin/intersection/Makefile diff --git a/doc/bindings/python/Makefile.am b/doc/bindings/python/Makefile.am index 2d7dac3b..955e2c35 100644 --- a/doc/bindings/python/Makefile.am +++ b/doc/bindings/python/Makefile.am @@ -26,15 +26,15 @@ $(SPHINX_DIRHTML_TARGET): $(SPHINX_SRC) $(BABELTRACE_PYTHON_DEPS) $(LOCAL_SPHINXBUILD) -b dirhtml -E $(SPHINX_SOURCE_DIR) $(SPHINX_BUILD_DIRHTML_DIR) swig-libs: - $(LN_S) $(abs_top_builddir)/bindings/python/.libs $@ + $(LN_S) $(abs_top_builddir)/bindings/python/babeltrace/.libs $@ babeltrace: $(mkdir_p) $@ - $(LN_S) $(abs_top_builddir)/bindings/python/__init__.py $@/__init__.py - $(LN_S) $(abs_top_srcdir)/bindings/python/common.py $@/common.py - $(LN_S) $(abs_top_srcdir)/bindings/python/reader.py $@/reader.py - $(LN_S) $(abs_top_srcdir)/bindings/python/writer.py $@/writer.py - $(LN_S) $(abs_top_builddir)/bindings/python/nativebt.py $@/nativebt.py + $(LN_S) $(abs_top_builddir)/bindings/python/babeltrace/__init__.py $@/__init__.py + $(LN_S) $(abs_top_srcdir)/bindings/python/babeltrace/common.py $@/common.py + $(LN_S) $(abs_top_srcdir)/bindings/python/babeltrace/reader.py $@/reader.py + $(LN_S) $(abs_top_srcdir)/bindings/python/babeltrace/writer.py $@/writer.py + $(LN_S) $(abs_top_builddir)/bindings/python/babeltrace/nativebt.py $@/nativebt.py clean-local: rm -rf $(SPHINX_BUILD_DIR) swig-libs babeltrace -- 2.34.1