tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Documentation: add man pages 

Fixes #2844
This commit is contained in:
Gunnar Beutner 2013-02-06 17:49:11 +01:00
parent 39bd164625
commit 41e10c83be
5 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autogen.sh
View File

@ -99,6 +99,12 @@ fi
NO_AUTOMAKE=yes NO_AUTOMAKE=yes
} }
(help2man --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`html2man' installed."
echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
# if no automake, don't bother testing for aclocal # if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {

2
configure.ac
View File

@ -46,6 +46,8 @@ DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF) DX_PS_FEATURE(OFF)
DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev]) DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev])
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LEX AC_PROG_LEX
AC_PROG_YACC AC_PROG_YACC

2
docs/.gitignore vendored
View File

@ -2,4 +2,4 @@ Doxyfile
icinga2-intro.html icinga2-intro.html
icinga2-config.html icinga2-config.html
icinga2-config.xml icinga2-config.xml
icinga2.8

11
docs/Makefile.am
View File

@ -2,17 +2,24 @@
EXTRA_DIST = \ EXTRA_DIST = \
icinga2-config.txt \ icinga2-config.txt \
icinga2-intro.txt icinga2-intro.txt \
icinga2.8
icinga2docdir = ${docdir} icinga2docdir = ${docdir}
icinga2doc_DATA = \ icinga2doc_DATA = \
icinga2-config.html \ icinga2-config.html \
icinga2-intro.html icinga2-intro.html
man1_MANS = \
icinga2.8
.SUFFIXES = .html .txt .SUFFIXES = .html .txt
.txt.html: .txt.html:
asciidoc -a toc -a numbered $< asciidoc -a toc -a numbered $<
clean: icinga2.8: $(top_srcdir)/icinga-app/icinga2
-$(HELP2MAN) --name='The Icinga 2 networking monitoring daemon.' --section=8 --no-info --output=$@ $(top_srcdir)/icinga-app/icinga2
distclean:
rm -f $(icinga2doc_DATA) rm -f $(icinga2doc_DATA)

24
icinga-app/icinga.cpp
View File

@ -186,15 +186,25 @@ int main(int argc, char **argv)
Application::SetDebugging(true); Application::SetDebugging(true);
if (g_AppParams.count("help") || g_AppParams.count("version")) { if (g_AppParams.count("help") || g_AppParams.count("version")) {
std::cout << "Icinga application loader" String appName = Utility::BaseName(argv[0]);
if (appName.GetLength() > 3 && appName.SubStr(0, 3) == "lt-")
appName = appName.SubStr(3, appName.GetLength() - 3);
std::cout << appName << " " << "- The Icinga 2 networking monitoring daemon.";
if (g_AppParams.count("version")) {
#ifndef _WIN32 #ifndef _WIN32
<< " (version: " << ICINGA_VERSION << ")" std::cout << " (Version: " << ICINGA_VERSION << ")";
#endif /* _WIN32 */ #endif /* _WIN32 */
<< std::endl std::cout << std::endl
<< "Copyright (c) 2012-2013 Icinga Development Team (http://www.icinga.org)" << std::endl << "Copyright (c) 2012-2013 Icinga Development Team (http://www.icinga.org)" << std::endl
<< "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl2.html>" << std::endl << "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl2.html>" << std::endl
<< "This is free software: you are free to change and redistribute it." << std::endl << "This is free software: you are free to change and redistribute it." << std::endl
<< "There is NO WARRANTY, to the extent permitted by law." << std::endl; << "There is NO WARRANTY, to the extent permitted by law.";
}
std::cout << std::endl;
if (g_AppParams.count("version")) if (g_AppParams.count("version"))
return EXIT_SUCCESS; return EXIT_SUCCESS;