From 4c3a0a3c3c88179a1238d1669c28021bb044e638 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 12 May 2016 12:43:22 -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 | 34 ++----------------- bindings/python/babeltrace/Makefile.am | 31 +++++++++++++++++ .../python/{ => babeltrace}/babeltrace.i.in | 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 .../{ => babeltrace}/python-complements.c | 0 .../{ => babeltrace}/python-complements.h | 0 configure.ac | 1 + 11 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 bindings/python/babeltrace/Makefile.am rename bindings/python/{ => babeltrace}/babeltrace.i.in (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}/python-complements.c (100%) rename bindings/python/{ => babeltrace}/python-complements.h (100%) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index ea11e91d..d6b3648e 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -1,31 +1,3 @@ -babeltrace.i: babeltrace.i.in - sed "s/BABELTRACE_VERSION_STR/Babeltrace $(PACKAGE_VERSION)/g" < \ - $(top_srcdir)/bindings/python/babeltrace.i.in > \ - $(top_builddir)/bindings/python/babeltrace.i - -AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ \ - -I$(top_srcdir)/bindings/python - -EXTRA_DIST = babeltrace.i.in -nodist_python_PYTHON = babeltrace.py -pyexec_LTLIBRARIES = _babeltrace.la - -MAINTAINERCLEANFILES = babeltrace_wrap.c babeltrace.py - -nodist__babeltrace_la_SOURCES = babeltrace_wrap.c -_babeltrace_la_SOURCES = python-complements.h python-complements.c -_babeltrace_la_LDFLAGS = -module - -_babeltrace_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) - -_babeltrace_la_LIBS = $(GLIB_LIBS) - -_babeltrace_la_LIBADD = $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - $(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la - -# SWIG 'warning md variable unused' fixed after SWIG build: -babeltrace_wrap.c: babeltrace.i - $(SWIG) -python -Wall -I. -I$(top_srcdir)/include \ - $(top_builddir)/bindings/python/babeltrace.i - -CLEANFILES = babeltrace.i babeltrace.py babeltrace_wrap.c +if USE_PYTHON +SUBDIRS = babeltrace +endif diff --git a/bindings/python/babeltrace/Makefile.am b/bindings/python/babeltrace/Makefile.am new file mode 100644 index 00000000..11dcdf0e --- /dev/null +++ b/bindings/python/babeltrace/Makefile.am @@ -0,0 +1,31 @@ +babeltrace.i: babeltrace.i.in + sed "s/BABELTRACE_VERSION_STR/Babeltrace $(PACKAGE_VERSION)/g" < \ + $(top_srcdir)/bindings/python/babeltrace/babeltrace.i.in > \ + $(top_builddir)/bindings/python/babeltrace/babeltrace.i + +AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ \ + -I$(top_srcdir)/bindings/python/babeltrace + +EXTRA_DIST = babeltrace.i.in +nodist_python_PYTHON = babeltrace.py +pyexec_LTLIBRARIES = _babeltrace.la + +MAINTAINERCLEANFILES = babeltrace_wrap.c babeltrace.py + +nodist__babeltrace_la_SOURCES = babeltrace_wrap.c +_babeltrace_la_SOURCES = python-complements.h python-complements.c +_babeltrace_la_LDFLAGS = -module + +_babeltrace_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) + +_babeltrace_la_LIBS = $(GLIB_LIBS) + +_babeltrace_la_LIBADD = $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ + $(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la + +# SWIG 'warning md variable unused' fixed after SWIG build: +babeltrace_wrap.c: babeltrace.i + $(SWIG) -python -Wall -I. -I$(top_srcdir)/include \ + $(top_builddir)/bindings/python/babeltrace/babeltrace.i + +CLEANFILES = babeltrace.i babeltrace.py babeltrace_wrap.c diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace/babeltrace.i.in similarity index 100% rename from bindings/python/babeltrace.i.in rename to bindings/python/babeltrace/babeltrace.i.in 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/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/configure.ac b/configure.ac index a2f82bd9..0157ec83 100644 --- a/configure.ac +++ b/configure.ac @@ -310,6 +310,7 @@ AC_CONFIG_FILES([ include/Makefile bindings/Makefile bindings/python/Makefile + bindings/python/babeltrace/Makefile tests/Makefile tests/bin/Makefile tests/lib/Makefile -- 2.34.1