Remove legacy `include/babeltrace2/{ctf-ir,ctf}` directories

Because Babeltrace 2's CTF writer is not exactly a drop-in replacement
of Babeltrace 1's CTF writer since all the headers are part of the
`babeltrace2` directory (to be able to install both on the same system),
we can remove those legacy directories.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I28362031162aae851cfd42d2d8d07828e5f69515
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1674
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/include/Makefile.am b/include/Makefile.am
index 72fa2761e2b560c5508c9b4e593b4eb0300ab9d4..339ccc2217d5567eda383581d4bc7d2a0c5f95df 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -14,11 +14,6 @@ babeltrace2include_HEADERS = \
        babeltrace2/value.h \
        babeltrace2/version.h
 
-# Legacy API (for CTF writer)
-babeltrace2ctfincludedir = "$(includedir)/babeltrace2/ctf"
-babeltrace2ctfinclude_HEADERS = \
-       babeltrace2/ctf/events.h
-
 # CTF writer API
 babeltrace2ctfwriterincludedir = "$(includedir)/babeltrace2/ctf-writer"
 babeltrace2ctfwriterinclude_HEADERS = \
@@ -38,20 +33,6 @@ babeltrace2ctfwriterinclude_HEADERS = \
        babeltrace2/ctf-writer/visitor.h \
        babeltrace2/ctf-writer/writer.h
 
-# Legacy API (for CTF writer)
-babeltrace2ctfirincludedir = "$(includedir)/babeltrace2/ctf-ir"
-babeltrace2ctfirinclude_HEADERS = \
-       babeltrace2/ctf-ir/clock.h \
-       babeltrace2/ctf-ir/event-fields.h \
-       babeltrace2/ctf-ir/event-types.h \
-       babeltrace2/ctf-ir/event.h \
-       babeltrace2/ctf-ir/field-types.h \
-       babeltrace2/ctf-ir/fields.h \
-       babeltrace2/ctf-ir/stream-class.h \
-       babeltrace2/ctf-ir/stream.h \
-       babeltrace2/ctf-ir/trace.h \
-       babeltrace2/ctf-ir/utils.h
-
 # Trace IR API
 babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir"
 babeltrace2traceirinclude_HEADERS = \

diff --git a/include/babeltrace2/ctf-ir/clock.h b/include/babeltrace2/ctf-ir/clock.h
deleted file mode 100644 (file)
index 4823d82..0000000
--- a/include/babeltrace2/ctf-ir/clock.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/clock.h>

diff --git a/include/babeltrace2/ctf-ir/event-fields.h b/include/babeltrace2/ctf-ir/event-fields.h
deleted file mode 100644 (file)
index e0e5d3c..0000000
--- a/include/babeltrace2/ctf-ir/event-fields.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/event-fields.h>

diff --git a/include/babeltrace2/ctf-ir/event-types.h b/include/babeltrace2/ctf-ir/event-types.h
deleted file mode 100644 (file)
index bd24fc3..0000000
--- a/include/babeltrace2/ctf-ir/event-types.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/event-types.h>

diff --git a/include/babeltrace2/ctf-ir/event.h b/include/babeltrace2/ctf-ir/event.h
deleted file mode 100644 (file)
index 922d1c1..0000000
--- a/include/babeltrace2/ctf-ir/event.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/event.h>

diff --git a/include/babeltrace2/ctf-ir/field-types.h b/include/babeltrace2/ctf-ir/field-types.h
deleted file mode 100644 (file)
index cd2f54c..0000000
--- a/include/babeltrace2/ctf-ir/field-types.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/field-types.h>

diff --git a/include/babeltrace2/ctf-ir/fields.h b/include/babeltrace2/ctf-ir/fields.h
deleted file mode 100644 (file)
index 24dbc94..0000000
--- a/include/babeltrace2/ctf-ir/fields.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/fields.h>

diff --git a/include/babeltrace2/ctf-ir/stream-class.h b/include/babeltrace2/ctf-ir/stream-class.h
deleted file mode 100644 (file)
index a9e670c..0000000
--- a/include/babeltrace2/ctf-ir/stream-class.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/stream-class.h>

diff --git a/include/babeltrace2/ctf-ir/stream.h b/include/babeltrace2/ctf-ir/stream.h
deleted file mode 100644 (file)
index c9d546c..0000000
--- a/include/babeltrace2/ctf-ir/stream.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/stream.h>

diff --git a/include/babeltrace2/ctf-ir/trace.h b/include/babeltrace2/ctf-ir/trace.h
deleted file mode 100644 (file)
index ce0195d..0000000
--- a/include/babeltrace2/ctf-ir/trace.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/trace.h>

diff --git a/include/babeltrace2/ctf-ir/utils.h b/include/babeltrace2/ctf-ir/utils.h
deleted file mode 100644 (file)
index 6f9cf29..0000000
--- a/include/babeltrace2/ctf-ir/utils.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/utils.h>

diff --git a/include/babeltrace2/ctf/events.h b/include/babeltrace2/ctf/events.h
deleted file mode 100644 (file)
index 4c67e95..0000000
--- a/include/babeltrace2/ctf/events.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Pre-2.0 CTF writer backward compatibility */
-#include <babeltrace2/ctf-writer/clock.h>
-#include <babeltrace2/ctf-writer/event-fields.h>
-#include <babeltrace2/ctf-writer/event-types.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
-#include <babeltrace2/ctf-writer/stream.h>
-#include <babeltrace2/ctf-writer/writer.h>

diff --git a/tests/ctf-writer/ctf_writer.c b/tests/ctf-writer/ctf_writer.c
index b393b94742afec3b82572547d3607184461aad2a..b41a068c10a8c953affdf3c230270709e58d82bf 100644 (file)
--- a/tests/ctf-writer/ctf_writer.c
+++ b/tests/ctf-writer/ctf_writer.c
@@ -28,7 +28,6 @@
 #include <babeltrace2/ctf-writer/event-fields.h>
 #include <babeltrace2/ctf-writer/stream-class.h>
 #include <babeltrace2/ctf-writer/trace.h>
-#include <babeltrace2/ctf/events.h>
 #include <babeltrace2/babeltrace.h>
 #include <glib.h>
 #include <unistd.h>