MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

configure: Minor string punctuation consistency.

Browse source 
construct: Minor string punctuation.
This commit is contained in:
Jason Volk 2020-05-09 17:42:22 -07:00
parent 88fe138d12
commit 7dc740e387
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -121,7 +121,7 @@ dnl Debugging mode
dnl dnl
AC_MSG_CHECKING(whether to enable debugging) AC_MSG_CHECKING(whether to enable debugging)
AC_ARG_ENABLE(debug, RB_HELP_STRING([--enable-debug], [Enable debugging suite for development.]), AC_ARG_ENABLE(debug, RB_HELP_STRING([--enable-debug], [Enable debugging suite for development]),
[ [
debug="yes" debug="yes"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -400,7 +400,7 @@ dnl Generic Mode compilation
dnl dnl
AC_MSG_CHECKING(whether to enable generic mode or tune for this host) AC_MSG_CHECKING(whether to enable generic mode or tune for this host)
AC_ARG_ENABLE(generic, RB_HELP_STRING([--enable-generic], [Emit more generic code for pkg binaries.]), AC_ARG_ENABLE(generic, RB_HELP_STRING([--enable-generic], [Emit more generic code for pkg binaries]),
[ [
enable_generic="yes" enable_generic="yes"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -426,7 +426,7 @@ dnl Untuned Mode compilation
dnl dnl
AC_MSG_CHECKING(whether to enable fully untuned mode) AC_MSG_CHECKING(whether to enable fully untuned mode)
AC_ARG_ENABLE(untuned, RB_HELP_STRING([--enable-untuned], [Emit no special feature instructions.]), AC_ARG_ENABLE(untuned, RB_HELP_STRING([--enable-untuned], [Emit no special feature instructions]),
[ [
enable_untuned="yes" enable_untuned="yes"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -1169,7 +1169,7 @@ dnl
AC_SUBST_DIR([moduledir]) AC_SUBST_DIR([moduledir])
AC_MSG_CHECKING([whether to modify moduledir]) AC_MSG_CHECKING([whether to modify moduledir])
AC_ARG_WITH(moduledir, RB_HELP_STRING([--with-moduledir=DIR], [Directory to install modules.]), AC_ARG_WITH(moduledir, RB_HELP_STRING([--with-moduledir=DIR], [Directory to install modules]),
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
moduledir=`echo $withval | sed 's/\/$//'` moduledir=`echo $withval | sed 's/\/$//'`
@ -1247,7 +1247,7 @@ dnl Check for --with-logdir
dnl dnl
AC_MSG_CHECKING([whether to modify logdir]) AC_MSG_CHECKING([whether to modify logdir])
AC_ARG_WITH(logdir, RB_HELP_STRING([--with-logdir=DIR], [Directory where to write logfiles.]), AC_ARG_WITH(logdir, RB_HELP_STRING([--with-logdir=DIR], [Directory where to write logfiles]),
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
logdir=`echo $withval | sed 's/\/$//'` logdir=`echo $withval | sed 's/\/$//'`
@ -1959,7 +1959,7 @@ PKG_CHECK_MODULES(JEMALLOC, [jemalloc],
]) ])
AC_MSG_CHECKING(whether to disable use of any found jemalloc) AC_MSG_CHECKING(whether to disable use of any found jemalloc)
AC_ARG_ENABLE(jemalloc, RB_HELP_STRING([--disable-jemalloc], [Disable jemalloc as third-party dynamic memory manager.]), AC_ARG_ENABLE(jemalloc, RB_HELP_STRING([--disable-jemalloc], [Disable jemalloc as third-party dynamic memory manager]),
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
enable_jemalloc="no" enable_jemalloc="no"
@ -2137,7 +2137,7 @@ dnl --with-custom-branding
dnl dnl
AC_MSG_CHECKING([whether custom branding is requested]) AC_MSG_CHECKING([whether custom branding is requested])
AC_ARG_WITH(custom-branding, RB_HELP_STRING([--with-custom-branding=NAME], [Custom branding name.]), AC_ARG_WITH(custom-branding, RB_HELP_STRING([--with-custom-branding=NAME], [Custom branding name]),
[ [
BRANDING_NAME="$withval" BRANDING_NAME="$withval"
AC_DEFINE_UNQUOTED(BRANDING_NAME, ["$BRANDING_NAME"], [Custom branding name.]) AC_DEFINE_UNQUOTED(BRANDING_NAME, ["$BRANDING_NAME"], [Custom branding name.])
@ -2154,7 +2154,7 @@ dnl --with-custom-version
dnl dnl
AC_MSG_CHECKING([whether a custom version is requested]) AC_MSG_CHECKING([whether a custom version is requested])
AC_ARG_WITH(custom-version, RB_HELP_STRING([--with-custom-version=NAME], [Custom version branding.]), AC_ARG_WITH(custom-version, RB_HELP_STRING([--with-custom-version=NAME], [Custom version branding]),
[ [
BRANDING_VERSION="$withval" BRANDING_VERSION="$withval"
AC_DEFINE_UNQUOTED(BRANDING_VERSION, ["$BRANDING_VERSION"], [Custom branding version.]) AC_DEFINE_UNQUOTED(BRANDING_VERSION, ["$BRANDING_VERSION"], [Custom branding version.])

30
construct/construct.cc
View file

@ -18,6 +18,7 @@
bool printversion; bool printversion;
bool cmdline; bool cmdline;
std::vector<std::string> execute;
bool quietmode; bool quietmode;
bool single; bool single;
bool debugmode; bool debugmode;
@ -35,41 +36,40 @@ bool yes6;
bool norun; bool norun;
bool read_only; bool read_only;
bool write_avoid; bool write_avoid;
std::array<bool, 7> smoketest;
bool soft_assert; bool soft_assert;
bool nomatrix; bool nomatrix;
bool matrix {true}; // matrix server by default. bool matrix {true}; // matrix server by default.
bool defaults; bool defaults;
std::vector<std::string> execute;
std::array<bool, 7> smoketest;
lgetopt opts[] lgetopt opts[]
{ {
{ "help", nullptr, lgetopt::USAGE, "Print this text" }, { "help", nullptr, lgetopt::USAGE, "Print this text" },
{ "version", &printversion, lgetopt::BOOL, "Print version and exit" }, { "version", &printversion, lgetopt::BOOL, "Print version and exit" },
{ "debug", &debugmode, lgetopt::BOOL, "Enable options for debugging" }, { "debug", &debugmode, lgetopt::BOOL, "Enable options for debugging" },
{ "quiet", &quietmode, lgetopt::BOOL, "Suppress log messages at the terminal." }, { "quiet", &quietmode, lgetopt::BOOL, "Suppress log messages at the terminal" },
{ "single", &single, lgetopt::BOOL, "Single user mode for maintenance and diagnostic." }, { "single", &single, lgetopt::BOOL, "Single user mode for maintenance and diagnostic" },
{ "console", &cmdline, lgetopt::BOOL, "Drop to a command line immediately after startup" }, { "console", &cmdline, lgetopt::BOOL, "Drop to a command line immediately after startup" },
{ "execute", &execute, lgetopt::STRINGS, "Execute command lines immediately after startup" }, { "execute", &execute, lgetopt::STRINGS, "Execute command lines immediately after startup" },
{ "nolisten", &nolisten, lgetopt::BOOL, "Normal execution but without listening sockets" }, { "nolisten", &nolisten, lgetopt::BOOL, "Normal execution but without listening sockets" },
{ "noautomod", &noautomod, lgetopt::BOOL, "Normal execution but without autoloading modules" }, { "noautomod", &noautomod, lgetopt::BOOL, "Normal execution but without autoloading modules" },
{ "checkdb", &checkdb, lgetopt::BOOL, "Perform complete checks of databases when opening" }, { "checkdb", &checkdb, lgetopt::BOOL, "Perform complete checks of databases when opening" },
{ "pitrecdb", &pitrecdb, lgetopt::BOOL, "Allow Point-In-Time-Recover if DB reports corruption after crash" }, { "pitrecdb", &pitrecdb, lgetopt::BOOL, "Allow Point-In-Time-Recover if DB reports corruption after crash" },
{ "repairdb", &repairdb, lgetopt::BOOL, "Perform full DB repair after deep block/file corruption." }, { "repairdb", &repairdb, lgetopt::BOOL, "Perform full DB repair after deep block/file corruption" },
{ "nojs", &nojs, lgetopt::BOOL, "Disable SpiderMonkey JS subsystem from initializing. (noop when not available)." }, { "nojs", &nojs, lgetopt::BOOL, "Disable SpiderMonkey JS subsystem from initializing. (noop when not available)" },
{ "nodirect", &nodirect, lgetopt::BOOL, "Disable direct IO (O_DIRECT) for unsupporting filesystems." }, { "nodirect", &nodirect, lgetopt::BOOL, "Disable direct IO (O_DIRECT) for unsupporting filesystems" },
{ "noaio", &noaio, lgetopt::BOOL, "Disable the AIO interface in favor of traditional syscalls. " }, { "noaio", &noaio, lgetopt::BOOL, "Disable the AIO interface in favor of traditional syscalls. " },
{ "noiou", &noiou, lgetopt::BOOL, "Disable the io_uring interface and fallback to AIO or system calls. " }, { "noiou", &noiou, lgetopt::BOOL, "Disable the io_uring interface and fallback to AIO or system calls. " },
{ "no6", &no6, lgetopt::BOOL, "Disable IPv6 operations (default)" }, { "no6", &no6, lgetopt::BOOL, "Disable IPv6 operations (default)" },
{ "6", &yes6, lgetopt::BOOL, "Enable IPv6 operations" }, { "6", &yes6, lgetopt::BOOL, "Enable IPv6 operations" },
{ "norun", &norun, lgetopt::BOOL, "[debug & testing only] Initialize but never run the event loop." }, { "norun", &norun, lgetopt::BOOL, "[debug & testing only] Initialize but never run the event loop" },
{ "ro", &read_only, lgetopt::BOOL, "Read-only mode. No writes to database allowed." }, { "ro", &read_only, lgetopt::BOOL, "Read-only mode. No writes to database allowed" },
{ "wa", &write_avoid, lgetopt::BOOL, "Like read-only mode, but writes permitted if triggered." }, { "wa", &write_avoid, lgetopt::BOOL, "Like read-only mode, but writes permitted if triggered" },
{ "smoketest", &smoketest[0], lgetopt::BOOL, "Starts and stops the daemon to return success."}, { "smoketest", &smoketest[0], lgetopt::BOOL, "Starts and stops the daemon to return success" },
{ "sassert", &soft_assert, lgetopt::BOOL, "Softens assertion effects in debug mode."}, { "sassert", &soft_assert, lgetopt::BOOL, "Softens assertion effects in debug mode" },
{ "nomatrix", &nomatrix, lgetopt::BOOL, "Prevent loading the matrix application module."}, { "nomatrix", &nomatrix, lgetopt::BOOL, "Prevent loading the matrix application module" },
{ "matrix", &matrix, lgetopt::BOOL, "Allow loading the matrix application module."}, { "matrix", &matrix, lgetopt::BOOL, "Allow loading the matrix application module" },
{ "defaults", &defaults, lgetopt::BOOL, "Use configuration defaults without database load for this execution."}, { "defaults", &defaults, lgetopt::BOOL, "Use configuration defaults without database load for this execution" },
{ nullptr, nullptr, lgetopt::STRING, nullptr }, { nullptr, nullptr, lgetopt::STRING, nullptr },
}; };