aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2023-04-30 18:24:40 -0400
committerDavid Robillard <d@drobilla.net>2023-04-30 18:24:40 -0400
commit99a19fbc8e2604dc0b048c17b554d0c395810569 (patch)
treed075a961f3e87f277d301c5c9c06616499973b52
parent956f9fe7b051dc1c96433b2204f61e74c2366015 (diff)
downloadserd-99a19fbc8e2604dc0b048c17b554d0c395810569.tar.gz
serd-99a19fbc8e2604dc0b048c17b554d0c395810569.tar.bz2
serd-99a19fbc8e2604dc0b048c17b554d0c395810569.zip
Add long "help" and "version" options to serdi
Although serdi still "officially" has a BSD-style interface, meson uses --version to find the version of executables. So, support that, and also add --help, since users will often try that for unknown commands.
-rw-r--r--NEWS5
-rw-r--r--doc/serdi.14
-rw-r--r--meson.build2
-rw-r--r--src/serd_config.h2
-rw-r--r--src/serdi.c8
-rw-r--r--test/meson.build2
6 files changed, 17 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 8b84142f..2299cd71 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
-serd (0.31.3) unstable; urgency=medium
+serd (0.31.5) unstable; urgency=medium
* Add Windows path separator support to serd_node_new_file_uri()
+ * Add long "help" and "version" options to serdi
* Add serd_reader_skip_until_byte() to public API
* Allow SERD_API to be defined by the user
* Avoid creating test files in the current directory
@@ -27,7 +28,7 @@ serd (0.31.3) unstable; urgency=medium
* Test header for warnings more strictly
* Update standard test suites
- -- David Robillard <d@drobilla.net> Mon, 03 Apr 2023 14:48:40 +0000
+ -- David Robillard <d@drobilla.net> Sun, 30 Apr 2023 22:24:07 +0000
serd (0.30.16) stable; urgency=medium
diff --git a/doc/serdi.1 b/doc/serdi.1
index 998e008d..f9520892 100644
--- a/doc/serdi.1
+++ b/doc/serdi.1
@@ -1,8 +1,8 @@
.\" # Copyright 2011-2022 David Robillard <d@drobilla.net>
.\" # SPDX-License-Identifier: ISC
-.Dd Jul 15, 2022
+.Dd April 30, 2023
.Dt SERDI 1
-.Os Serd 0.31.3
+.Os Serd 0.31.5
.Sh NAME
.Nm serdi
.Nd read and write RDF syntax
diff --git a/meson.build b/meson.build
index 74915a5a..0c9c2847 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,7 @@ project(
],
license: 'ISC',
meson_version: '>= 0.56.0',
- version: '0.31.3',
+ version: '0.31.5',
)
serd_src_root = meson.current_source_dir()
diff --git a/src/serd_config.h b/src/serd_config.h
index 8dbfe28b..65c294c3 100644
--- a/src/serd_config.h
+++ b/src/serd_config.h
@@ -36,7 +36,7 @@
#define SERD_SRC_SERD_CONFIG_H
// Define version unconditionally so a warning will catch a mismatch
-#define SERD_VERSION "0.31.3"
+#define SERD_VERSION "0.31.5"
#if !defined(SERD_NO_DEFAULT_CONFIG)
diff --git a/src/serdi.c b/src/serdi.c
index f6a329bb..deeac384 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -201,6 +201,14 @@ main(int argc, char** argv)
break;
}
+ if (!strcmp(argv[a], "--help")) {
+ return print_usage(prog, false);
+ }
+
+ if (!strcmp(argv[a], "--version")) {
+ return print_version();
+ }
+
for (int o = 1; argv[a][o]; ++o) {
const char opt = argv[a][o];
diff --git a/test/meson.build b/test/meson.build
index 0502e833..cb98649e 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -146,6 +146,8 @@ simple_command_tests = {
['-z'],
],
'good': [
+ ['--help'],
+ ['--version'],
['-h'],
['-s', '<go:>a<go:> .'],
['-v'],