From ec2c5e50e20bcc3770a1efae8123866b31224622 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 4 Jun 2019 14:22:42 -0400 Subject: [PATCH] cli: Rename to babeltrace2 We decided to make babeltrace2 co-installable with babeltrace1 since it offers backward compatibility but is not a full drop in replacement. This first change renames the command line executables. Change-Id: I52db05629b6349a5221f6b684cb15b289db8c6b3 Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/1402 Tested-by: jenkins Reviewed-by: Philippe Proulx --- .gitignore | 8 +-- cli/Makefile.am | 62 +++++++++---------- ...t.c => babeltrace2-cfg-cli-args-connect.c} | 4 +- ...t.h => babeltrace2-cfg-cli-args-connect.h} | 2 +- ...t.c => babeltrace2-cfg-cli-args-default.c} | 6 +- ...t.h => babeltrace2-cfg-cli-args-default.h} | 2 +- ...-cli-args.c => babeltrace2-cfg-cli-args.c} | 44 ++++++------- ...-cli-args.h => babeltrace2-cfg-cli-args.h} | 2 +- cli/{babeltrace-cfg.c => babeltrace2-cfg.c} | 2 +- cli/{babeltrace-cfg.h => babeltrace2-cfg.h} | 0 cli/{babeltrace-log.c => babeltrace2-log.c} | 2 +- cli/{babeltrace.c => babeltrace2.c} | 8 +-- configure.ac | 16 ++--- tests/cli/test_trace_read.in | 6 +- tests/utils/common.sh.in | 2 +- 15 files changed, 83 insertions(+), 83 deletions(-) rename cli/{babeltrace-cfg-cli-args-connect.c => babeltrace2-cfg-cli-args-connect.c} (99%) rename cli/{babeltrace-cfg-cli-args-connect.h => babeltrace2-cfg-cli-args-connect.h} (98%) rename cli/{babeltrace-cfg-cli-args-default.c => babeltrace2-cfg-cli-args-default.c} (95%) rename cli/{babeltrace-cfg-cli-args-default.h => babeltrace2-cfg-cli-args-default.h} (98%) rename cli/{babeltrace-cfg-cli-args.c => babeltrace2-cfg-cli-args.c} (98%) rename cli/{babeltrace-cfg-cli-args.h => babeltrace2-cfg-cli-args.h} (98%) rename cli/{babeltrace-cfg.c => babeltrace2-cfg.c} (98%) rename cli/{babeltrace-cfg.h => babeltrace2-cfg.h} (100%) rename cli/{babeltrace-log.c => babeltrace2-log.c} (98%) rename cli/{babeltrace.c => babeltrace2.c} (99%) diff --git a/.gitignore b/.gitignore index f828aa19..ac30a452 100644 --- a/.gitignore +++ b/.gitignore @@ -62,10 +62,10 @@ plugins/ctf/common/metadata/lexer.c plugins/ctf/common/metadata/parser.c plugins/ctf/common/metadata/parser.h plugins/ctf/common/metadata/parser.output -/cli/babeltrace -/cli/babeltrace.bin -/cli/babeltrace-log -/cli/babeltrace-log.bin +/cli/babeltrace2 +/cli/babeltrace2.bin +/cli/babeltrace2-log +/cli/babeltrace2-log.bin /include/config.h /include/config.h.in /include/version.i diff --git a/cli/Makefile.am b/cli/Makefile.am index ed309d02..1ae51049 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -13,25 +13,25 @@ endif AM_CPPFLAGS += '-DCONFIG_IN_TREE_PLUGIN_PATH="$(IN_TREE_PLUGIN_PATH)"' -bin_PROGRAMS = babeltrace.bin babeltrace-log.bin -noinst_PROGRAMS = babeltrace babeltrace-log +bin_PROGRAMS = babeltrace2.bin babeltrace2-log.bin +noinst_PROGRAMS = babeltrace2 babeltrace2-log -babeltrace_bin_SOURCES = \ - babeltrace.c \ - babeltrace-cfg.c \ - babeltrace-cfg.h \ - babeltrace-cfg-cli-args.c \ - babeltrace-cfg-cli-args.h \ - babeltrace-cfg-cli-args-connect.c \ - babeltrace-cfg-cli-args-connect.h \ - babeltrace-cfg-cli-args-default.h \ - babeltrace-cfg-cli-args-default.c \ +babeltrace2_bin_SOURCES = \ + babeltrace2.c \ + babeltrace2-cfg.c \ + babeltrace2-cfg.h \ + babeltrace2-cfg-cli-args.c \ + babeltrace2-cfg-cli-args.h \ + babeltrace2-cfg-cli-args-connect.c \ + babeltrace2-cfg-cli-args-connect.h \ + babeltrace2-cfg-cli-args-default.h \ + babeltrace2-cfg-cli-args-default.c \ logging.c logging.h # -Wl,--no-as-needed is needed for recent gold linker who seems to think # it knows better and considers libraries with constructors having # side-effects as dead code. -babeltrace_bin_LDFLAGS = $(LD_NO_AS_NEEDED) +babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED) # Add all the convenience libraries used by Babeltrace plugins and the # library. They will be used when embedding plugins (--enable-built-in-plugins), @@ -40,7 +40,7 @@ babeltrace_bin_LDFLAGS = $(LD_NO_AS_NEEDED) # we're using --whole-archive below (needed to make sure the linker does # not discard the plugins since the CLI does not use their symbols # directly). -babeltrace_bin_LDADD = \ +babeltrace2_bin_LDADD = \ $(top_builddir)/lib/libbabeltrace.la \ $(top_builddir)/compat/libcompat.la \ $(top_builddir)/common/libbabeltrace-common.la \ @@ -65,36 +65,36 @@ if ENABLE_BUILT_IN_PLUGINS pluginarchive = $(LD_WHOLE_ARCHIVE)$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a$(LD_NO_WHOLE_ARCHIVE) # Built-in plugins -babeltrace_bin_LDFLAGS += $(call pluginarchive,ctf) -babeltrace_bin_LDFLAGS += $(call pluginarchive,text) -babeltrace_bin_LDFLAGS += $(call pluginarchive,utils) +babeltrace2_bin_LDFLAGS += $(call pluginarchive,ctf) +babeltrace2_bin_LDFLAGS += $(call pluginarchive,text) +babeltrace2_bin_LDFLAGS += $(call pluginarchive,utils) if ENABLE_DEBUG_INFO -babeltrace_bin_LDFLAGS += $(call pluginarchive,lttng-utils) -babeltrace_bin_LDADD += $(ELFUTILS_LIBS) +babeltrace2_bin_LDFLAGS += $(call pluginarchive,lttng-utils) +babeltrace2_bin_LDADD += $(ELFUTILS_LIBS) endif endif if BABELTRACE_BUILD_WITH_MINGW -babeltrace_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpthread +babeltrace2_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpthread endif # Only used for in-tree execution and tests -babeltrace_SOURCES = $(babeltrace_bin_SOURCES) -babeltrace_LDFLAGS = $(babeltrace_bin_LDFLAGS) -babeltrace_LDADD = $(babeltrace_bin_LDADD) -babeltrace_CFLAGS = $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION +babeltrace2_SOURCES = $(babeltrace2_bin_SOURCES) +babeltrace2_LDFLAGS = $(babeltrace2_bin_LDFLAGS) +babeltrace2_LDADD = $(babeltrace2_bin_LDADD) +babeltrace2_CFLAGS = $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION -# babeltrace-log rules and config below -babeltrace_log_bin_SOURCES = babeltrace-log.c -babeltrace_log_bin_LDADD = \ +# babeltrace2-log rules and config below +babeltrace2_log_bin_SOURCES = babeltrace2-log.c +babeltrace2_log_bin_LDADD = \ $(top_builddir)/compat/libcompat.la \ $(top_builddir)/common/libbabeltrace-common.la \ $(top_builddir)/logging/libbabeltrace-logging.la \ $(POPT_LIBS) -babeltrace_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace$(EXEEXT)"' +babeltrace2_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace2$(EXEEXT)"' # Only used for in-tree execution and tests -babeltrace_log_SOURCES = $(babeltrace_log_bin_SOURCES) -babeltrace_log_LDADD = $(babeltrace_log_bin_LDADD) -babeltrace_log_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace$(EXEEXT)"' +babeltrace2_log_SOURCES = $(babeltrace2_log_bin_SOURCES) +babeltrace2_log_LDADD = $(babeltrace2_log_bin_LDADD) +babeltrace2_log_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace2$(EXEEXT)"' diff --git a/cli/babeltrace-cfg-cli-args-connect.c b/cli/babeltrace2-cfg-cli-args-connect.c similarity index 99% rename from cli/babeltrace-cfg-cli-args-connect.c rename to cli/babeltrace2-cfg-cli-args-connect.c index ff3bf917..f1d71047 100644 --- a/cli/babeltrace-cfg-cli-args-connect.c +++ b/cli/babeltrace2-cfg-cli-args-connect.c @@ -23,8 +23,8 @@ #include #include #include -#include "babeltrace-cfg.h" -#include "babeltrace-cfg-cli-args-connect.h" +#include "babeltrace2-cfg.h" +#include "babeltrace2-cfg-cli-args-connect.h" static bool all_named_and_printable_in_array(GPtrArray *comps) { diff --git a/cli/babeltrace-cfg-cli-args-connect.h b/cli/babeltrace2-cfg-cli-args-connect.h similarity index 98% rename from cli/babeltrace-cfg-cli-args-connect.h rename to cli/babeltrace2-cfg-cli-args-connect.h index 5e81f794..5130cd91 100644 --- a/cli/babeltrace-cfg-cli-args-connect.h +++ b/cli/babeltrace2-cfg-cli-args-connect.h @@ -27,7 +27,7 @@ #include #include #include -#include "babeltrace-cfg.h" +#include "babeltrace2-cfg.h" int bt_config_cli_args_create_connections(struct bt_config *cfg, const bt_value *connection_args, diff --git a/cli/babeltrace-cfg-cli-args-default.c b/cli/babeltrace2-cfg-cli-args-default.c similarity index 95% rename from cli/babeltrace-cfg-cli-args-default.c rename to cli/babeltrace2-cfg-cli-args-default.c index ec7b4803..5cd0bcf8 100644 --- a/cli/babeltrace-cfg-cli-args-default.c +++ b/cli/babeltrace2-cfg-cli-args-default.c @@ -22,9 +22,9 @@ */ #include -#include "babeltrace-cfg.h" -#include "babeltrace-cfg-cli-args.h" -#include "babeltrace-cfg-cli-args-default.h" +#include "babeltrace2-cfg.h" +#include "babeltrace2-cfg-cli-args.h" +#include "babeltrace2-cfg-cli-args-default.h" #ifdef ENABLE_DEBUG_INFO # define BT_ENABLE_DEBUG_INFO 1 diff --git a/cli/babeltrace-cfg-cli-args-default.h b/cli/babeltrace2-cfg-cli-args-default.h similarity index 98% rename from cli/babeltrace-cfg-cli-args-default.h rename to cli/babeltrace2-cfg-cli-args-default.h index e62b1408..839b08c1 100644 --- a/cli/babeltrace-cfg-cli-args-default.h +++ b/cli/babeltrace2-cfg-cli-args-default.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include "babeltrace-cfg.h" +#include "babeltrace2-cfg.h" struct bt_config *bt_config_cli_args_create_with_default(int argc, const char *argv[], int *retcode); diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace2-cfg-cli-args.c similarity index 98% rename from cli/babeltrace-cfg-cli-args.c rename to cli/babeltrace2-cfg-cli-args.c index 05193d3b..7a7b855a 100644 --- a/cli/babeltrace-cfg-cli-args.c +++ b/cli/babeltrace2-cfg-cli-args.c @@ -37,9 +37,9 @@ #include #include #include -#include "babeltrace-cfg.h" -#include "babeltrace-cfg-cli-args.h" -#include "babeltrace-cfg-cli-args-connect.h" +#include "babeltrace2-cfg.h" +#include "babeltrace2-cfg-cli-args.h" +#include "babeltrace2-cfg-cli-args-connect.h" #include "version.h" /* @@ -1879,7 +1879,7 @@ void print_expected_params_format(FILE *fp) fprintf(fp, " things=[1, \"2\", 3]\n"); fprintf(fp, "\n"); fprintf(fp, "IMPORTANT: Make sure to single-quote the whole argument when you run\n"); - fprintf(fp, "babeltrace from a shell.\n"); + fprintf(fp, "babeltrace2 from a shell.\n"); } @@ -1889,8 +1889,8 @@ void print_expected_params_format(FILE *fp) static void print_help_usage(FILE *fp) { - fprintf(fp, "Usage: babeltrace [GENERAL OPTIONS] help [OPTIONS] PLUGIN\n"); - fprintf(fp, " babeltrace [GENERAL OPTIONS] help [OPTIONS] TYPE.PLUGIN.CLS\n"); + fprintf(fp, "Usage: babeltrace2 [GENERAL OPTIONS] help [OPTIONS] PLUGIN\n"); + fprintf(fp, " babeltrace2 [GENERAL OPTIONS] help [OPTIONS] TYPE.PLUGIN.CLS\n"); fprintf(fp, "\n"); fprintf(fp, "Options:\n"); fprintf(fp, "\n"); @@ -1901,9 +1901,9 @@ void print_help_usage(FILE *fp) fprintf(fp, " dynamic plugins can be loaded\n"); fprintf(fp, " -h, --help Show this help and quit\n"); fprintf(fp, "\n"); - fprintf(fp, "See `babeltrace --help` for the list of general options.\n"); + fprintf(fp, "See `babeltrace2 --help` for the list of general options.\n"); fprintf(fp, "\n"); - fprintf(fp, "Use `babeltrace list-plugins` to show the list of available plugins.\n"); + fprintf(fp, "Use `babeltrace2 list-plugins` to show the list of available plugins.\n"); } static @@ -2051,7 +2051,7 @@ end: static void print_query_usage(FILE *fp) { - fprintf(fp, "Usage: babeltrace [GEN OPTS] query [OPTS] TYPE.PLUGIN.CLS OBJECT\n"); + fprintf(fp, "Usage: babeltrace2 [GEN OPTS] query [OPTS] TYPE.PLUGIN.CLS OBJECT\n"); fprintf(fp, "\n"); fprintf(fp, "Options:\n"); fprintf(fp, "\n"); @@ -2244,7 +2244,7 @@ end: static void print_list_plugins_usage(FILE *fp) { - fprintf(fp, "Usage: babeltrace [GENERAL OPTIONS] list-plugins [OPTIONS]\n"); + fprintf(fp, "Usage: babeltrace2 [GENERAL OPTIONS] list-plugins [OPTIONS]\n"); fprintf(fp, "\n"); fprintf(fp, "Options:\n"); fprintf(fp, "\n"); @@ -2255,9 +2255,9 @@ void print_list_plugins_usage(FILE *fp) fprintf(fp, " dynamic plugins can be loaded\n"); fprintf(fp, " -h, --help Show this help and quit\n"); fprintf(fp, "\n"); - fprintf(fp, "See `babeltrace --help` for the list of general options.\n"); + fprintf(fp, "See `babeltrace2 --help` for the list of general options.\n"); fprintf(fp, "\n"); - fprintf(fp, "Use `babeltrace help` to get help for a specific plugin or component class.\n"); + fprintf(fp, "Use `babeltrace2 help` to get help for a specific plugin or component class.\n"); } static @@ -2381,7 +2381,7 @@ end: static void print_run_usage(FILE *fp) { - fprintf(fp, "Usage: babeltrace [GENERAL OPTIONS] run [OPTIONS]\n"); + fprintf(fp, "Usage: babeltrace2 [GENERAL OPTIONS] run [OPTIONS]\n"); fprintf(fp, "\n"); fprintf(fp, "Options:\n"); fprintf(fp, "\n"); @@ -2410,12 +2410,12 @@ void print_run_usage(FILE *fp) fprintf(fp, " dynamic plugins can be loaded\n"); fprintf(fp, " -r, --reset-base-params Reset the current base parameters to an\n"); fprintf(fp, " empty map\n"); - fprintf(fp, " --retry-duration=DUR When babeltrace(1) needs to retry to run\n"); + fprintf(fp, " --retry-duration=DUR When babeltrace2(1) needs to retry to run\n"); fprintf(fp, " the graph later, retry in DUR µs\n"); fprintf(fp, " (default: 100000)\n"); fprintf(fp, " -h, --help Show this help and quit\n"); fprintf(fp, "\n"); - fprintf(fp, "See `babeltrace --help` for the list of general options.\n"); + fprintf(fp, "See `babeltrace2 --help` for the list of general options.\n"); fprintf(fp, "\n\n"); fprintf(fp, "Expected format of CONNECTION\n"); fprintf(fp, "-----------------------------\n"); @@ -2449,7 +2449,7 @@ void print_run_usage(FILE *fp) fprintf(fp, " ctf-fs.*stream*:utils-muxer:*\n"); fprintf(fp, "\n"); fprintf(fp, "IMPORTANT: Make sure to single-quote the whole argument when you run\n"); - fprintf(fp, "babeltrace from a shell.\n"); + fprintf(fp, "babeltrace2 from a shell.\n"); fprintf(fp, "\n\n"); print_expected_params_format(fp); } @@ -2814,7 +2814,7 @@ end: static void print_convert_usage(FILE *fp) { - fprintf(fp, "Usage: babeltrace [GENERAL OPTIONS] [convert] [OPTIONS] [PATH/URL]\n"); + fprintf(fp, "Usage: babeltrace2 [GENERAL OPTIONS] [convert] [OPTIONS] [PATH/URL]\n"); fprintf(fp, "\n"); fprintf(fp, "Options:\n"); fprintf(fp, "\n"); @@ -2837,7 +2837,7 @@ void print_convert_usage(FILE *fp) fprintf(fp, " -P, --path=PATH Set the `path` string parameter of the\n"); fprintf(fp, " current component to PATH\n"); fprintf(fp, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which\n"); - fprintf(fp, " --retry-duration=DUR When babeltrace(1) needs to retry to run\n"); + fprintf(fp, " --retry-duration=DUR When babeltrace2(1) needs to retry to run\n"); fprintf(fp, " the graph later, retry in DUR µs\n"); fprintf(fp, " (default: 100000)\n"); fprintf(fp, " dynamic plugins can be loaded\n"); @@ -2934,7 +2934,7 @@ void print_convert_usage(FILE *fp) fprintf(fp, " Query the `source.ctf.fs` component class\n"); fprintf(fp, " for metadata text and quit\n"); fprintf(fp, "\n"); - fprintf(fp, "See `babeltrace --help` for the list of general options.\n"); + fprintf(fp, "See `babeltrace2 --help` for the list of general options.\n"); fprintf(fp, "\n\n"); fprintf(fp, "Format of BEGIN and END\n"); fprintf(fp, "-----------------------\n"); @@ -4470,7 +4470,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], * which would imply -o text because --output would be * ambiguous in this case. For example, this is wrong: * - * babeltrace --names=all -o ctf --output=/tmp/path my-trace + * babeltrace2 --names=all -o ctf --output=/tmp/path my-trace * * because --names=all implies -o text, and --output * could apply to both the sink.text.pretty and @@ -4856,7 +4856,7 @@ end: static void print_gen_usage(FILE *fp) { - fprintf(fp, "Usage: babeltrace [GENERAL OPTIONS] [COMMAND] [COMMAND ARGUMENTS]\n"); + fprintf(fp, "Usage: babeltrace2 [GENERAL OPTIONS] [COMMAND] [COMMAND ARGUMENTS]\n"); fprintf(fp, "\n"); fprintf(fp, "General options:\n"); fprintf(fp, "\n"); @@ -4875,7 +4875,7 @@ void print_gen_usage(FILE *fp) fprintf(fp, " query Query objects from a component class\n"); fprintf(fp, " run Build a processing graph and run it\n"); fprintf(fp, "\n"); - fprintf(fp, "Use `babeltrace COMMAND --help` to show the help of COMMAND.\n"); + fprintf(fp, "Use `babeltrace2 COMMAND --help` to show the help of COMMAND.\n"); } static diff --git a/cli/babeltrace-cfg-cli-args.h b/cli/babeltrace2-cfg-cli-args.h similarity index 98% rename from cli/babeltrace-cfg-cli-args.h rename to cli/babeltrace2-cfg-cli-args.h index 78899c56..66d29841 100644 --- a/cli/babeltrace-cfg-cli-args.h +++ b/cli/babeltrace2-cfg-cli-args.h @@ -31,7 +31,7 @@ #include #include -#include "babeltrace-cfg.h" +#include "babeltrace2-cfg.h" struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], int *retcode, bool force_omit_system_plugin_path, diff --git a/cli/babeltrace-cfg.c b/cli/babeltrace2-cfg.c similarity index 98% rename from cli/babeltrace-cfg.c rename to cli/babeltrace2-cfg.c index 1205b21d..923afbd2 100644 --- a/cli/babeltrace-cfg.c +++ b/cli/babeltrace2-cfg.c @@ -25,7 +25,7 @@ #include #include #include -#include "babeltrace-cfg.h" +#include "babeltrace2-cfg.h" static void destroy_gstring(void *data) diff --git a/cli/babeltrace-cfg.h b/cli/babeltrace2-cfg.h similarity index 100% rename from cli/babeltrace-cfg.h rename to cli/babeltrace2-cfg.h diff --git a/cli/babeltrace-log.c b/cli/babeltrace2-log.c similarity index 98% rename from cli/babeltrace-log.c rename to cli/babeltrace2-log.c index d429ceb1..4d97b90b 100644 --- a/cli/babeltrace-log.c +++ b/cli/babeltrace2-log.c @@ -32,7 +32,7 @@ static void print_usage(FILE *fp) { - fprintf(stderr, "Usage: babeltrace-log [OPTIONS] OUTPUT-PATH\n"); + fprintf(stderr, "Usage: babeltrace2-log [OPTIONS] OUTPUT-PATH\n"); fprintf(stderr, "\n"); fprintf(stderr, "Options:\n"); fprintf(stderr, "\n"); diff --git a/cli/babeltrace.c b/cli/babeltrace2.c similarity index 99% rename from cli/babeltrace.c rename to cli/babeltrace2.c index 913a7421..a8a0dc00 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace2.c @@ -36,9 +36,9 @@ #include #include #include -#include "babeltrace-cfg.h" -#include "babeltrace-cfg-cli-args.h" -#include "babeltrace-cfg-cli-args-default.h" +#include "babeltrace2-cfg.h" +#include "babeltrace2-cfg-cli-args.h" +#include "babeltrace2-cfg-cli-args-default.h" #define ENV_BABELTRACE_WARN_COMMAND_NAME_DIRECTORY_CLASH "BABELTRACE_CLI_WARN_COMMAND_NAME_DIRECTORY_CLASH" #define ENV_BABELTRACE_CLI_LOG_LEVEL "BABELTRACE_CLI_LOG_LEVEL" @@ -2730,7 +2730,7 @@ void warn_command_name_and_directory_clash(struct bt_config *cfg) fprintf(stderr, "trace located in the local `%s` directory, please use:\n", cfg->command_name); fprintf(stderr, "\n"); - fprintf(stderr, " babeltrace convert %s [OPTIONS]\n", + fprintf(stderr, " babeltrace2 convert %s [OPTIONS]\n", cfg->command_name); } } diff --git a/configure.ac b/configure.ac index f0ef757a..20f03456 100644 --- a/configure.ac +++ b/configure.ac @@ -457,7 +457,7 @@ AC_ARG_ENABLE([api-doc], # Built-in plugins # Disabled by default AC_ARG_ENABLE([built-in-plugins], - [AC_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace binary])], + [AC_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace2 executable])], [], dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice [enable_built_in_plugins=no] ) @@ -528,17 +528,17 @@ AS_IF([test "x$enable_python_bindings" = xno], AS_IF([test "x$enable_built_in_plugins" = xyes], [ # Built-in plug-ins are only available when the --disable-shared --enable-static options are used. - AS_IF([test "x$enable_static" != xyes], [AC_MSG_ERROR(--enable-static must be used to bundle plug-ins in the babeltrace executable)]) - AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle plug-ins in the babeltrace executable)]) + AS_IF([test "x$enable_static" != xyes], [AC_MSG_ERROR(--enable-static must be used to bundle plug-ins in the babeltrace2 executable)]) + AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle plug-ins in the babeltrace2 executable)]) ] ) AS_IF([test "x$enable_built_in_python_plugin_support" = xyes], [ - AS_IF([test "x$enable_python_plugins" = xno], [AC_MSG_ERROR([--enable-python-plugins must be used to bundle Python plugin support in the babeltrace executable])]) + AS_IF([test "x$enable_python_plugins" = xno], [AC_MSG_ERROR([--enable-python-plugins must be used to bundle Python plugin support in the babeltrace2 executable])]) # Built-in plug-ins are only available when the --disable-shared --enable-static options are used. - AS_IF([test "x$enable_static" != xyes], [AC_MSG_ERROR(--enable-static must be used to bundle Python plugin support in the babeltrace executable)]) - AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace executable)]) + AS_IF([test "x$enable_static" != xyes], [AC_MSG_ERROR(--enable-static must be used to bundle Python plugin support in the babeltrace2 executable)]) + AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace2 executable)]) ] ) @@ -715,8 +715,8 @@ target. CFLAGS=${save_CFLAGS} # Abuse autoconf's AC_ARG_PROGRAM output variable 'program_transform_name' -# to rename babeltrace.bin to babeltrace at install time. -program_transform_name="s&babeltrace\.bin&babeltrace&;s&babeltrace-log\.bin&babeltrace-log&;$program_transform_name" +# to rename babeltrace2.bin to babeltrace2 at install time. +program_transform_name="s&babeltrace2\.bin&babeltrace2&;s&babeltrace2-log\.bin&babeltrace2-log&;$program_transform_name" AC_SUBST(program_transform_name) AC_CONFIG_FILES([ diff --git a/tests/cli/test_trace_read.in b/tests/cli/test_trace_read.in index 464dffa0..e9857eef 100644 --- a/tests/cli/test_trace_read.in +++ b/tests/cli/test_trace_read.in @@ -27,15 +27,15 @@ plan_tests $NUM_TESTS for path in "${SUCCESS_TRACES[@]}"; do trace=$(basename "${path}") "${BT_BIN}" "${path}" > /dev/null 2>&1 - ok $? "Run babeltrace with trace ${trace}" + ok $? "Run babeltrace2 with trace ${trace}" done for path in "${FAIL_TRACES[@]}"; do trace=$(basename "${path}") "${BT_BIN}" "${path}" > /dev/null 2>&1 if [ $? -eq 0 ]; then - fail "Run babeltrace with invalid trace ${trace}" + fail "Run babeltrace2 with invalid trace ${trace}" else - pass "Run babeltrace with invalid trace ${trace}" + pass "Run babeltrace2 with invalid trace ${trace}" fi done diff --git a/tests/utils/common.sh.in b/tests/utils/common.sh.in index 08243f5f..13de3679 100644 --- a/tests/utils/common.sh.in +++ b/tests/utils/common.sh.in @@ -3,7 +3,7 @@ BT_SRC_PATH="@abs_top_srcdir@" BT_BUILD_PATH="@abs_top_builddir@" -BT_BIN="${BT_BUILD_PATH}/cli/babeltrace@EXEEXT@" +BT_BIN="${BT_BUILD_PATH}/cli/babeltrace2@EXEEXT@" BT_CTF_TRACES="${BT_SRC_PATH}/tests/ctf-traces" if [ "x${NO_SH_TAP}" = x ]; then -- 2.34.1