From a7be8fcd9cfdbee5426843d63829d7ef13d428ac Mon Sep 17 00:00:00 2001 From: Jos Ahrens Date: Sat, 21 Jan 2017 16:30:09 +0100 Subject: [PATCH 1/3] autoconf/makefile: alphabetically sort the modules we compile (#1368) This alphabetically sorts the modules/ we compile so that it's easier to see where we're currently at. Has no effect with `make -j2` Fixes #1358 --- modules/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Makefile.in b/modules/Makefile.in index bc6c64de..6f8873dd 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -88,7 +88,7 @@ FILES := $(shell echo $(FILES) | sed -e "s:cyrusauth::") endif cyrusauthLDFLAGS := -lsasl2 -TARGETS := $(addsuffix .so, $(FILES)) +TARGETS := $(addsuffix .so, $(sort $(FILES))) CLEAN += *.so *.o From 14e68299fe87ca85c35b1ff24592b50539fec63b Mon Sep 17 00:00:00 2001 From: Jos Ahrens Date: Sat, 21 Jan 2017 16:36:12 +0100 Subject: [PATCH 2/3] cli: help: sort arguments alphabetically (#1367) Changes the output of `znc --help` to order the arguments in alphabetical order. --- src/main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a52033b7..273f421e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -135,24 +135,24 @@ static void GenerateHelp(const char* appname) { "\t-h, --help List available command line options (this page)"); CUtils::PrintMessage( "\t-v, --version Output version information and exit"); - CUtils::PrintMessage("\t-f, --foreground Don't fork into the background"); - CUtils::PrintMessage( - "\t-D, --debug Output debugging information (Implies -f)"); - CUtils::PrintMessage( - "\t-n, --no-color Don't use escape sequences in the output"); - CUtils::PrintMessage( - "\t-r, --allow-root Don't complain if ZNC is run as root"); CUtils::PrintMessage( "\t-c, --makeconf Interactively create a new config"); CUtils::PrintMessage( - "\t-s, --makepass Generates a password for use in config"); + "\t-d, --datadir Set a different ZNC repository (default is " + "~/.znc)"); + CUtils::PrintMessage( + "\t-D, --debug Output debugging information (Implies -f)"); + CUtils::PrintMessage("\t-f, --foreground Don't fork into the background"); + CUtils::PrintMessage( + "\t-n, --no-color Don't use escape sequences in the output"); #ifdef HAVE_LIBSSL CUtils::PrintMessage( "\t-p, --makepem Generates a pemfile for use with SSL"); #endif /* HAVE_LIBSSL */ CUtils::PrintMessage( - "\t-d, --datadir Set a different ZNC repository (default is " - "~/.znc)"); + "\t-r, --allow-root Don't complain if ZNC is run as root"); + CUtils::PrintMessage( + "\t-s, --makepass Generates a password for use in config"); } class CSignalHandler { From 02db444941a3124204149735e0e270133dc4049b Mon Sep 17 00:00:00 2001 From: Christophe Beauval Date: Thu, 9 Feb 2017 21:14:56 +0100 Subject: [PATCH 3/3] Add /install_manifest.txt and /install_manifest_*.txt to .gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 425607d4..0fc47e46 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ __pycache__ *.cmake CMakeFiles/ /CMakeCache.txt +/install_manifest.txt +/install_manifest_*.txt