From e8961c832441e3e4dd0fef9d1d3f82bc5d841d8a Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 8 Jan 2020 16:42:03 -0500 Subject: [PATCH] Replace `diamon.org/babeltrace` with `babeltrace.org` Signed-off-by: Philippe Proulx Change-Id: I87e6b0722358d74a0377b6b3f37ed81d65aeaa8c Reviewed-on: https://review.lttng.org/c/babeltrace/+/2747 --- CONTRIBUTING.adoc | 2 +- README.adoc | 20 ++++++++++---------- doc/man/common-footer.txt | 2 +- src/bindings/python/bt2/setup.py.in | 2 +- tests/ctf-writer/ctf_writer.c | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 0eeb43ec..d1662385 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -8,7 +8,7 @@ v0.2, 19 June 2019 This is a partial contributor's guide for the -http://diamon.org/babeltrace[Babeltrace] project. If you have any +https://babeltrace.org[Babeltrace] project. If you have any questions that are not answered by this guide, please post them on https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev[Babeltrace's mailing list]. diff --git a/README.adoc b/README.adoc index e1983b6d..abaec9c9 100644 --- a/README.adoc +++ b/README.adoc @@ -15,10 +15,10 @@ https://ci.lttng.org/job/babeltrace_master_build[image:https://img.shields.io/je https://scan.coverity.com/projects/babeltrace[image:https://img.shields.io/coverity/scan/babeltrace.svg[]] The **_{bt2}_** project offers a library with a -https://diamon.org/babeltrace/docs/v{btversion}/libbabeltrace2[C{nbsp}API], -https://diamon.org/babeltrace/docs/v{btversion}/python/bt2[Python{nbsp}3 bindings], +https://babeltrace.org/docs/v{btversion}/libbabeltrace2[C{nbsp}API], +https://babeltrace.org/docs/v{btversion}/python/bt2[Python{nbsp}3 bindings], and a -https://diamon.org/babeltrace/docs/v{btversion}/man1/babeltrace2.1/[command-line tool] +https://babeltrace.org/docs/v{btversion}/man1/babeltrace2.1/[command-line tool] (CLI) which makes it very easy for mere mortals to view, convert, transform, and analyze traces. @@ -29,9 +29,9 @@ https://lttng.org/[LTTng] and https://barectf.org/[barectf]. The {bt2} library and its Python bindings can read and write CTF traces. -See Babeltrace's https://diamon.org/babeltrace[official website], in +See Babeltrace's https://babeltrace.org[official website], in particular the -https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-intro.7[`**babeltrace2-intro**(7)`] +https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-intro.7[`**babeltrace2-intro**(7)`] manual page, to learn more about the project. [NOTE] @@ -86,7 +86,7 @@ _**If you need the `bt2` Python bindings**_:: (Debian/Ubuntu: `python3-dev`; Fedora: `python3-devel`) * http://www.swig.org[SWIG]{nbsp}≥{nbsp}3.0 -_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_:: +_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_:: * https://sourceware.org/elfutils/[elfutils]{nbsp}≥{nbsp}0.154 (Debian/Ubuntu: `libelf-dev` and `libdw-dev`; Fedora: `elfutils-devel` and `elfutils-libelf-devel`) @@ -134,7 +134,7 @@ The following options can modify the build: `--enable-debug-info`:: Build the https://lttng.org/[LTTng] debug information filter component class - (https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`]). + (https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`]). `--enable-man-pages`:: Build the {bt2} manual pages. @@ -234,13 +234,13 @@ $ BABELTRACE_DEV_MODE=1 BABELTRACE_MINIMAL_LOG_LEVEL=TRACE ./configure \ ---- See the -https://diamon.org/babeltrace/docs/v{btversion}/libbabeltrace2[{bt2}{nbsp}C{nbsp}API] +https://babeltrace.org/docs/v{btversion}/libbabeltrace2[{bt2}{nbsp}C{nbsp}API] documentation for more information. == Use Babeltrace{nbsp}{btversion} -See the https://diamon.org/babeltrace[Babeltrace website] to learn how +See the https://babeltrace.org[Babeltrace website] to learn how to use the different parts of the project. @@ -257,7 +257,7 @@ _**If you need the `bt2` Python bindings**_:: * https://www.python.org[Python]{nbsp}≥{nbsp}3.4 (Debian/Ubuntu/Fedora: `python3`) -_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_:: +_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_:: * https://sourceware.org/elfutils/[elfutils]{nbsp}≥{nbsp}0.154 (Debian/Ubuntu: `libelf` and `libdw`; Fedora: `elfutils-libs` and `elfutils-libelf`) diff --git a/doc/man/common-footer.txt b/doc/man/common-footer.txt index 09414195..584a64eb 100644 --- a/doc/man/common-footer.txt +++ b/doc/man/common-footer.txt @@ -9,7 +9,7 @@ https://bugs.lttng.org/projects/babeltrace[Babeltrace bug tracker]. The Babeltrace project shares some communication channels with the https://lttng.org/[LTTng project]. -* https://diamon.org/babeltrace[Babeltrace website] +* https://babeltrace.org/[Babeltrace website] * https://lists.lttng.org[Mailing list] for support and development: `lttng-dev@lists.lttng.org` * irc://irc.oftc.net/lttng[IRC channel]: `#lttng` on `irc.oftc.net` diff --git a/src/bindings/python/bt2/setup.py.in b/src/bindings/python/bt2/setup.py.in index fcce57f1..620f5194 100644 --- a/src/bindings/python/bt2/setup.py.in +++ b/src/bindings/python/bt2/setup.py.in @@ -59,7 +59,7 @@ def main(): 'build': {'build_base': 'build', 'build_lib': 'build/build_lib'}, 'build_ext': {'build_lib': 'build/build_lib'}, }, - url='http://diamon.org/babeltrace', + url='https://babeltrace.org/', ext_modules=[babeltrace_ext], license='MIT', classifiers=[ diff --git a/tests/ctf-writer/ctf_writer.c b/tests/ctf-writer/ctf_writer.c index e113eea8..16430b79 100644 --- a/tests/ctf-writer/ctf_writer.c +++ b/tests/ctf-writer/ctf_writer.c @@ -659,11 +659,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_event_class_set_log_level succeeds with a valid log level"); ok(bt_ctf_event_class_get_log_level(event_class) == BT_CTF_EVENT_CLASS_LOG_LEVEL_INFO, "bt_ctf_event_class_get_log_level returns the expected log level"); - ok(bt_ctf_event_class_set_emf_uri(NULL, "http://diamon.org/babeltrace/"), + ok(bt_ctf_event_class_set_emf_uri(NULL, "https://babeltrace.org/"), "bt_ctf_event_class_set_emf_uri handles a NULL event class correctly"); - ok(!bt_ctf_event_class_set_emf_uri(event_class, "http://diamon.org/babeltrace/"), + ok(!bt_ctf_event_class_set_emf_uri(event_class, "https://babeltrace.org/"), "bt_ctf_event_class_set_emf_uri succeeds with a valid EMF URI"); - ok(strcmp(bt_ctf_event_class_get_emf_uri(event_class), "http://diamon.org/babeltrace/") == 0, + ok(strcmp(bt_ctf_event_class_get_emf_uri(event_class), "https://babeltrace.org/") == 0, "bt_ctf_event_class_get_emf_uri returns the expected EMF URI"); ok(!bt_ctf_event_class_set_emf_uri(event_class, NULL), "bt_ctf_event_class_set_emf_uri succeeds with NULL (to reset)"); -- 2.34.1