From 8d77550c9ec0f0bdb483a672a676e842510bb384 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 3 Apr 2017 14:10:34 -0400 Subject: [PATCH] Rename converter/ -> cli/ (it's more than a converter now) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- .gitignore | 6 +++--- Makefile.am | 2 +- {converter => cli}/Makefile.am | 0 {converter => cli}/babeltrace-cfg-connect.c | 0 {converter => cli}/babeltrace-cfg-connect.h | 0 {converter => cli}/babeltrace-cfg.c | 0 {converter => cli}/babeltrace-cfg.h | 0 {converter => cli}/babeltrace-log.c | 0 {converter => cli}/babeltrace.c | 0 {converter => cli}/default-cfg.c | 0 {converter => cli}/default-cfg.h | 0 configure.ac | 2 +- tests/bin/intersection/test_intersection.in | 2 +- tests/bin/test_convert_args | 2 +- tests/bin/test_formats.in | 2 +- tests/bin/test_packet_seq_num.in | 2 +- tests/bin/test_trace_read.in | 2 +- tests/lib/test_ctf_writer_complete.in | 2 +- 18 files changed, 11 insertions(+), 11 deletions(-) rename {converter => cli}/Makefile.am (100%) rename {converter => cli}/babeltrace-cfg-connect.c (100%) rename {converter => cli}/babeltrace-cfg-connect.h (100%) rename {converter => cli}/babeltrace-cfg.c (100%) rename {converter => cli}/babeltrace-cfg.h (100%) rename {converter => cli}/babeltrace-log.c (100%) rename {converter => cli}/babeltrace.c (100%) rename {converter => cli}/default-cfg.c (100%) rename {converter => cli}/default-cfg.h (100%) diff --git a/.gitignore b/.gitignore index b268cc4d..d4b3b448 100644 --- a/.gitignore +++ b/.gitignore @@ -37,8 +37,8 @@ plugins/ctf/common/metadata/lexer.c plugins/ctf/common/metadata/parser.c plugins/ctf/common/metadata/parser.h plugins/ctf/common/metadata/parser.output -/converter/babeltrace -/converter/babeltrace.bin +/cli/babeltrace +/cli/babeltrace.bin /config.h /config.h.in /config.status @@ -55,7 +55,7 @@ Makefile Makefile.in autom4te.cache/ config/ -converter/babeltrace-log +cli/babeltrace-log core stamp-h1 bindings/python/__init__.py diff --git a/Makefile.am b/Makefile.am index a7fecfea..6e90e481 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ endif SUBDIRS += \ lib \ plugins \ - converter \ + cli \ bindings \ tests \ doc \ diff --git a/converter/Makefile.am b/cli/Makefile.am similarity index 100% rename from converter/Makefile.am rename to cli/Makefile.am diff --git a/converter/babeltrace-cfg-connect.c b/cli/babeltrace-cfg-connect.c similarity index 100% rename from converter/babeltrace-cfg-connect.c rename to cli/babeltrace-cfg-connect.c diff --git a/converter/babeltrace-cfg-connect.h b/cli/babeltrace-cfg-connect.h similarity index 100% rename from converter/babeltrace-cfg-connect.h rename to cli/babeltrace-cfg-connect.h diff --git a/converter/babeltrace-cfg.c b/cli/babeltrace-cfg.c similarity index 100% rename from converter/babeltrace-cfg.c rename to cli/babeltrace-cfg.c diff --git a/converter/babeltrace-cfg.h b/cli/babeltrace-cfg.h similarity index 100% rename from converter/babeltrace-cfg.h rename to cli/babeltrace-cfg.h diff --git a/converter/babeltrace-log.c b/cli/babeltrace-log.c similarity index 100% rename from converter/babeltrace-log.c rename to cli/babeltrace-log.c diff --git a/converter/babeltrace.c b/cli/babeltrace.c similarity index 100% rename from converter/babeltrace.c rename to cli/babeltrace.c diff --git a/converter/default-cfg.c b/cli/default-cfg.c similarity index 100% rename from converter/default-cfg.c rename to cli/default-cfg.c diff --git a/converter/default-cfg.h b/cli/default-cfg.h similarity index 100% rename from converter/default-cfg.h rename to cli/default-cfg.h diff --git a/configure.ac b/configure.ac index 0e0ddbef..a18c0cb8 100644 --- a/configure.ac +++ b/configure.ac @@ -446,7 +446,7 @@ AC_CONFIG_FILES([ Makefile common/Makefile compat/Makefile - converter/Makefile + cli/Makefile doc/Makefile doc/api/Makefile doc/api/Doxyfile diff --git a/tests/bin/intersection/test_intersection.in b/tests/bin/intersection/test_intersection.in index 689fbc1e..d70367f2 100644 --- a/tests/bin/intersection/test_intersection.in +++ b/tests/bin/intersection/test_intersection.in @@ -17,7 +17,7 @@ TESTDIR=@abs_top_srcdir@/tests -BABELTRACE_BIN=@abs_top_builddir@/converter/babeltrace +BABELTRACE_BIN=@abs_top_builddir@/cli/babeltrace CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces source $TESTDIR/utils/tap/tap.sh diff --git a/tests/bin/test_convert_args b/tests/bin/test_convert_args index d134ea7e..e8df7a99 100755 --- a/tests/bin/test_convert_args +++ b/tests/bin/test_convert_args @@ -17,7 +17,7 @@ curdir="$(dirname $0)" testdir="$curdir/.." -babeltrace_bin="$curdir/../../converter/babeltrace" +babeltrace_bin="$curdir/../../cli/babeltrace" source $testdir/utils/tap/tap.sh diff --git a/tests/bin/test_formats.in b/tests/bin/test_formats.in index 0d91898b..4bd32ea0 100644 --- a/tests/bin/test_formats.in +++ b/tests/bin/test_formats.in @@ -18,7 +18,7 @@ CURDIR=$(dirname $0) TESTDIR=$CURDIR/.. -BABELTRACE_BIN=$CURDIR/../../converter/babeltrace +BABELTRACE_BIN=$CURDIR/../../cli/babeltrace source $TESTDIR/utils/tap/tap.sh diff --git a/tests/bin/test_packet_seq_num.in b/tests/bin/test_packet_seq_num.in index e8e291cb..640793b7 100644 --- a/tests/bin/test_packet_seq_num.in +++ b/tests/bin/test_packet_seq_num.in @@ -18,7 +18,7 @@ CURDIR=$(dirname $0) TESTDIR=$CURDIR/.. -BABELTRACE_BIN=$CURDIR/../../converter/babeltrace +BABELTRACE_BIN=$CURDIR/../../cli/babeltrace CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces source $TESTDIR/utils/tap/tap.sh diff --git a/tests/bin/test_trace_read.in b/tests/bin/test_trace_read.in index 758e8ce9..1325eb39 100644 --- a/tests/bin/test_trace_read.in +++ b/tests/bin/test_trace_read.in @@ -18,7 +18,7 @@ CURDIR=$(dirname $0) TESTDIR=$CURDIR/.. -BABELTRACE_BIN=$CURDIR/../../converter/babeltrace +BABELTRACE_BIN=$CURDIR/../../cli/babeltrace CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces diff --git a/tests/lib/test_ctf_writer_complete.in b/tests/lib/test_ctf_writer_complete.in index 219a2f9f..0911e09b 100755 --- a/tests/lib/test_ctf_writer_complete.in +++ b/tests/lib/test_ctf_writer_complete.in @@ -17,6 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -BTBIN="@abs_top_builddir@/converter/babeltrace" +BTBIN="@abs_top_builddir@/cli/babeltrace" "@abs_top_builddir@/tests/lib/test_ctf_writer" "$BTBIN" -- 2.34.1