From c604ced7fd4c94fcb5dcea8c554a1c787714626c Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 10 Jul 2019 02:01:05 -0400 Subject: [PATCH] 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 Change-Id: I28362031162aae851cfd42d2d8d07828e5f69515 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1674 Tested-by: jenkins --- include/Makefile.am | 19 ------------------- include/babeltrace2/ctf-ir/clock.h | 2 -- include/babeltrace2/ctf-ir/event-fields.h | 2 -- include/babeltrace2/ctf-ir/event-types.h | 2 -- include/babeltrace2/ctf-ir/event.h | 2 -- include/babeltrace2/ctf-ir/field-types.h | 2 -- include/babeltrace2/ctf-ir/fields.h | 2 -- include/babeltrace2/ctf-ir/stream-class.h | 2 -- include/babeltrace2/ctf-ir/stream.h | 2 -- include/babeltrace2/ctf-ir/trace.h | 2 -- include/babeltrace2/ctf-ir/utils.h | 2 -- include/babeltrace2/ctf/events.h | 7 ------- tests/ctf-writer/ctf_writer.c | 1 - 13 files changed, 47 deletions(-) delete mode 100644 include/babeltrace2/ctf-ir/clock.h delete mode 100644 include/babeltrace2/ctf-ir/event-fields.h delete mode 100644 include/babeltrace2/ctf-ir/event-types.h delete mode 100644 include/babeltrace2/ctf-ir/event.h delete mode 100644 include/babeltrace2/ctf-ir/field-types.h delete mode 100644 include/babeltrace2/ctf-ir/fields.h delete mode 100644 include/babeltrace2/ctf-ir/stream-class.h delete mode 100644 include/babeltrace2/ctf-ir/stream.h delete mode 100644 include/babeltrace2/ctf-ir/trace.h delete mode 100644 include/babeltrace2/ctf-ir/utils.h delete mode 100644 include/babeltrace2/ctf/events.h diff --git a/include/Makefile.am b/include/Makefile.am index 72fa2761..339ccc22 100644 --- 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 index 4823d826..00000000 --- a/include/babeltrace2/ctf-ir/clock.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/event-fields.h b/include/babeltrace2/ctf-ir/event-fields.h deleted file mode 100644 index e0e5d3cd..00000000 --- a/include/babeltrace2/ctf-ir/event-fields.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/event-types.h b/include/babeltrace2/ctf-ir/event-types.h deleted file mode 100644 index bd24fc3a..00000000 --- a/include/babeltrace2/ctf-ir/event-types.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/event.h b/include/babeltrace2/ctf-ir/event.h deleted file mode 100644 index 922d1c1a..00000000 --- a/include/babeltrace2/ctf-ir/event.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/field-types.h b/include/babeltrace2/ctf-ir/field-types.h deleted file mode 100644 index cd2f54c8..00000000 --- a/include/babeltrace2/ctf-ir/field-types.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/fields.h b/include/babeltrace2/ctf-ir/fields.h deleted file mode 100644 index 24dbc943..00000000 --- a/include/babeltrace2/ctf-ir/fields.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/stream-class.h b/include/babeltrace2/ctf-ir/stream-class.h deleted file mode 100644 index a9e670c4..00000000 --- a/include/babeltrace2/ctf-ir/stream-class.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/stream.h b/include/babeltrace2/ctf-ir/stream.h deleted file mode 100644 index c9d546c1..00000000 --- a/include/babeltrace2/ctf-ir/stream.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/trace.h b/include/babeltrace2/ctf-ir/trace.h deleted file mode 100644 index ce0195d8..00000000 --- a/include/babeltrace2/ctf-ir/trace.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf-ir/utils.h b/include/babeltrace2/ctf-ir/utils.h deleted file mode 100644 index 6f9cf29c..00000000 --- a/include/babeltrace2/ctf-ir/utils.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace2/ctf/events.h b/include/babeltrace2/ctf/events.h deleted file mode 100644 index 4c67e95d..00000000 --- a/include/babeltrace2/ctf/events.h +++ /dev/null @@ -1,7 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include -#include -#include -#include -#include -#include diff --git a/tests/ctf-writer/ctf_writer.c b/tests/ctf-writer/ctf_writer.c index b393b947..b41a068c 100644 --- a/tests/ctf-writer/ctf_writer.c +++ b/tests/ctf-writer/ctf_writer.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include -- 2.34.1